Commit c66c4e6f authored by fangxinjiang's avatar fangxinjiang

人员档案&预入职批量新增和更新对应身份证有效期起止日志校验-fxj

parent cd082dd0
...@@ -1139,6 +1139,12 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -1139,6 +1139,12 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
errorMsg.add(EmployeeConstants.VALIDITY_END_FORMAT); errorMsg.add(EmployeeConstants.VALIDITY_END_FORMAT);
errorMsgMap.put(lineNum, new ErrorMessage(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 @Override
...@@ -2073,6 +2079,13 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2073,6 +2079,13 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
saveEmp.setValidityEnd(DateUtil.stringToDate(excel.getValidityEnd(), DateUtil.ISO_EXPANDED_DATE_FORMAT)); saveEmp.setValidityEnd(DateUtil.stringToDate(excel.getValidityEnd(), DateUtil.ISO_EXPANDED_DATE_FORMAT));
} }
} }
// 身份证起止有效期 都有值 且 截止日期正常
if (Common.isNotNull(excel.getValidityStart())
&& !"长期".equals(excel.getValidityEnd())
&& DateUtil.checkStringToDate(excel.getValidityEnd(), DateUtil.ISO_EXPANDED_DATE_FORMAT)
&& excel.getValidityStart().after(DateUtil.stringToDate(excel.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT))){
errorMsg.add(EmployeeConstants.EMP_VALIDITY_END_START_DATE);
}
} }
// 档案所在地 // 档案所在地
if (Common.isNotNull(excel.getFileProvince())) { if (Common.isNotNull(excel.getFileProvince())) {
...@@ -3504,6 +3517,14 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -3504,6 +3517,14 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
} else { } else {
detail.setErrorInfo("身份证号不存在!"); detail.setErrorInfo("身份证号不存在!");
} }
// 身份证起止有效期 都有值 且 截止日期正常
if (Common.isNotNull(detail.getValidityStart())
&& Common.isNotNull(detail.getValidityEnd())
&& !"长期".equals(detail.getValidityEnd())
&& DateUtil.stringToDate(detail.getValidityStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT)
.after(DateUtil.stringToDate(detail.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT))){
detail.setErrorInfo(EmployeeConstants.EMP_VALIDITY_END_START_DATE);
}
excelList.add(detail); excelList.add(detail);
} }
......
...@@ -35,6 +35,7 @@ import com.yifu.cloud.plus.v1.check.entity.TCheckBankNo; ...@@ -35,6 +35,7 @@ import com.yifu.cloud.plus.v1.check.entity.TCheckBankNo;
import com.yifu.cloud.plus.v1.check.entity.TCheckIdCard; import com.yifu.cloud.plus.v1.check.entity.TCheckIdCard;
import com.yifu.cloud.plus.v1.check.vo.CheckBatchVo; import com.yifu.cloud.plus.v1.check.vo.CheckBatchVo;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaMap; import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaMap;
import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeConstants;
import com.yifu.cloud.plus.v1.yifu.archives.entity.*; import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TArchivesExportLimitMapper; import com.yifu.cloud.plus.v1.yifu.archives.mapper.TArchivesExportLimitMapper;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TArchivesLimitMapper; import com.yifu.cloud.plus.v1.yifu.archives.mapper.TArchivesLimitMapper;
...@@ -3466,6 +3467,14 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3466,6 +3467,14 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} else { } else {
detail.setErrorInfo("身份证号不存在!"); detail.setErrorInfo("身份证号不存在!");
} }
// 身份证起止有效期 都有值 且 截止日期正常
if (Common.isNotNull(detail.getValidityStart())
&& Common.isNotNull(detail.getValidityEnd())
&& !"长期".equals(detail.getValidityEnd())
&& DateUtil.stringToDate(detail.getValidityStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT)
.after(DateUtil.stringToDate(detail.getValidityEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT))){
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