Commit 9d511e82 authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent b74edbe0
...@@ -3333,6 +3333,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3333,6 +3333,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
Map<String, String> parentAreaMap = new HashMap<>(); Map<String, String> parentAreaMap = new HashMap<>();
Map<String, Date> startDateMap; Map<String, Date> startDateMap;
int lineNum = 2; int lineNum = 2;
Date date1;
Date date2;
for (Map<String, String> rowMap : vo.getContentList()) { for (Map<String, String> rowMap : vo.getContentList()) {
curVo = null; curVo = null;
errorMust = new StringBuilder(); errorMust = new StringBuilder();
...@@ -3503,8 +3505,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3503,8 +3505,9 @@ 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.checkStringToDate(detail.getValidityStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT) date1 = DateUtil.stringToDate(detail.getValidityStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT);
|| !DateUtil.checkStringToDate(detail.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT)){ date2 = DateUtil.stringToDate(detail.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT);
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 (!"长期".equals(detail.getValidityEnd())
...@@ -3514,6 +3517,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3514,6 +3517,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} }
} }
} }
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