Commit 352389b3 authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent bf7bde0c
......@@ -13,6 +13,7 @@ public class EmployeeConstants {
public static final String VALIDITY_END = "身份证截止日期必填";
public static final String VALIDITY_END_FORMAT = "身份证截止日期只能为日期格式:yyyy-MM-dd或者固定值:长期";
public static final String EMP_VALIDITY_END_START_DATE = "身份证截止日期不能小于等于身份证开始日期";
public static final String EMP_VALIDITY_DATE_ERROR = "身份证截止日期或开始日期有误,请检查修改后导入";
public static final String EMP_NATIONAL = "民族必填";
public static final String ID_PROVINCE = "户籍所在地必填";
public static final String FILE_PROVINCE = "档案所在地(省市)必填";
......
......@@ -1148,12 +1148,6 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
errorMsg.add(EmployeeConstants.VALIDITY_END_FORMAT);
errorMsgMap.put(lineNum, new ErrorMessage(EmployeeConstants.VALIDITY_END_FORMAT));
}
// 身份证起止有效期 都有值 且 截止日期正常
if (Common.isNotNull(employeeInfo.getValidityStart()) && Common.isNotNull(employeeInfo.getValidityEnd())
&& !"长期".equals(employeeInfo.getValidityEnd())
&& DateUtil.checkStringToDate(employeeInfo.getValidityEnd(), DateUtil.ISO_EXPANDED_DATE_FORMAT)
&& employeeInfo.getValidityStart().after(DateUtil.stringToDate(employeeInfo.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT))){
}
}
@Override
......
......@@ -3502,11 +3502,18 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
// 身份证起止有效期 都有值 且 截止日期正常
if (Common.isNotNull(detail.getValidityStart())
&& Common.isNotNull(detail.getValidityEnd())
&& !"长期".equals(detail.getValidityEnd())
&& !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);
&& Common.isNotNull(detail.getValidityEnd())){
if (DateUtil.isDate(detail.getValidityStart())
&& DateUtil.isDate(detail.getValidityEnd())){
if (!"长期".equals(detail.getValidityEnd())
&& !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);
}
}else {
detail.setErrorInfo(EmployeeConstants.EMP_VALIDITY_DATE_ERROR);
}
}
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