Commit b74edbe0 authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent a6688906
...@@ -3503,15 +3503,15 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3503,15 +3503,15 @@ 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())){
if (DateUtil.isDate(detail.getValidityStart()) if (!DateUtil.checkStringToDate(detail.getValidityStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT)
&& DateUtil.isDate(detail.getValidityEnd())){ || !DateUtil.checkStringToDate(detail.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT)){
detail.setErrorInfo(EmployeeConstants.EMP_VALIDITY_DATE_ERROR);
}else {
if (!"长期".equals(detail.getValidityEnd()) if (!"长期".equals(detail.getValidityEnd())
&& !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);
} }
}else {
detail.setErrorInfo(EmployeeConstants.EMP_VALIDITY_DATE_ERROR);
} }
} }
......
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