From 22b03f8f7e2856cf849acedd3e6bcc83b6cca19e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 20 Sep 2022 17:38:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E8=96=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SalaryArchiveServiceImpl.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index 234f96828..afe35218e 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -1400,11 +1400,11 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe // isError = true; } if (ineffectiveSalaryItem != null && ineffectiveSalaryItem.getItemValue().equals(cellVal)) { - Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowindex + key + "与未生效的调整后不可相同"); - excelComments.add(errorMessageMap); -// salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(100434, "与未生效的调整后不可相同"), errorCount + 1, errorCount + 1, j, j); - isError = true; +// Map errorMessageMap = Maps.newHashMap(); +// errorMessageMap.put("message", rowindex + key + "与未生效的调整后不可相同"); +// excelComments.add(errorMessageMap); +//// salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(100434, "与未生效的调整后不可相同"), errorCount + 1, errorCount + 1, j, j); +// isError = true; } // 1.3 如果>已经生效且<=今天 } else if (effectiveTime.after(currentEffectiveTime) && !effectiveTime.after(importHandleParam.getToday())) { @@ -1416,11 +1416,11 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe // isError = true; } if (ineffectiveSalaryItem != null && ineffectiveSalaryItem.getItemValue().equals(cellVal)) { - Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowindex + key + "与未生效的调整后不可相同"); - excelComments.add(errorMessageMap); -// salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(100434, "与未生效的调整后不可相同"), errorCount + 1, errorCount + 1, j, j); - isError = true; +// Map errorMessageMap = Maps.newHashMap(); +// errorMessageMap.put("message", rowindex + key + "与未生效的调整后不可相同"); +// excelComments.add(errorMessageMap); +//// salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(100434, "与未生效的调整后不可相同"), errorCount + 1, errorCount + 1, j, j); +// isError = true; } // 1.4 如果>今天 } else if (effectiveTime.after(importHandleParam.getToday()) && effectiveSalaryItem.getItemValue().equals(cellVal)) { @@ -1431,11 +1431,11 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe // isError = true; } } else if (ineffectiveSalaryItem != null && ineffectiveSalaryItem.getItemValue().equals(cellVal)) { - Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowindex + key + "与未生效的调整后不可相同"); - excelComments.add(errorMessageMap); -// salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(100434, "与未生效的调整后不可相同"), errorCount + 1, errorCount + 1, j, j); - isError = true; +// Map errorMessageMap = Maps.newHashMap(); +// errorMessageMap.put("message", rowindex + key + "与未生效的调整后不可相同"); +// excelComments.add(errorMessageMap); +//// salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(100434, "与未生效的调整后不可相同"), errorCount + 1, errorCount + 1, j, j); +// isError = true; } // 2.数据处理 if (effectiveSalaryItem != null && effectiveTime.equals(effectiveSalaryItem.getEffectiveTime())) { From 90c18ec2011b464430b05a19f1e52cc83b1863a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 20 Sep 2022 18:02:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=9A=E8=96=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/SalaryArchiveImportActionParam.java | 2 ++ .../salaryArchive/SalaryArchiveActionAPI.java | 16 ++++++++++++++++ .../salary/wrapper/SalaryArchiveWrapper.java | 4 ++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveImportActionParam.java b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveImportActionParam.java index 4dda95dce..61e1905d3 100644 --- a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveImportActionParam.java +++ b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveImportActionParam.java @@ -35,4 +35,6 @@ public class SalaryArchiveImportActionParam { * */ List> importDatas; + + private boolean addData; } diff --git a/src/com/engine/salary/process/salaryArchive/SalaryArchiveActionAPI.java b/src/com/engine/salary/process/salaryArchive/SalaryArchiveActionAPI.java index 8ad2239c3..da0f302bb 100644 --- a/src/com/engine/salary/process/salaryArchive/SalaryArchiveActionAPI.java +++ b/src/com/engine/salary/process/salaryArchive/SalaryArchiveActionAPI.java @@ -57,9 +57,25 @@ public class SalaryArchiveActionAPI { @Produces(MediaType.APPLICATION_JSON) public String importSalaryArchiveInit(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryArchiveImportActionParam importData) { User user = HrmUserVarify.getUser(request, response); + importData.setImportType("init"); + importData.setAddData(false); return new ResponseResult>(user).run(getSalaryArchiveWrapper(user)::importSalaryArchiveInit, importData); } + /** + * 初始化档案 + * @param importData + * @return + */ + @POST + @Path("/initSalaryArchive") + @Produces(MediaType.APPLICATION_JSON) + public String salaryArchiveListInit(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryArchiveImportActionParam importData) { + User user = HrmUserVarify.getUser(request, response); + importData.setImportType("init"); + importData.setAddData(true); + return new ResponseResult>(user).run(getSalaryArchiveWrapper(user)::importSalaryArchiveInit, importData); + } /** * 导入薪资档案附件上传前置校验 diff --git a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java index 1b64c2427..32bf5a3c3 100644 --- a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java @@ -331,10 +331,10 @@ public class SalaryArchiveWrapper extends Service { public Map importSalaryArchiveInit(SalaryArchiveImportActionParam importData) { - importData.setImportType("init"); - return getSalaryArchiveService(user).importSalaryArchiveAction(importData, false); + return getSalaryArchiveService(user).importSalaryArchiveAction(importData, importData.isAddData()); } + public Map importSalaryArchiveSalaryItemAdjust(SalaryArchiveImportActionParam importData) { importData.setImportType("salaryItemAdjust"); return getSalaryArchiveService(user).importSalaryArchiveAction(importData, false); From 5c801881655b0eeb66048dc6e89a524e7c3a4d83 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 20 Sep 2022 18:03:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?xzy-fix-oracle=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E4=B8=AD=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=E5=BD=92=E6=A1=A3?= =?UTF-8?q?=E6=97=B6=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml index 8e14f674c..820143b3e 100644 --- a/src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml @@ -205,9 +205,7 @@ - + INSERT INTO hrsa_salary_send From c08a660fa0fbdbd0d24fb02bfd220e1a59c0029f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 20 Sep 2022 19:07:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E8=96=AA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SalaryArchiveItemServiceImpl.java | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java index 70a9c320f..31906e437 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java @@ -123,6 +123,10 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi // 薪资档案 SalaryArchivePO salaryArchive = salaryArchiveMapper.getById(salaryArchiveId); + if (salaryArchive == null) { + throw new SalaryRunTimeException("薪资档案不存在！"); + } + // 获取当前已生效数据 List effectiveSalaryItems = getEffectiveSalaryItems(salaryArchiveId, salaryItemIds); @@ -305,13 +309,13 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi public String deleteSalaryItem(Long salaryArchiveItemId) { SalaryArchiveItemPO salaryArchiveItem = salaryArchiveItemMapper.getById(salaryArchiveItemId); if (salaryArchiveItem == null) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98299, "参数错误，薪资项目不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98299, "参数错误，薪资项目不存在或已被删除")); } if (salaryArchiveItem.getEffectiveTime().after(new Date())) { salaryArchiveItem.setDeleteType(1); // 删除未生效数据 salaryArchiveItemMapper.updateById(salaryArchiveItem); - }else{ + } else { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98299, "该薪资项目已生效不可删除")); } return StringUtils.EMPTY; @@ -345,17 +349,17 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi // 获取所有可被引用的薪资项目 List salaryItems = salaryItemMapper.getCanAdjustSalaryItems(); String[] header = { - SalaryI18nUtil.getI18nLabel( 85429, "姓名"), - SalaryI18nUtil.getI18nLabel( 86187, "员工状态"), - SalaryI18nUtil.getI18nLabel( 86185, "部门"), - SalaryI18nUtil.getI18nLabel( 84960, "薪资项目"), - SalaryI18nUtil.getI18nLabel( 85433, "调整前"), - SalaryI18nUtil.getI18nLabel( 85434, "调整后"), - SalaryI18nUtil.getI18nLabel( 85431, "调整原因"), - SalaryI18nUtil.getI18nLabel( 85904, "生效日期"), - SalaryI18nUtil.getI18nLabel( 85435, "操作人"), - SalaryI18nUtil.getI18nLabel( 85436, "操作时间"), - SalaryI18nUtil.getI18nLabel( 84961, "备注") + SalaryI18nUtil.getI18nLabel(85429, "姓名"), + SalaryI18nUtil.getI18nLabel(86187, "员工状态"), + SalaryI18nUtil.getI18nLabel(86185, "部门"), + SalaryI18nUtil.getI18nLabel(84960, "薪资项目"), + SalaryI18nUtil.getI18nLabel(85433, "调整前"), + SalaryI18nUtil.getI18nLabel(85434, "调整后"), + SalaryI18nUtil.getI18nLabel(85431, "调整原因"), + SalaryI18nUtil.getI18nLabel(85904, "生效日期"), + SalaryI18nUtil.getI18nLabel(85435, "操作人"), + SalaryI18nUtil.getI18nLabel(85436, "操作时间"), + SalaryI18nUtil.getI18nLabel(84961, "备注") }; // 2.表头 List headerList = new ArrayList<>(Arrays.asList(header));