Commit 5e72bef5 authored by hongguangwu's avatar hongguangwu

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

parents 36540417 013f2475
......@@ -1174,9 +1174,11 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
baseSearchListVO.setListParam(paramVoList);
insuranceDaprUtil.updateInsurancePreRenewToIsLeaveList(baseSearchListVO);
// 离职确认后,对该人员在该项目下的已投保未过期且有效的商险数据进行打标“可替换”
//不勾选商险后 离职确认后,对该人员在该项目下的已投保未过期且有效的商险数据进行打标"可替换"
if (Common.isNotNull(vo.getDoTypeInsurance()) && CommonConstants.ZERO_STRING.equals(vo.getDoTypeInsurance())) {
updateInsuranceReplaceTagByBatch(paramVoList, user.getNickname(),user.getId());
}
}
if (errorMessageList.isEmpty()) {
return R.ok();
} else {
......
......@@ -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待缴费
......
......@@ -900,4 +900,14 @@ public class TDispatchInfo extends BaseEntity {
@Schema(description ="社保待购买id")
@TableField(exist = false)
private String preId;
/**
* 我司到款单位
*/
@Length(max = 100, message = "我司到款单位 不能超过100个字符" )
@ExcelAttribute(name = "我司到款单位", maxLength = 100)
@Schema(description = "我司到款单位" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("我司到款单位" )
private String unitOfOurCompany;
}
......@@ -1341,4 +1341,14 @@ public class TSocialFundInfo extends BaseEntity {
private SysBaseSetInfo socialSetInfo;
@TableField(exist = false)
private SysBaseSetInfo fundSetInfo;
/**
* 我司到款单位
*/
@Length(max = 100, message = "我司到款单位 不能超过100个字符" )
@ExcelAttribute(name = "我司到款单位", maxLength = 100)
@Schema(description = "我司到款单位" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("我司到款单位" )
private String unitOfOurCompany;
}
......@@ -1279,4 +1279,14 @@ public class TSocialInfo extends BaseEntity {
@TableField(exist = false)
private String ysdOverDueFlag;
/**
* 我司到款单位
*/
@Length(max = 100, message = "我司到款单位 不能超过100个字符" )
@ExcelAttribute(name = "我司到款单位", maxLength = 100)
@Schema(description = "我司到款单位" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("我司到款单位" )
private String unitOfOurCompany;
}
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