diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml index a85cd484c..acf8baf37 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml @@ -148,10 +148,10 @@ AND (e.companystartdate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]}) - - - ORDER BY #{param.orderRule.orderRule} #{param.orderRule.ascOrDesc} - + + + + diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml index ad5642321..d09fac402 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml @@ -178,7 +178,7 @@ FROM hrsa_bill_detail t WHERE t.delete_type = 0 - AND t.payment_status = 0 +-- AND t.payment_status = 0 AND t.bill_month = #{billMonth} AND t.payment_organization = #{paymentOrganization} diff --git a/src/com/engine/salary/service/SalaryAcctExcelService.java b/src/com/engine/salary/service/SalaryAcctExcelService.java index 40cfd7aa0..de731313b 100644 --- a/src/com/engine/salary/service/SalaryAcctExcelService.java +++ b/src/com/engine/salary/service/SalaryAcctExcelService.java @@ -35,6 +35,14 @@ public interface SalaryAcctExcelService { */ XSSFWorkbook exportReducedEmployee(SalaryAcctEmployeeQueryParam queryParam); + /** + * 薪资核算环比增加人员导出 + * + * @param queryParam + * @return + */ + XSSFWorkbook exportAddedEmployee(SalaryAcctEmployeeQueryParam queryParam); + /** * 薪资核算结果导出 * diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java index 4741b7fa5..674332b91 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java @@ -158,6 +158,8 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc } + + @Override public XSSFWorkbook exportReducedEmployee(SalaryAcctEmployeeQueryParam queryParam) { ValidUtil.doValidator(queryParam); @@ -190,6 +192,36 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc } + @Override + public XSSFWorkbook exportAddedEmployee(SalaryAcctEmployeeQueryParam queryParam) { + ValidUtil.doValidator(queryParam); + + // 1.工作簿名称 + String sheetName = SalaryI18nUtil.getI18nLabel(85368, "环比上月增加人员"); + // 2.表头 + String[] header = { + SalaryI18nUtil.getI18nLabel(85429, "姓名"), + SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"), + SalaryI18nUtil.getI18nLabel(86185, "部门"), + SalaryI18nUtil.getI18nLabel(86186, "手机号"), + SalaryI18nUtil.getI18nLabel(86186, "工号"), + SalaryI18nUtil.getI18nLabel(91075, "员工状态"), + SalaryI18nUtil.getI18nLabel(91075, "入职日期"), + SalaryI18nUtil.getI18nLabel(91075, "离职日期") + }; + List headerList = new ArrayList<>(Arrays.asList(header)); + // 查询薪资核算人员（环比上月增加） + List salaryAcctEmployees = getSalaryAcctEmployeeService(user).listByParam4Add(queryParam); + + // 组装数据 + List> rows = new ArrayList<>(); + rows.add(headerList); + + // 3.表数据 + List> lists = convert2ExcelRow(salaryAcctEmployees); + rows.addAll(lists); + return ExcelUtil.genWorkbookV2(rows, sheetName); + } private List> convert2ExcelRow(List salaryAcctEmployees) { if (CollectionUtils.isEmpty(salaryAcctEmployees)) { diff --git a/src/com/engine/salary/web/SalaryAcctController.java b/src/com/engine/salary/web/SalaryAcctController.java index 28de9a568..4260af162 100644 --- a/src/com/engine/salary/web/SalaryAcctController.java +++ b/src/com/engine/salary/web/SalaryAcctController.java @@ -329,6 +329,38 @@ public class SalaryAcctController { } + /** + * 导出环比增加人员 + */ + @GET + @Path("/addedemployee/export") + @Produces(MediaType.APPLICATION_OCTET_STREAM) + public Response exportAddedEmployee(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + SalaryAcctEmployeeQueryParam param = buildSalaryAcctEmployeeQueryParam(request); + User user = HrmUserVarify.getUser(request, response); + XSSFWorkbook workbook = getSalaryAcctExcelWrapper(user).exportAddedEmployee(param); + String time = LocalDate.now().toString(); + String fileName = "环比上月增加人员" + time; + try { + fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + StreamingOutput output = outputStream -> { + workbook.write(outputStream); + outputStream.flush(); + }; + response.setContentType("application/octet-stream"); + return Response.ok(output).header("Content-disposition", "attachment;filename=" + fileName).header("Cache-Control", "no-cache").build(); + } catch (Exception e) { + log.error("环比上月增加人员导出异常", e); + throw e; + } + } + + + // **********************************薪资核算人员相关 end*********************************/ // **********************************薪资核算结果 start*********************************/ diff --git a/src/com/engine/salary/wrapper/SalaryAcctExcelWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctExcelWrapper.java index b09528e1e..a7fee0472 100644 --- a/src/com/engine/salary/wrapper/SalaryAcctExcelWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryAcctExcelWrapper.java @@ -40,6 +40,18 @@ public class SalaryAcctExcelWrapper extends Service { return getSalaryAcctExcelService(user).exportReducedEmployee(queryParam); } + + + /** + * 薪资核算环比增加人员导出 + * + * @param queryParam + * @return + */ + public XSSFWorkbook exportAddedEmployee(SalaryAcctEmployeeQueryParam queryParam) { + return getSalaryAcctExcelService(user).exportAddedEmployee(queryParam); + } + /** * 薪资核算结果导出 *