优化修改

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

@@ -3946,20 +3946,20 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 							// 同步预估库数据
 							socialTask.asynchronousDisPatchHandle(socialMap,fundMap,sf, forecastFlag,null,null,CommonConstants.ZERO_INT);
 						}
-						// 派减公积金办理失败不同步档案的相关字段信息
-						if (!(CommonConstants.ONE_STRING.equals(dis.getType())
-								&& CommonConstants.ONE_INT == flag
-								&& CommonConstants.ONE_STRING.equals(typeSub))){
+						//社保公积金派减办理成功
+						if ((CommonConstants.ONE_STRING.equals(dis.getType()) && CommonConstants.ZERO_INT == flag
+								&& CommonConstants.EIGHT_STRING.equals(sf.getSocialStatus())
+								&& (CommonConstants.SEVEN_STRING.equals(sf.getFundStatus())
+								|| Common.isEmpty(sf.getFundStatus()))) ||
+								(CommonConstants.ZERO_STRING.equals(dis.getType()) && CommonConstants.ONE_INT == flag &&
+										CommonConstants.EIGHT_STRING.equals(sf.getSocialStatus())
+										&& (CommonConstants.FOUR_STRING.equals(sf.getFundStatus())
+										|| CommonConstants.NINE_STRING.equals(sf.getFundStatus())))) {
 							UpProjectSocialFundVo vo = new UpProjectSocialFundVo();
-							// 社保状态 社保状态（字典）: 0 无社保 1 处理中 2.部分购买 3.正常 4.已派减
-							initSocialFundStatus(socialInfo, providentFund, vo,sf);
-							if (Common.isNotNull(vo.getSocialStatus()) || Common.isNotNull(vo.getFundStatus())){
+							if (Common.isNotNull(dis.getChangeContractAndEmployee())
+									&& CommonConstants.ZERO_STRING.equals(dis.getChangeContractAndEmployee())) {
 								vo.setEmpIdCard(dis.getEmpIdcard());
 								vo.setDepartNo(dis.getSettleDomainCode());
-								//派减审核通过才会处理合同档案状态
-								if (CommonConstants.ONE_INT == flag
-										&& Common.isNotNull(dis.getChangeContractAndEmployee())
-												&& CommonConstants.ZERO_STRING.equals(dis.getChangeContractAndEmployee())) {
 								vo.setChangeContractAndEmployee(dis.getChangeContractAndEmployee());
 								vo.setUserId(user.getId());
 								vo.setUserName(user.getNickname());
@@ -3968,6 +3968,22 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 								vo.setDetailId(dis.getId());
 							}
 							R<Boolean> resUp = archivesDaprUtil.updateProjectSocialFund(vo);
+							if (Common.isEmpty(resUp) || !(CommonConstants.SUCCESS.intValue() == resUp.getCode()) || !resUp.getData().booleanValue()) {
+								errorList.add(new ErrorMessage(-1, vo.getEmpIdCard() + DispatchConstants.DISPATCH_SYN_DOC_EXE, CommonConstants.RED, dis.getEmpName()));
+								continue;
+							}
+						}
+						// 派减公积金办理失败不同步档案的相关字段信息
+						if (!(CommonConstants.ONE_STRING.equals(dis.getType())
+								&& CommonConstants.ONE_INT == flag
+								&& CommonConstants.ONE_STRING.equals(typeSub))){
+							UpProjectSocialFundVo vo = new UpProjectSocialFundVo();
+							// 社保状态 社保状态（字典）: 0 无社保 1 处理中 2.部分购买 3.正常 4.已派减
+							initSocialFundStatus(socialInfo, providentFund, vo,sf);
+							if (Common.isNotNull(vo.getSocialStatus()) || Common.isNotNull(vo.getFundStatus())){
+								vo.setEmpIdCard(dis.getEmpIdcard());
+								vo.setDepartNo(dis.getSettleDomainCode());
+								R<Boolean> resUp = archivesDaprUtil.updateProjectSocialFund(vo);
 								if (Common.isEmpty(resUp) || !(CommonConstants.SUCCESS.intValue() == resUp.getCode()) || !resUp.getData().booleanValue()){
 									errorList.add(new ErrorMessage(-1, vo.getEmpIdCard()+DispatchConstants.DISPATCH_SYN_DOC_EXE,CommonConstants.RED,dis.getEmpName()));
 									continue;