From 38edb1bbb87cb54f3cfc8cf259eb0b69776e6573 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 1 Sep 2022 17:06:30 +0800 Subject: [PATCH] =?UTF-8?q?xzy-fix=E8=96=AA=E8=B5=84=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6=E6=B7=BB=E5=8A=A0=E8=B5=B7=E5=A7=8B?= =?UTF-8?q?=E5=8F=91=E8=96=AA=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SalaryArchiveServiceImpl.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index c4753247c..7c010c910 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -1038,7 +1038,20 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe } else if (!isEmpty && taxAgentI18n.equals(key) && (isInit || isTaxAgentAdjust)) { // 2.个税扣缴义务人列处理(初始化导入或调整个税扣缴义务人) isError = handleTaxAgent(isError, isInit, excelComments, errorCount, j, taxAgentId, effectiveTime, finalSalaryArchive, adjustReason, importHandleParam, map); - } else if (!isEmpty && effectiveTimeI18n.equals(key) && effectiveTime == null) { + } else if (!isEmpty && payStartDateI18n.equals(key) && payStartDate == null) { + // 起始发薪日期 + Map errorMessageMap = Maps.newHashMap(); + errorMessageMap.put("message", rowindex + "发薪起始日期格式不正确，正确格式示例为'2022-01-01'、'2022/1/1'"); + excelComments.add(errorMessageMap); + isError = true; + }else if (!isEmpty && payEndDateI18n.equals(key) && !payEndDateCellVal.equals("") && !SalaryDateUtil.checkDay(payEndDateCellVal)) { + // 最后发薪日期 + Map errorMessageMap = Maps.newHashMap(); + errorMessageMap.put("message", rowindex + "最后发薪日期格式不正确，正确格式示例为'2022-01-01'、'2022/1/1'"); + excelComments.add(errorMessageMap); + isError = true; + // 5.薪资项目列处理(初始化导入或调薪) + }else if (!isEmpty && effectiveTimeI18n.equals(key) && effectiveTime == null) { // 3.生效时间处理 Map errorMessageMap = Maps.newHashMap(); errorMessageMap.put("message", rowindex + "生效日期错误或格式不正确，正确格式示例为'2022-01-01'、'2022/1/1'");