MVP1.6.4-选择“皖信自动化处理”

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/SocialConfig.java

@@ -178,11 +178,13 @@ public class SocialConfig {
 			}
 			List<HashMap> dataList = JSON.parseArray(bodyObject.getString("data"), HashMap.class);
 			String label;
+			String disabled;
 			if (dataList != null && !dataList.isEmpty()) {
 				for (HashMap data : dataList) {
 					terminalId = String.valueOf(data.get("value"));
 					label = String.valueOf(data.get("label"));
-					if (Common.isNotNull(label) && label.contains("空闲")) {
+					disabled = String.valueOf(data.get("disabled"));
+					if ("false".equals(disabled) && Common.isNotNull(label) && label.contains("皖信自动化处理") && label.contains("空闲")) {
 						break;
 					}
 				}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierPushServiceImpl.java

@@ -88,11 +88,9 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
 					if ("社保增员".equals(type) || "社保减员".equals(type)) {
 						socialInfo.setYgsAddId(addId);
 						socialInfo.setYgsHandleStatus(CommonConstants.TWO_STRING);
-						log.error("社保增员TWO_STRING="+socialInfo.getId());
 					} else {
 						socialInfo.setYsdAddId(addId);
 						socialInfo.setYsdHandleStatus(CommonConstants.TWO_STRING);
-						log.error("医疗增员TWO_STRING="+socialInfo.getId());
 					}
 				}
 				tSocialInfoService.updateBatchById(socialList);
@@ -152,11 +150,11 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
 	 **/
 	@Override
 	public R<String> pushSoldier(List<String> dispatchIdList) {
-		log.error("dispatchIdList="+dispatchIdList);
+		log.info("dispatchIdList="+dispatchIdList);
 		// 社保增员、社保减员、医保增员、医保减员
 		// 养工失新增列表
 		List<SocialSoldierYgsAddVo> ygsAddlist = baseMapper.getSocialSoldierYgsAddVoList(dispatchIdList);
-		log.error("ygsAddlist="+ygsAddlist);
+		log.info("ygsAddlist="+ygsAddlist);
 		if (ygsAddlist != null && !ygsAddlist.isEmpty()) {
 			List<TSocialInfo> socialIdList = new ArrayList<>();
 			TSocialInfo socialInfo;
@@ -167,7 +165,6 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
 			}
 			MultipartFile file = this.getFile(ygsAddlist, 1);
 			if (Common.isNotNull(file)) {
-				log.error("社保增员"+file.getOriginalFilename());
 				this.getOneAppGetModuleDetail(socialIdList, file, "社保增员");
 			}
 		}
@@ -183,7 +180,6 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
 			}
 			MultipartFile file = this.getFile(ygsReducelist, 2);
 			if (Common.isNotNull(file)) {
-				log.error("社保减员"+file.getOriginalFilename());
 				this.getOneAppGetModuleDetail(socialIdList, file, "社保减员");
 			}
 		}
@@ -199,7 +195,6 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
 			}
 			MultipartFile file = this.getFile(ysdAddlist, 3);
 			if (Common.isNotNull(file)) {
-				log.error("医保增员"+file.getOriginalFilename());
 				this.getOneAppGetModuleDetail(socialIdList, file, "医保增员");
 			}
 		}
@@ -215,7 +210,6 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
 			}
 			MultipartFile file = this.getFile(ysdReducelist, 4);
 			if (Common.isNotNull(file)) {
-				log.error("医保减员"+file.getOriginalFilename());
 				this.getOneAppGetModuleDetail(socialIdList, file, "医保减员");
 			}
 		}