Commit 9e5fc81d authored by huyuchen's avatar huyuchen

huych-实缴导入逻辑修改

parent 0906b3e6
...@@ -227,6 +227,7 @@ public class TSocialFundInfo extends BaseEntity { ...@@ -227,6 +227,7 @@ public class TSocialFundInfo extends BaseEntity {
@Schema(description = "缴纳地-县" ) @Schema(description = "缴纳地-县" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("缴纳地-县" ) @ExcelProperty("缴纳地-县" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String socialTown; private String socialTown;
/** /**
* 公积金户 * 公积金户
......
...@@ -138,6 +138,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -138,6 +138,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private final TDispatchSocialFundInfoService infoService; private final TDispatchSocialFundInfoService infoService;
private final SysHouseHoldInfoMapper houseHoldInfoMapper;
/** /**
* 派单信息记录表简单分页查询 * 派单信息记录表简单分页查询
* *
...@@ -3940,6 +3942,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3940,6 +3942,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
boolean auditFlag = true; boolean auditFlag = true;
boolean partSuccess = false; boolean partSuccess = false;
TDispatchSocialFundInfo socialFundInfo; TDispatchSocialFundInfo socialFundInfo;
SysHouseHoldInfo info;
for (TDispatchInfo dis : disList) { for (TDispatchInfo dis : disList) {
auditFlag = true; auditFlag = true;
if (CommonConstants.ZERO_STRING.equals(typeSub)) { if (CommonConstants.ZERO_STRING.equals(typeSub)) {
...@@ -4022,6 +4025,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4022,6 +4025,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 社保办理状态补充判断: // 社保办理状态补充判断:
this.setSocialHandleStatus(handleStatus, socialType, flag, socialInfo, dis,sf, isAutoHandle); this.setSocialHandleStatus(handleStatus, socialType, flag, socialInfo, dis,sf, isAutoHandle);
info = houseHoldInfoMapper.selectOne(Wrappers.<SysHouseHoldInfo>query().lambda()
.eq(SysHouseHoldInfo::getType,CommonConstants.ZERO_STRING)
.eq(SysHouseHoldInfo::getName,dis.getSocialHouseholdName())
.last(CommonConstants.LAST_ONE_SQL));
sf.setSocialHouseholdName(dis.getSocialHouseholdName());
sf.setSocialHousehold(info == null ? "" : info.getId());
sf.setSocialProvince(dis.getSocialProvince());
sf.setSocialCity(dis.getSocialCity());
sf.setSocialTown(dis.getSocialTown());
socialMapper.updateById(socialInfo); socialMapper.updateById(socialInfo);
dis.setSocialHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark)); dis.setSocialHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark));
...@@ -4116,6 +4128,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4116,6 +4128,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(socialInfo) && Common.isNotNull(socialInfo.getId())) { if (Common.isNotNull(socialInfo) && Common.isNotNull(socialInfo.getId())) {
// 社保办理状态补充判断: // 社保办理状态补充判断:
this.setSocialHandleStatus(handleStatus, socialType, flag, socialInfo, dis,sf, isAutoHandle); this.setSocialHandleStatus(handleStatus, socialType, flag, socialInfo, dis,sf, isAutoHandle);
info = houseHoldInfoMapper.selectOne(Wrappers.<SysHouseHoldInfo>query().lambda()
.eq(SysHouseHoldInfo::getType,CommonConstants.ZERO_STRING)
.eq(SysHouseHoldInfo::getName,dis.getSocialHouseholdName())
.last(CommonConstants.LAST_ONE_SQL));
sf.setSocialHouseholdName(dis.getSocialHouseholdName());
sf.setSocialHousehold(info == null ? "" : info.getId());
sf.setSocialProvince(dis.getSocialProvince());
sf.setSocialCity(dis.getSocialCity());
sf.setSocialTown(dis.getSocialTown());
socialInfo.setReduceHandleUser(user.getId()); socialInfo.setReduceHandleUser(user.getId());
socialInfo.setReduceHandleTime(now); socialInfo.setReduceHandleTime(now);
//社保派减办理成功才变更社保的办理状态 //社保派减办理成功才变更社保的办理状态
...@@ -4249,6 +4271,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4249,6 +4271,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
auditInfoMapper.insert(auditInfo); auditInfoMapper.insert(auditInfo);
} }
baseMapper.updateById(dis); baseMapper.updateById(dis);
//v1.8.9更新社保公积金缴纳地和户数据
socialFundMapper.updateById(sf); socialFundMapper.updateById(sf);
//派减的申请审核完更新社保公积金查询快照表 //派减的申请审核完更新社保公积金查询快照表
if (CommonConstants.ONE_STRING.equals(dis.getType())) { if (CommonConstants.ONE_STRING.equals(dis.getType())) {
......
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