Merge branch 'develop' into feature-licancan

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

@@ -2662,7 +2662,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType())
 							&& CommonConstants.ONE_INT == flag.intValue()){
 						// 更新预估数据
-						forecastLibraryService.updateForecastLibaryByDispatch(sf);
+						forecastLibraryService.updateForecastLibaryByDispatchReduce(sf);
 						// 更新人员档案和项目档案的社保公积金状态
 						UpProjectSocialFundVo vo = new UpProjectSocialFundVo();
 						if (Common.isNotNull(dis.getSocialId())){
@@ -3066,7 +3066,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 							// 办理失败
 							if (CommonConstants.ONE_INT == flag){
 								// 派增办理，全部失败 同步预估库数据
-								forecastLibraryService.updateForecastLibaryByDispatch(sf);
+								forecastLibraryService.updateForecastLibaryByDispatchReduce(sf);
 							}
 
 						//  2.派减办理成功  处理预估

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

@@ -1545,6 +1545,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			TForecastLibrary negateLib = new TForecastLibrary();
 			BeanUtil.copyProperties(library, negateLib);
 			negateLib.setId(null);
+			negateLib.setDataPush(CommonConstants.ZERO_INT);
 			negateLib.setUnitPensionFee(BigDecimalUtils.safeSubtract( false, zero, library.getUnitPensionFee()));
 			negateLib.setUnitMedicalFee(BigDecimalUtils.safeSubtract( false, zero, library.getUnitMedicalFee()));
 			negateLib.setUnitBirthFee(BigDecimalUtils.safeSubtract( false, zero, library.getUnitBirthFee()));
@@ -1575,6 +1576,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			TForecastLibrary negateLib = new TForecastLibrary();
 			BeanUtil.copyProperties(library, negateLib);
 			negateLib.setId(null);
+			negateLib.setDataPush(CommonConstants.ZERO_INT);
 			// 单位公积金
 			negateLib.setUnitFundSum(BigDecimalUtils.safeSubtract(false, zero, library.getUnitFundSum()));
 			// 个人公积金