Commit d7f2dc66 authored by hongguangwu's avatar hongguangwu

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

parents ec8bb047 540fede7
...@@ -246,8 +246,12 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -246,8 +246,12 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
// 是否修改了商险 // 是否修改了商险
boolean isModifyInsurance = false; boolean isModifyInsurance = false;
TEmployeeInsurancePre oldInsurance; TEmployeeInsurancePre oldInsurance;
String differenceInsuranceKey;
TEmployeePreLogDetail detailInsuranceLog; TEmployeePreLogDetail detailInsuranceLog;
String differenceInsuranceKey;
//如果服务类型包含商险处理商险明细数据
newInfo.setId(empPreId);
if (Common.isNotNull(newInfo.getServerItem()) && newInfo.getServerItem().contains("商险")) {
//是否已购买商险单独加日志
if (Common.isEmpty(isBuyOld) || (Common.isNotNull(isBuyOld) && !isBuyOld.equals(isBuyNew))) { if (Common.isEmpty(isBuyOld) || (Common.isNotNull(isBuyOld) && !isBuyOld.equals(isBuyNew))) {
//单独记录是否已购买商险的变更记录 //单独记录是否已购买商险的变更记录
differenceInsuranceKey = "insuranceIsBuy"; differenceInsuranceKey = "insuranceIsBuy";
...@@ -262,9 +266,6 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -262,9 +266,6 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
isModifyInsurance = true; isModifyInsurance = true;
detailList.add(detailInsuranceLog); detailList.add(detailInsuranceLog);
} }
//如果服务类型包含商险处理商险明细数据
newInfo.setId(empPreId);
if (Common.isNotNull(newInfo.getServerItem()) && newInfo.getServerItem().contains("商险")) {
if (!newInfo.getExitInsuranceInfoList().isEmpty()) { if (!newInfo.getExitInsuranceInfoList().isEmpty()) {
newInfo.getExitInsuranceInfoList().forEach(insurancePreVo -> insurancePreVo.setRegisterId(empPreId)); newInfo.getExitInsuranceInfoList().forEach(insurancePreVo -> insurancePreVo.setRegisterId(empPreId));
} }
...@@ -341,6 +342,13 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -341,6 +342,13 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
diffTitle = "商险信息"; diffTitle = "商险信息";
} }
} }
} else {
// 没有变更
if (Common.isNotNull(diffTitle)) {
diffTitle += "、商险信息";
} else {
diffTitle = "商险信息";
}
} }
String differenceContractKey = null; String differenceContractKey = null;
......
...@@ -553,7 +553,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI ...@@ -553,7 +553,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
} else { } else {
tGzEmpInfo.setUpdateBy(user.getId()); tGzEmpInfo.setUpdateBy(user.getId());
tGzEmpInfo.setUpdateTime(LocalDateTime.now()); tGzEmpInfo.setUpdateTime(LocalDateTime.now());
// 1.7.14: 档案状态是提交,更新 创建时间(提交时间) // 1.7.14: 档案状态是提交,更新 提交时间
if(CommonConstants.ZERO_STRING.equals(tGzEmpInfoVo.getEmpStatus())){ if(CommonConstants.ZERO_STRING.equals(tGzEmpInfoVo.getEmpStatus())){
tGzEmpInfo.setSubmitTime(LocalDateTime.now()); tGzEmpInfo.setSubmitTime(LocalDateTime.now());
} }
......
...@@ -3882,7 +3882,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3882,7 +3882,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
} }
//本次派单人员系统已有参保明细 如果是二次派单则无需校验 //本次派单人员系统已有参保明细 如果是二次派单则无需校验
if (Common.isEmpty(param.getIsExit())) { if (Common.isEmpty(param.getIsExit())) {
List<TInsurancePreDetail> listInsured = baseMapper.getOnProcessInsuredList(param.getEmpIdcardNo()); List<TInsurancePreDetail> listInsured = baseMapper.getOnProcessInsuredList(param.getReplaceEmpIdcardNo());
if (Common.isNotNull(listInsured) && !listInsured.isEmpty()) { if (Common.isNotNull(listInsured) && !listInsured.isEmpty()) {
param.setIsExit(CommonConstants.ONE_STRING); param.setIsExit(CommonConstants.ONE_STRING);
param.setErrorMessage(InsurancesConstants.DIS_PERSON_DATA_IS_EXIST); param.setErrorMessage(InsurancesConstants.DIS_PERSON_DATA_IS_EXIST);
......
...@@ -1231,6 +1231,16 @@ public class TSocialFundInfo extends BaseEntity { ...@@ -1231,6 +1231,16 @@ public class TSocialFundInfo extends BaseEntity {
@ExcelProperty("派单ID" ) @ExcelProperty("派单ID" )
private String dispatchId; private String dispatchId;
/**
* 社保ID(取值最新办理成功的社保ID)
*/
@Length(max = 32, message = "社保ID(取值最新办理成功的社保ID) 不能超过32个字符" )
@ExcelAttribute(name = "社保ID(取值最新办理成功的社保ID)", maxLength = 32)
@Schema(description = "社保ID(取值最新办理成功的社保ID)" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保ID(取值最新办理成功的社保ID)" )
private String socialIdSuccess;
// 执行月份,整体调基使用的 // 执行月份,整体调基使用的
@TableField(exist = false) @TableField(exist = false)
private String doMonth; private String doMonth;
......
...@@ -3665,6 +3665,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3665,6 +3665,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialInfo.setDeleteFlag(CommonConstants.ONE_STRING); socialInfo.setDeleteFlag(CommonConstants.ONE_STRING);
sf.setSocialAddStatus(CommonConstants.FIVE_STRING); sf.setSocialAddStatus(CommonConstants.FIVE_STRING);
sf.setSocialStatus(CommonConstants.TEN_STRING); sf.setSocialStatus(CommonConstants.TEN_STRING);
//如果是部分办理失败的恢复最新的socialId ,避免后面派减取值问题
if (null != sf.getSocialIdSuccess()){
sf.setSocialId(sf.getSocialIdSuccess());
}
} }
socialInfo.setAuditTime(now); socialInfo.setAuditTime(now);
socialInfo.setAuditUser(user.getId()); socialInfo.setAuditUser(user.getId());
...@@ -4318,7 +4323,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4318,7 +4323,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialInfo.setHandleTime(now); socialInfo.setHandleTime(now);
socialInfo.setHandleUser(user.getId()); socialInfo.setHandleUser(user.getId());
socialInfo.setHandleUserName(user.getNickname()); socialInfo.setHandleUserName(user.getNickname());
//如果派单有办理成功项 就把最新的办理成功的社保明细ID存储到社保公积金查询中 20250820 修复部分办理成功后派减的问题
if (CommonConstants.ONE_STRING.equals(handleStatus)){
sf.setSocialIdSuccess(socialInfo.getId());
}
// 社保办理状态补充判断: // 社保办理状态补充判断:
this.setSocialHandleStatus(handleStatus, socialType, flag, socialInfo, dis, sf, isAutoHandle); this.setSocialHandleStatus(handleStatus, socialType, flag, socialInfo, dis, sf, isAutoHandle);
...@@ -4598,8 +4606,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4598,8 +4606,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
//社保公积金派减办理成功 //社保公积金派减办理成功
if ((CommonConstants.ONE_STRING.equals(dis.getType()) && CommonConstants.ZERO_INT == flag if ((CommonConstants.ONE_STRING.equals(dis.getType()) && CommonConstants.ZERO_INT == flag
&& CommonConstants.EIGHT_STRING.equals(sf.getSocialStatus()) && (CommonConstants.EIGHT_STRING.equals(sf.getSocialStatus()) || CommonConstants.FIVE_STRING.equals(sf.getSocialStatus()))
&& (CommonConstants.SEVEN_STRING.equals(sf.getFundStatus()) && (CommonConstants.SEVEN_STRING.equals(sf.getFundStatus())
|| CommonConstants.FOUR_STRING.equals(sf.getFundStatus())
|| Common.isEmpty(sf.getFundStatus()))) || || Common.isEmpty(sf.getFundStatus()))) ||
(CommonConstants.ZERO_STRING.equals(dis.getType()) && CommonConstants.ONE_INT == flag && (CommonConstants.ZERO_STRING.equals(dis.getType()) && CommonConstants.ONE_INT == flag &&
CommonConstants.EIGHT_STRING.equals(sf.getSocialStatus()) CommonConstants.EIGHT_STRING.equals(sf.getSocialStatus())
......
...@@ -164,6 +164,7 @@ ...@@ -164,6 +164,7 @@
<result property="socialStatus" column="SOCIAL_STATUS"/> <result property="socialStatus" column="SOCIAL_STATUS"/>
<result property="fundStatus" column="FUND_STATUS"/> <result property="fundStatus" column="FUND_STATUS"/>
<result property="dispatchId" column="DISPATCH_ID"/> <result property="dispatchId" column="DISPATCH_ID"/>
<result property="socialIdSuccess" column="SOCIAL_ID_SUCCESS"/>
</resultMap> </resultMap>
...@@ -530,7 +531,7 @@ ...@@ -530,7 +531,7 @@
a.PERSONAL_INTEREST_FEE, a.PERSONAL_INTEREST_FEE,
a.SOCIAL_STATUS, a.SOCIAL_STATUS,
a.FUND_STATUS, a.FUND_STATUS,
a.DISPATCH_ID,a.UNIT_SOCIAL_SUM,a.PERSONAL_SOCIAL_SUM a.DISPATCH_ID,a.UNIT_SOCIAL_SUM,a.PERSONAL_SOCIAL_SUM,a.SOCIAL_ID_SUCCESS
</sql> </sql>
<sql id="tSocialFundInfo_where"> <sql id="tSocialFundInfo_where">
<if test="tSocialFundInfo != null"> <if test="tSocialFundInfo != null">
......
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