diff --git a/src/main/java/com/ydool/staff/controller/PersonnelReportController.java b/src/main/java/com/ydool/staff/controller/PersonnelReportController.java index 3f726d2..3492764 100644 --- a/src/main/java/com/ydool/staff/controller/PersonnelReportController.java +++ b/src/main/java/com/ydool/staff/controller/PersonnelReportController.java @@ -11,7 +11,11 @@ import com.ydool.staff.dto.EnterpriseIndicatorsExportDto; import com.ydool.staff.dto.PersonnelReportExportDto; import com.ydool.staff.dto.PersonnelStatementDto; import com.ydool.staff.excel.EnterpriseIndicatorsExportVO; +import com.ydool.staff.excel.ExcelPersonnel; +import com.ydool.staff.excel.ExcelPersonnelStatement; import com.ydool.staff.excel.PersonnelReportExportVO; +import com.ydool.staff.request.ExcelPersonnelStatementRequest; +import com.ydool.staff.request.PersonnelDeleteRequest; import com.ydool.staff.service.ICompanyNameService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -25,6 +29,9 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; /** * @Author Zhuyy @@ -75,8 +82,24 @@ public class PersonnelReportController extends BaseController { @GetMapping("perStatement") @ApiOperation(value = "人事信息报表",response = PersonnelStatementDto.class) - @ApiImplicitParam(name = "id",value = "企业id") - public AjaxResult perStatement(String id) { - return companyNameService.perStatement(id); + @ApiImplicitParams({ + @ApiImplicitParam(name = "id",value = "企业id"), + @ApiImplicitParam(name = "firstDate",value = "起始时间"), + @ApiImplicitParam(name = "finalDate",value = "最终时间"), + }) + public AjaxResult perStatement(String id, String firstDate,String finalDate) { + return AjaxResult.ok().data(companyNameService.perStatement(id, firstDate, finalDate)); + } + + @GetMapping("getEntityParam") + @ApiOperation(value = "获取人事报表参数名",response = ExcelPersonnelStatement.class) + public AjaxResult getEntityParam(){ + return companyNameService.getEntityParam(); + } + + @PostMapping("export") + @ApiOperation(value = "人事报表导出接口") + public void export(@RequestBody ExcelPersonnelStatementRequest personnelParam, HttpServletResponse response){ + companyNameService.export(personnelParam,response); } } diff --git a/src/main/java/com/ydool/staff/dto/PersonnelStatementDto.java b/src/main/java/com/ydool/staff/dto/PersonnelStatementDto.java index 2d6f5d6..934a9f7 100644 --- a/src/main/java/com/ydool/staff/dto/PersonnelStatementDto.java +++ b/src/main/java/com/ydool/staff/dto/PersonnelStatementDto.java @@ -26,10 +26,10 @@ public class PersonnelStatementDto { private Integer mechanismNum; @ApiModelProperty(value = "用工计划数") - private Integer EmploymentNum; + private Long EmploymentNum; @ApiModelProperty(value = "现用工人数") - private Integer num; + private Long num; @ApiModelProperty(value = "其中:用工计划数") private Integer thereIntoNum; diff --git a/src/main/java/com/ydool/staff/entity/Exchange.java b/src/main/java/com/ydool/staff/entity/Exchange.java index 3f04ee8..0c01e84 100644 --- a/src/main/java/com/ydool/staff/entity/Exchange.java +++ b/src/main/java/com/ydool/staff/entity/Exchange.java @@ -57,4 +57,10 @@ public class Exchange extends BaseEntity{ @ApiModelProperty(value = "数据状态:0历史数据 1当前数据") private String state; + @ApiModelProperty(value = "初审意见") + private String firstTrialRemark; + + @ApiModelProperty(value = "终审意见") + private String finalTrialRemark; + } diff --git a/src/main/java/com/ydool/staff/excel/ExcelPersonnelStatement.java b/src/main/java/com/ydool/staff/excel/ExcelPersonnelStatement.java new file mode 100644 index 0000000..0f52c01 --- /dev/null +++ b/src/main/java/com/ydool/staff/excel/ExcelPersonnelStatement.java @@ -0,0 +1,59 @@ +package com.ydool.staff.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.annotation.write.style.HeadStyle; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.VerticalAlignment; + +/** + * @author msh + * @version 1.0 + * @date 2023/2/23 13:49 + */ +@Data +@HeadRowHeight(20) +@ColumnWidth(20) +@HeadStyle(horizontalAlignment = HorizontalAlignment.CENTER) +@ContentStyle(verticalAlignment = VerticalAlignment.CENTER) +public class ExcelPersonnelStatement { + @ExcelProperty(value = "主管部门名称" ) + @ApiModelProperty(value = "主管部门名称") + private String competentDeptName; + + @ExcelProperty(value = "统一社会信用代码" ) + @ApiModelProperty(value = "统一社会信用代码") + private String socialCreditCode; + + @ExcelProperty(value = "国有企业名称" ) + @ApiModelProperty(value = "国有企业名称") + private String competent; + + @ExcelProperty(value = "注册资本" ) + @ApiModelProperty(value = "注册资本") + private Integer capital; + + @ExcelProperty(value = "内设机构数" ) + @ApiModelProperty(value = "内设机构数") + private Integer mechanismNum; + + @ExcelProperty(value = "用工计划数" ) + @ApiModelProperty(value = "用工计划数") + private Long EmploymentNum; + + @ExcelProperty(value = "现用工人数" ) + @ApiModelProperty(value = "现用工人数") + private Long num; + + @ExcelProperty(value = "其中:用工计划数" ) + @ApiModelProperty(value = "其中:用工计划数") + private Integer thereIntoNum; + + @ExcelProperty(value = "董监人数" ) + @ApiModelProperty(value = "董监人数") + private Integer supervisorsNum; +} diff --git a/src/main/java/com/ydool/staff/request/ExcelPersonnelStatementRequest.java b/src/main/java/com/ydool/staff/request/ExcelPersonnelStatementRequest.java new file mode 100644 index 0000000..98602ef --- /dev/null +++ b/src/main/java/com/ydool/staff/request/ExcelPersonnelStatementRequest.java @@ -0,0 +1,29 @@ +package com.ydool.staff.request; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author msh + * @version 1.0 + * @date 2023/2/23 14:01 + */ +@Data +public class ExcelPersonnelStatementRequest { + + @ApiModelProperty(value = "导出参数") + private String[] prams; + + @ApiModelProperty(value = "企业id") + private String id; + + @ApiModelProperty(value = "起始时间 例:2022-01-01") + private String firstDate; + + @ApiModelProperty(value = "最终时间 例:2022-12-31") + private String finalDate; + + +} diff --git a/src/main/java/com/ydool/staff/service/ICompanyNameService.java b/src/main/java/com/ydool/staff/service/ICompanyNameService.java index c3cc298..a44eb5c 100644 --- a/src/main/java/com/ydool/staff/service/ICompanyNameService.java +++ b/src/main/java/com/ydool/staff/service/ICompanyNameService.java @@ -3,8 +3,12 @@ package com.ydool.staff.service; import com.ydool.common.data.dto.AjaxResult; import com.ydool.staff.dto.EnterpriseIndicatorsExportDto; import com.ydool.staff.dto.PersonnelReportExportDto; +import com.ydool.staff.dto.PersonnelStatementDto; +import com.ydool.staff.request.ExcelPersonnelStatementRequest; +import com.ydool.staff.request.PersonnelDeleteRequest; import javax.servlet.http.HttpServletResponse; +import java.util.Date; /** *
@@ -30,6 +34,10 @@ public interface ICompanyNameService {
void exportEnterpriseIndicators(EnterpriseIndicatorsExportDto enterpriseIndicatorsExportVO, HttpServletResponse response);
- AjaxResult perStatement(String id);
+ PersonnelStatementDto perStatement(String id, String firstDate, String finalDate);
+
+ AjaxResult getEntityParam();
+
+ void export(ExcelPersonnelStatementRequest personnelParam, HttpServletResponse response);
}
diff --git a/src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java
index 15821c5..1aee746 100644
--- a/src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java
+++ b/src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java
@@ -13,6 +13,7 @@ import com.ydool.staff.entity.*;
import com.ydool.staff.mapper.*;
import com.ydool.staff.request.AuditRequest;
import com.ydool.staff.service.IAuditService;
+import com.ydool.staff.service.IPersonnelService;
import com.ydool.system.entity.Config;
import com.ydool.system.entity.User;
import com.ydool.system.mapper.ConfigMapper;
@@ -106,12 +107,15 @@ public class AuditServiceImpl extends BaseService
@@ -123,21 +135,62 @@ public class CompanyNameServiceImpl extends BaseService