Commit a38d5ad4 authored by hongguangwu's avatar hongguangwu

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

parents 867cf7e2 b13eb3fb
...@@ -913,8 +913,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -913,8 +913,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
paramVo.setDeptNo(registrationOld.getDeptNo()); paramVo.setDeptNo(registrationOld.getDeptNo());
insuranceDaprUtil.updateInsurancePreRenewToIsLeave(paramVo); insuranceDaprUtil.updateInsurancePreRenewToIsLeave(paramVo);
// 离职确认后,对该人员在该项目下的已投保未过期且有效的商险数据进行打标“可替换” //不勾选商险后 离职确认后,对该人员在该项目下的已投保未过期且有效的商险数据进行打标“可替换”
if (Common.isNotNull(leave.getDoType())) {
if (!leave.getDoType().contains(CommonConstants.THREE_STRING)) {
updateInsuranceReplaceTagBySingle(registrationOld.getEmpIdcard(), registrationOld.getDeptNo(), user.getNickname(),user.getId()); updateInsuranceReplaceTagBySingle(registrationOld.getEmpIdcard(), registrationOld.getDeptNo(), user.getNickname(),user.getId());
}
}
return R.ok(); return R.ok();
} else { } else {
return R.failed("状态不是待确认"); return R.failed("状态不是待确认");
......
...@@ -1402,12 +1402,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1402,12 +1402,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
continue; continue;
} }
if (preVo.getServerItem().contains("商险") && !preVo.getEmployeeInsurancePreVos().isEmpty()) { if (preVo.getServerItem().contains("商险") && !preVo.getEmployeeInsurancePreVos().isEmpty()) {
if (CommonConstants.THREE_STRING.equals(registration.getProcessStatus())) {
exitCheckVo.setType(preVo.getServerItem());
exitCheckVo.setErrorMsg("已拒绝入职,不可操作!");
errorList.add(exitCheckVo);
continue;
}
//批量的商险是否已购买默认为否 //批量的商险是否已购买默认为否
if (Common.isEmpty(preVo.getInsuranceIsBuy())) { if (Common.isEmpty(preVo.getInsuranceIsBuy())) {
preVo.setInsuranceIsBuy(CommonConstants.ONE_STRING); preVo.setInsuranceIsBuy(CommonConstants.ONE_STRING);
......
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