Commit 8353c8b7 authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent 7c189ebd
...@@ -3790,13 +3790,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3790,13 +3790,10 @@ 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 (!DateUtil.stringToDate(detail.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT) if (!date2.after(date1)){
.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