qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xzy-fix薪资档案导入时添加起始发薪日期格式校验

This commit is contained in:
Harryxzy 2022-09-01 17:06:30 +08:00
parent 0d3f76c414
commit 38edb1bbb8
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
View File

@ -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<String, String> 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<String, String> 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<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowindex + "生效日期错误或格式不正确，正确格式示例为'2022-01-01'、'2022/1/1'");