Commit ac1e2061 authored by huyuchen's avatar huyuchen

huych-档案更新优化

parent f4034726
...@@ -572,7 +572,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -572,7 +572,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
insurancePreVo.setEmpIdcard(registration.getEmpIdcard()); insurancePreVo.setEmpIdcard(registration.getEmpIdcard());
insurancePreVo.setDeptNo(registration.getDeptNo()); insurancePreVo.setDeptNo(registration.getDeptNo());
//商险是否存在判断 //商险是否存在判断
checkVo = checkInsuranceExit(insurancePreVo,preVo.getEmployeeName(),preVo.getEmpIdcard()); checkVo = checkInsuranceExit(insurancePreVo,registration.getEmployeeName(),registration.getEmpIdcard());
if (null != checkVo) { if (null != checkVo) {
errorList.add(checkVo); errorList.add(checkVo);
} else { } else {
...@@ -750,8 +750,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -750,8 +750,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
} }
} }
EmployeeRegistrationBatchErrorVo batchErrorVo = new EmployeeRegistrationBatchErrorVo(); EmployeeRegistrationBatchErrorVo batchErrorVo = new EmployeeRegistrationBatchErrorVo();
batchErrorVo.setErrorList(errorList);
batchErrorVo.setRegistrationReceiveVoList(receiveVoList); batchErrorVo.setRegistrationReceiveVoList(receiveVoList);
batchErrorVo.setErrorList(errorList);
if (!errorList.isEmpty()) { if (!errorList.isEmpty()) {
return R.other(CommonConstants.TWO_INT, null, batchErrorVo); return R.other(CommonConstants.TWO_INT, null, batchErrorVo);
} }
......
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