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] =?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())) {