Commit 540fede7 authored by huyuchen's avatar huyuchen

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

parents 0cb205b2 d3155218
......@@ -1231,6 +1231,16 @@ public class TSocialFundInfo extends BaseEntity {
@ExcelProperty("派单ID" )
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)
private String doMonth;
......
......@@ -3665,6 +3665,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialInfo.setDeleteFlag(CommonConstants.ONE_STRING);
sf.setSocialAddStatus(CommonConstants.FIVE_STRING);
sf.setSocialStatus(CommonConstants.TEN_STRING);
//如果是部分办理失败的恢复最新的socialId ,避免后面派减取值问题
if (null != sf.getSocialIdSuccess()){
sf.setSocialId(sf.getSocialIdSuccess());
}
}
socialInfo.setAuditTime(now);
socialInfo.setAuditUser(user.getId());
......@@ -4318,7 +4323,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialInfo.setHandleTime(now);
socialInfo.setHandleUser(user.getId());
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);
......
......@@ -164,6 +164,7 @@
<result property="socialStatus" column="SOCIAL_STATUS"/>
<result property="fundStatus" column="FUND_STATUS"/>
<result property="dispatchId" column="DISPATCH_ID"/>
<result property="socialIdSuccess" column="SOCIAL_ID_SUCCESS"/>
</resultMap>
......@@ -530,7 +531,7 @@
a.PERSONAL_INTEREST_FEE,
a.SOCIAL_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 id="tSocialFundInfo_where">
<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