Commit 5c644f95 authored by hongguangwu's avatar hongguangwu

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

parents 11db0ba0 5cc59456
...@@ -575,6 +575,10 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -575,6 +575,10 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
checkVo = checkInsuranceExit(insurancePreVo,preVo.getEmployeeName(),preVo.getEmpIdcard()); checkVo = checkInsuranceExit(insurancePreVo,preVo.getEmployeeName(),preVo.getEmpIdcard());
if (null != checkVo) { if (null != checkVo) {
errorList.add(checkVo); errorList.add(checkVo);
} else {
if (Common.isEmpty(insurancePreVo.getProcessStatus())) {
insurancePreVo.setProcessStatus(CommonConstants.ZERO_STRING);
}
} }
} }
if (!errorList.isEmpty()) { if (!errorList.isEmpty()) {
...@@ -681,6 +685,10 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -681,6 +685,10 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if (null != checkVo) { if (null != checkVo) {
errorList.add(checkVo); errorList.add(checkVo);
continue; continue;
} else {
if (Common.isEmpty(insurancePreVo.getProcessStatus())) {
insurancePreVo.setProcessStatus(CommonConstants.ZERO_STRING);
}
} }
//入职日期需要小于等于保单截止日期 //入职日期需要小于等于保单截止日期
if (registration.getJoinLeaveDate().after(insurancePreVo.getPolicyEnd())) { if (registration.getJoinLeaveDate().after(insurancePreVo.getPolicyEnd())) {
......
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