Commit 9529d095 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.23' into MVP1.7.23

parents 743ac013 90d5928e
...@@ -3078,6 +3078,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -3078,6 +3078,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
EmployeeRegistration exit; EmployeeRegistration exit;
StringBuilder errorTempBuilder; StringBuilder errorTempBuilder;
EmployeeRegistration insert; EmployeeRegistration insert;
int nowDay = Integer.parseInt(DateUtil.getThisDay());
for (EmployeeRegistrationNewVo excel : excelVOList) { for (EmployeeRegistrationNewVo excel : excelVOList) {
selectVo = domainMap.get(excel.getDeptNo()); selectVo = domainMap.get(excel.getDeptNo());
//统一校验(整合所有错误信息一起返回) //统一校验(整合所有错误信息一起返回)
...@@ -3140,6 +3141,10 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -3140,6 +3141,10 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
} }
} }
if (Common.isNot16Age(excel.getEmpIdcard(), nowDay)) {
errorList.add(CommonConstants.UNDER_16_ERROR);
}
// 插入 // 插入
insert = new EmployeeRegistration(); insert = new EmployeeRegistration();
BeanUtil.copyProperties(excel, insert); BeanUtil.copyProperties(excel, insert);
......
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