Commit 7c189ebd authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent 15bd3f09
...@@ -4110,10 +4110,12 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -4110,10 +4110,12 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
} else { } else {
detail.setErrorInfo("身份证号不存在!"); detail.setErrorInfo("身份证号不存在!");
} }
if ("长期".equals(detail.getValidityEnd())){
detail.setValidityEnd("2999-12-31");
}
// 身份证起止有效期 都有值 且 截止日期正常 // 身份证起止有效期 都有值 且 截止日期正常
if (Common.isNotNull(detail.getValidityStart()) if (Common.isNotNull(detail.getValidityStart())
&& Common.isNotNull(detail.getValidityEnd()) && Common.isNotNull(detail.getValidityEnd())
&& !"长期".equals(detail.getValidityEnd())
&& DateUtil.checkStringToDate(detail.getValidityEnd(), DateUtil.ISO_EXPANDED_DATE_FORMAT) && DateUtil.checkStringToDate(detail.getValidityEnd(), DateUtil.ISO_EXPANDED_DATE_FORMAT)
&& !DateUtil.stringToDate(detail.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT) && !DateUtil.stringToDate(detail.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT)
.after(DateUtil.stringToDate(detail.getValidityStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT))){ .after(DateUtil.stringToDate(detail.getValidityStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT))){
......
...@@ -3779,6 +3779,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3779,6 +3779,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} else { } else {
detail.setErrorInfo("身份证号不存在!"); detail.setErrorInfo("身份证号不存在!");
} }
if ("长期".equals(detail.getValidityEnd())) {
detail.setValidityEnd("2999-12-31");
}
// 身份证起止有效期 都有值 且 截止日期正常 // 身份证起止有效期 都有值 且 截止日期正常
if (Common.isNotNull(detail.getValidityStart()) if (Common.isNotNull(detail.getValidityStart())
&& Common.isNotNull(detail.getValidityEnd())){ && Common.isNotNull(detail.getValidityEnd())){
...@@ -3787,8 +3790,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3787,8 +3790,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (null == date1 || null == date2){ if (null == date1 || null == date2){
detail.setErrorInfo(EmployeeConstants.EMP_VALIDITY_DATE_ERROR); detail.setErrorInfo(EmployeeConstants.EMP_VALIDITY_DATE_ERROR);
}else { }else {
if (!"长期".equals(detail.getValidityEnd()) if (!DateUtil.stringToDate(detail.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT)
&& !DateUtil.stringToDate(detail.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT)
.after(DateUtil.stringToDate(detail.getValidityStart(),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);
} }
......
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