派单调整

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

@@ -2464,8 +2464,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									socialInfo.setDeleteFlag(CommonConstants.ONE_STRING);
 									sf.setSocialAddStatus(CommonConstants.FIVE_STRING);
 									sf.setSocialStatus(CommonConstants.TEN_STRING);
-									// 更新预估数据
-									forecastLibraryService.updateForecastLibaryByDispatch(sf);
 								}
 								socialInfo.setAuditTime(now);
 								socialInfo.setAuditUser(user.getId());
@@ -2515,8 +2513,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									providentFund.setDeleteFlag(CommonConstants.ONE_STRING);
 									sf.setFundAddStatus(CommonConstants.FOUR_STRING);
 									sf.setFundStatus(CommonConstants.NINE_STRING);
-									// 更新预估数据
-									forecastLibraryService.updateForecastLibaryByDispatch(sf);
 								}
 								providentFund.setAuditTime(now);
 								providentFund.setAuditUser(user.getId());
@@ -2587,6 +2583,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					dis.setAuditTime(now);
 					baseMapper.updateById(dis);
 					socialFundMapper.updateById(sf);
+					// 派增审核不通过
+					if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType())
+							&& CommonConstants.ONE_INT == flag.intValue()){
+						// 更新预估数据
+						forecastLibraryService.updateForecastLibaryByDispatch(sf);
+					}
 				}
 			} catch (Exception e) {
 				log.error(DispatchConstants.DISPATCH_AUDIT_ERROR , e);
@@ -2746,11 +2748,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 
 								// 社保办理状态补充判断：
 								this.setSocialHandleStatus(handleStatus, socialType, flag, socialInfo, dis,sf);
-								// 派增办理，全部失败，清空社保状态
-								if (CommonConstants.TWO_STRING.equals(socialInfo.getHandleStatus())) {
-									// 同步预估库数据
-									forecastLibraryService.updateForecastLibaryByDispatch(sf);
-								}
+
 								socialMapper.updateById(socialInfo);
 								dis.setSocialHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark));
 								auditInfo.setType(CommonConstants.ONE_STRING);
@@ -2791,8 +2789,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									providentFund.setReduceCan(CommonConstants.dingleDigitStrArray[1]);
 									sf.setFundAddStatus(CommonConstants.THREE_STRING);
 									sf.setFundStatus(CommonConstants.FOUR_STRING);
-									// 同步预估库数据
-									forecastLibraryService.updateForecastLibaryByDispatch(sf);
 								}
 								fundMapper.updateById(providentFund);
 								dis.setFundHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark));
@@ -2825,8 +2821,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									}
 									sf.setSocialReduceStatus(CommonConstants.TWO_STRING);
 									sf.setSocialStatus(CommonConstants.EIGHT_STRING);
-									// 同步预估库数据
-									forecastLibraryService.updateForecastLibaryByDispatchReduce(sf);
 								}
 								if (CommonConstants.ONE_INT == flag) {
 									//派减办理不通过
@@ -2875,8 +2869,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									}
 									sf.setFundReduceStatus(CommonConstants.TWO_STRING);
 									sf.setFundStatus(CommonConstants.SEVEN_STRING);
-									// 派减办理成功后，同步预估库数据清理
-									forecastLibraryService.updateForecastLibaryByDispatchReduce(sf);
 								}
 								if (CommonConstants.ONE_INT == flag) {
 									//派减办理不通过
@@ -2966,6 +2958,21 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						auditInfoMapper.insert(auditInfo);
 						baseMapper.updateById(dis);
 						socialFundMapper.updateById(sf);
+						//1.派增办理失败 刷新预估数据
+						if (CommonConstants.ZERO_STRING.equals(dis.getType())
+								&& CommonConstants.TWO_STRING.equals(socialInfo.getHandleStatus())) {
+							// 派增办理，全部失败，清空社保状态
+							if (CommonConstants.TWO_STRING.equals(socialInfo.getHandleStatus())) {
+								// 同步预估库数据
+								forecastLibraryService.updateForecastLibaryByDispatch(sf);
+							}
+						}
+						//  2.派减办理成功  处理预估
+						if (CommonConstants.ONE_STRING.equals(dis.getType())
+								&& CommonConstants.ZERO_INT == flag){
+							// 同步预估库数据
+							forecastLibraryService.updateForecastLibaryByDispatchReduce(sf);
+						}
 					} else {
 						errorList.add(new ErrorMessage(-1, "派单数据错误！"));
 					}