Commit 3830ca72 authored by hongguangwu's avatar hongguangwu

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

parents ba4debec c61e5409
...@@ -627,6 +627,6 @@ public interface CommonConstants { ...@@ -627,6 +627,6 @@ public interface CommonConstants {
List<String> socialStatus = Stream.of("3","4","6","7","9","11","12").collect(Collectors.toList()); List<String> socialStatus = Stream.of("3","4","6","7","9","11","12").collect(Collectors.toList());
List<String> socialInfoStatus = Stream.of("1","5","7").collect(Collectors.toList()); List<String> socialInfoStatus = Stream.of("1","3","5","7").collect(Collectors.toList());
} }
...@@ -140,8 +140,9 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -140,8 +140,9 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
bizContent.setLanguage("zh_CN"); bizContent.setLanguage("zh_CN");
String fSeqNo = "AHWX" + System.currentTimeMillis(); String fSeqNo = "AHWX" + System.currentTimeMillis();
bizContent.setfSeqno(fSeqNo); bizContent.setfSeqno(fSeqNo);
bizContent.setAccountNo("1302010109024596014"); bizContent.setAccountNo("1302015209250019444");
bizContent.setBeginDate(DateUtil.getThisDay()); bizContent.setBeginDate(DateUtil.addDay(-10).replace("-",""));
bizContent.setEndDate(DateUtil.getThisDay());
bizContent.setDrcrf("2"); bizContent.setDrcrf("2");
request.setServiceUrl(icbcConfigProperties.getServerUrl()); request.setServiceUrl(icbcConfigProperties.getServerUrl());
request.setBizContent(bizContent); request.setBizContent(bizContent);
......
...@@ -138,8 +138,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -138,8 +138,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private final TDispatchSocialFundInfoService infoService; private final TDispatchSocialFundInfoService infoService;
private final SysHouseHoldInfoMapper houseHoldInfoMapper;
/** /**
* 派单信息记录表简单分页查询 * 派单信息记录表简单分页查询
* *
...@@ -3942,7 +3940,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3942,7 +3940,6 @@ 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)) {
...@@ -4025,15 +4022,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4025,15 +4022,6 @@ 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));
...@@ -4129,15 +4117,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4129,15 +4117,6 @@ 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());
socialInfo.setReduceHandleUser(user.getId()); socialInfo.setReduceHandleUser(user.getId());
socialInfo.setReduceHandleTime(now); socialInfo.setReduceHandleTime(now);
//社保派减办理成功才变更社保的办理状态 //社保派减办理成功才变更社保的办理状态
......
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