Commit 4de6b6e2 authored by fangxinjiang's avatar fangxinjiang

人员档案&预入职批量新增和更新对应身份证有效期起止日志校验-fxj

parent e3efd7e8
...@@ -1564,7 +1564,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -1564,7 +1564,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if (Common.isNotNull(excel.getValidityStart()) if (Common.isNotNull(excel.getValidityStart())
&& !"长期".equals(excel.getValidityEnd()) && !"长期".equals(excel.getValidityEnd())
&& DateUtil.checkStringToDate(excel.getValidityEnd(), DateUtil.ISO_EXPANDED_DATE_FORMAT) && DateUtil.checkStringToDate(excel.getValidityEnd(), DateUtil.ISO_EXPANDED_DATE_FORMAT)
&& excel.getValidityStart().after(DateUtil.stringToDate(excel.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT))){ && !DateUtil.stringToDate(excel.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT).after(excel.getValidityStart())){
errorMsg.add(EmployeeConstants.EMP_VALIDITY_END_START_DATE); errorMsg.add(EmployeeConstants.EMP_VALIDITY_END_START_DATE);
} }
// 邮箱 // 邮箱
...@@ -2094,7 +2094,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2094,7 +2094,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if (Common.isNotNull(excel.getValidityStart()) if (Common.isNotNull(excel.getValidityStart())
&& !"长期".equals(excel.getValidityEnd()) && !"长期".equals(excel.getValidityEnd())
&& DateUtil.checkStringToDate(excel.getValidityEnd(), DateUtil.ISO_EXPANDED_DATE_FORMAT) && DateUtil.checkStringToDate(excel.getValidityEnd(), DateUtil.ISO_EXPANDED_DATE_FORMAT)
&& excel.getValidityStart().after(DateUtil.stringToDate(excel.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT))){ && !DateUtil.stringToDate(excel.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT).after(excel.getValidityStart())){
errorMsg.add(EmployeeConstants.EMP_VALIDITY_END_START_DATE); errorMsg.add(EmployeeConstants.EMP_VALIDITY_END_START_DATE);
} }
} }
...@@ -3532,8 +3532,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -3532,8 +3532,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if (Common.isNotNull(detail.getValidityStart()) if (Common.isNotNull(detail.getValidityStart())
&& Common.isNotNull(detail.getValidityEnd()) && Common.isNotNull(detail.getValidityEnd())
&& !"长期".equals(detail.getValidityEnd()) && !"长期".equals(detail.getValidityEnd())
&& DateUtil.stringToDate(detail.getValidityStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT) && !DateUtil.stringToDate(detail.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT)
.after(DateUtil.stringToDate(detail.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT))){ .after(DateUtil.stringToDate(detail.getValidityStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT))){
detail.setErrorInfo(EmployeeConstants.EMP_VALIDITY_END_START_DATE); detail.setErrorInfo(EmployeeConstants.EMP_VALIDITY_END_START_DATE);
} }
excelList.add(detail); excelList.add(detail);
......
...@@ -3499,8 +3499,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3499,8 +3499,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (Common.isNotNull(detail.getValidityStart()) if (Common.isNotNull(detail.getValidityStart())
&& Common.isNotNull(detail.getValidityEnd()) && Common.isNotNull(detail.getValidityEnd())
&& !"长期".equals(detail.getValidityEnd()) && !"长期".equals(detail.getValidityEnd())
&& DateUtil.stringToDate(detail.getValidityStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT) && !DateUtil.stringToDate(detail.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT)
.after(DateUtil.stringToDate(detail.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT))){ .after(DateUtil.stringToDate(detail.getValidityStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT))){
detail.setErrorInfo(EmployeeConstants.EMP_VALIDITY_END_START_DATE); detail.setErrorInfo(EmployeeConstants.EMP_VALIDITY_END_START_DATE);
} }
excelList.add(detail); excelList.add(detail);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment