You need to sign in or sign up before continuing.
Commit 6062ad80 authored by fangxinjiang's avatar fangxinjiang

离职确认优化-fxj

parent def24911
......@@ -913,8 +913,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
paramVo.setDeptNo(registrationOld.getDeptNo());
insuranceDaprUtil.updateInsurancePreRenewToIsLeave(paramVo);
// 离职确认后,对该人员在该项目下的已投保未过期且有效的商险数据进行打标“可替换”
updateInsuranceReplaceTagBySingle(registrationOld.getEmpIdcard(), registrationOld.getDeptNo(), user.getNickname(),user.getId());
//不勾选商险后 离职确认后,对该人员在该项目下的已投保未过期且有效的商险数据进行打标“可替换”
if (Common.isNotNull(leave.getDoType())) {
if (!leave.getDoType().contains(CommonConstants.THREE_STRING)) {
updateInsuranceReplaceTagBySingle(registrationOld.getEmpIdcard(), registrationOld.getDeptNo(), user.getNickname(),user.getId());
}
}
return R.ok();
} else {
return R.failed("状态不是待确认");
......@@ -1169,9 +1173,11 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
BaseSearchListVO baseSearchListVO = new BaseSearchListVO();
baseSearchListVO.setListParam(paramVoList);
insuranceDaprUtil.updateInsurancePreRenewToIsLeaveList(baseSearchListVO);
// 离职确认后,对该人员在该项目下的已投保未过期且有效的商险数据进行打标“可替换”
updateInsuranceReplaceTagByBatch(paramVoList, user.getNickname(),user.getId());
//不勾选商险后 离职确认后,对该人员在该项目下的已投保未过期且有效的商险数据进行打标"可替换"
if (Common.isNotNull(vo.getDoTypeInsurance()) && CommonConstants.ZERO_STRING.equals(vo.getDoTypeInsurance())) {
updateInsuranceReplaceTagByBatch(paramVoList, user.getNickname(),user.getId());
}
}
if (errorMessageList.isEmpty()) {
return R.ok();
......
......@@ -1081,23 +1081,6 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
false // 不抛出异常,允许返回 null
);
if (null != insuranceDetail) {
try {
// 设置替换标签为"可替换"
insuranceDetail.setReplaceTag(InsurancesConstants.INSURANCE_REPLACE_TAG_REPLACE);
// 构建替换说明:时间 + 操作人员 + 原因
String operateTime = DateUtil.dateToString(new Date(), DateUtil.DATETIME_PATTERN_MINUTE);
String operator = Common.isEmpty(preVo.getOperator()) ? "系统" : preVo.getOperator();
String replaceRemark = String.format("%s-客服%s-对人员进行离职确认操作", operateTime, operator);
insuranceDetail.setReplaceRemark(replaceRemark);
// 更新数据库
detailService.updateById(insuranceDetail);
} catch (Exception e) {
log.error("更新商险替换标签失败,商险 ID: {}", insuranceDetail.getId(), e);
throw new RuntimeException("更新商险替换标签失败:" + e.getMessage());
}
}
}
// 状态,0待确认,1待派单,2派单失败,3待投保,4投保中,5投保退回,6已完成,7待缴费
......
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