Commit 767020cf authored by hongguangwu's avatar hongguangwu

MVP1.6.4-社保士兵加日志

parent 1973fd17
...@@ -78,17 +78,17 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -78,17 +78,17 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
if (Common.isNotNull(terminalId)) { if (Common.isNotNull(terminalId)) {
// 3上传文件,获取文件地址 // 3上传文件,获取文件地址
String fileAddUrl = socialConfig.getThreeTerminalId(restTemplate, file); String fileAddUrl = socialConfig.getThreeTerminalId(restTemplate, file);
log.info(fileAddUrl);
// 4 推送办理任务,返回任务id: // 4 推送办理任务,返回任务id:
String addId = socialConfig.getFourAppAdd(restTemplate, fileAddUrl, moduleDetailMap.get(type), terminalId); String addId = socialConfig.getFourAppAdd(restTemplate, fileAddUrl, moduleDetailMap.get(type), terminalId);
log.info(addId);
for (TSocialInfo socialInfo : socialList) { for (TSocialInfo socialInfo : socialList) {
if ("社保增员".equals(type) || "社保减员".equals(type)) { if ("社保增员".equals(type) || "社保减员".equals(type)) {
socialInfo.setYgsAddId(addId); socialInfo.setYgsAddId(addId);
socialInfo.setYgsHandleStatus(CommonConstants.TWO_STRING); socialInfo.setYgsHandleStatus(CommonConstants.TWO_STRING);
log.error("社保增员TWO_STRING="+socialInfo.getId());
} else { } else {
socialInfo.setYsdAddId(addId); socialInfo.setYsdAddId(addId);
socialInfo.setYsdHandleStatus(CommonConstants.TWO_STRING); socialInfo.setYsdHandleStatus(CommonConstants.TWO_STRING);
log.error("医疗增员TWO_STRING="+socialInfo.getId());
} }
} }
tSocialInfoService.updateBatchById(socialList); tSocialInfoService.updateBatchById(socialList);
...@@ -136,9 +136,11 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -136,9 +136,11 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
**/ **/
@Override @Override
public R<String> pushSoldier(List<String> dispatchIdList) { public R<String> pushSoldier(List<String> dispatchIdList) {
log.error("dispatchIdList="+dispatchIdList);
// 社保增员、社保减员、医保增员、医保减员 // 社保增员、社保减员、医保增员、医保减员
// 养工失新增列表 // 养工失新增列表
List<SocialSoldierYgsAddVo> ygsAddlist = baseMapper.getSocialSoldierYgsAddVoList(dispatchIdList); List<SocialSoldierYgsAddVo> ygsAddlist = baseMapper.getSocialSoldierYgsAddVoList(dispatchIdList);
log.error("ygsAddlist="+ygsAddlist);
if (ygsAddlist != null && !ygsAddlist.isEmpty()) { if (ygsAddlist != null && !ygsAddlist.isEmpty()) {
List<TSocialInfo> socialIdList = new ArrayList<>(); List<TSocialInfo> socialIdList = new ArrayList<>();
TSocialInfo socialInfo; TSocialInfo socialInfo;
...@@ -149,6 +151,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -149,6 +151,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
} }
MultipartFile file = this.getFile(ygsAddlist); MultipartFile file = this.getFile(ygsAddlist);
if (Common.isNotNull(file)) { if (Common.isNotNull(file)) {
log.error("社保增员");
this.getOneAppGetModuleDetail(socialIdList, file, "社保增员"); this.getOneAppGetModuleDetail(socialIdList, file, "社保增员");
} }
} }
...@@ -164,6 +167,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -164,6 +167,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
} }
MultipartFile file = this.getFile(ygsReducelist); MultipartFile file = this.getFile(ygsReducelist);
if (Common.isNotNull(file)) { if (Common.isNotNull(file)) {
log.error("社保减员");
this.getOneAppGetModuleDetail(socialIdList, file, "社保减员"); this.getOneAppGetModuleDetail(socialIdList, file, "社保减员");
} }
} }
...@@ -179,6 +183,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -179,6 +183,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
} }
MultipartFile file = this.getFile(ysdAddlist); MultipartFile file = this.getFile(ysdAddlist);
if (Common.isNotNull(file)) { if (Common.isNotNull(file)) {
log.error("医保增员");
this.getOneAppGetModuleDetail(socialIdList, file, "医保增员"); this.getOneAppGetModuleDetail(socialIdList, file, "医保增员");
} }
} }
...@@ -194,6 +199,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -194,6 +199,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
} }
MultipartFile file = this.getFile(ysdReducelist); MultipartFile file = this.getFile(ysdReducelist);
if (Common.isNotNull(file)) { if (Common.isNotNull(file)) {
log.error("医保减员");
this.getOneAppGetModuleDetail(socialIdList, file, "医保减员"); this.getOneAppGetModuleDetail(socialIdList, file, "医保减员");
} }
} }
......
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