Commit 32a71532 authored by fangxinjiang's avatar fangxinjiang

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

parent 98a60d2a
......@@ -1557,6 +1557,13 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
} else {
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.getEmpEmail())) {
if (excel.getEmpEmail().contains("@")) {
......
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