派单派减分项办理

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

@@ -3676,7 +3676,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						// 派减公积金办理失败不同步档案的相关字段信息
 						if (!(CommonConstants.ONE_STRING.equals(dis.getType())
 								&& CommonConstants.ONE_INT == flag
-								&& CommonConstants.ONE_STRING.equals(typeSub))){
+								&& CommonConstants.ONE_STRING.equals(typeSub)
+								|| CommonConstants.NINE_STRING.equals(sf.getSocialStatus()))){
 							UpProjectSocialFundVo vo = new UpProjectSocialFundVo();
 							// 社保状态 社保状态（字典）: 0 无社保 1 处理中 2.部分购买 3.正常 4.已派减
 							initSocialFundStatus(socialInfo, providentFund, vo,sf);
@@ -3997,6 +3998,27 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 	}
 
 	private void initReduceStatus(TSocialInfo socialInfo, TSocialFundInfo sf, TDispatchInfo dis) {
+		// 全部失败
+		if ((CommonConstants.FOUR_STRING.equals(socialInfo.getPensionHandle())
+				|| Common.isEmpty(socialInfo.getPensionHandle()))
+				&& (CommonConstants.FOUR_STRING.equals(socialInfo.getMedicalHandle())
+				|| Common.isEmpty(socialInfo.getMedicalHandle()))
+				&& ( CommonConstants.FOUR_STRING.equals(socialInfo.getWorkInjuryHandle())
+				|| Common.isEmpty(socialInfo.getWorkInjuryHandle()))
+				&& ( CommonConstants.FOUR_STRING.equals(socialInfo.getBirthHandle())
+				|| Common.isEmpty(socialInfo.getBirthHandle()))
+				&& ( CommonConstants.FOUR_STRING.equals(socialInfo.getUnemployHandle())
+				|| Common.isEmpty(socialInfo.getUnemployHandle()))
+				&& ( (CommonConstants.FOUR_STRING.equals(socialInfo.getBigailmentHandle())
+				&& CommonConstants.ZERO_STRING.equals(socialInfo.getIsIllness()))
+				|| Common.isEmpty(socialInfo.getBigailmentHandle()))){
+			socialInfo.setHandleStatus(CommonConstants.ONE_STRING);
+			sf.setSocialStatus(CommonConstants.NINE_STRING);
+			sf.setSocialReduceStatus(CommonConstants.THREE_STRING);
+			socialInfo.setReduceCan(CommonConstants.ZERO_STRING);
+			dis.setSocialHandleStatus(CommonConstants.TWO_STRING);
+			return;
+		}
 		// 全部成功
 		if ((CommonConstants.THREE_STRING.equals(socialInfo.getPensionHandle())
 				|| Common.isEmpty(socialInfo.getPensionHandle()))
@@ -4034,27 +4056,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			}
 			return;
 		}
-		// 全部失败
-		if ((CommonConstants.FOUR_STRING.equals(socialInfo.getPensionHandle())
-				|| Common.isEmpty(socialInfo.getPensionHandle()))
-				&& (CommonConstants.FOUR_STRING.equals(socialInfo.getMedicalHandle())
-				|| Common.isEmpty(socialInfo.getMedicalHandle()))
-				&& ( CommonConstants.FOUR_STRING.equals(socialInfo.getWorkInjuryHandle())
-				|| Common.isEmpty(socialInfo.getWorkInjuryHandle()))
-				&& ( CommonConstants.FOUR_STRING.equals(socialInfo.getBirthHandle())
-				|| Common.isEmpty(socialInfo.getBirthHandle()))
-				&& ( CommonConstants.FOUR_STRING.equals(socialInfo.getUnemployHandle())
-				|| Common.isEmpty(socialInfo.getUnemployHandle()))
-				&& ( (CommonConstants.FOUR_STRING.equals(socialInfo.getBigailmentHandle())
-				&& CommonConstants.ZERO_STRING.equals(socialInfo.getIsIllness()))
-				|| Common.isEmpty(socialInfo.getBigailmentHandle()))){
-			socialInfo.setHandleStatus(CommonConstants.ONE_STRING);
-			sf.setSocialStatus(CommonConstants.NINE_STRING);
-			sf.setSocialReduceStatus(CommonConstants.THREE_STRING);
-			socialInfo.setReduceCan(CommonConstants.ZERO_STRING);
-			dis.setSocialHandleStatus(CommonConstants.TWO_STRING);
-			return;
-		}
 
 		if ((Common.isEmpty(sf.getPensionHandle()) || CommonConstants.ONE_STRING.equals(sf.getPensionHandle()))
 				|| (Common.isEmpty(sf.getMedicalHandle()) || CommonConstants.ONE_STRING.equals(sf.getMedicalHandle()))