生成收入接口修改

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

@@ -130,4 +130,6 @@ public interface TForecastLibraryService extends IService<TForecastLibrary> {
 
 	void pushForecastInfo(List<TForecastLibrary> library);
 
+	void pushForecastFundInfo(List<TForecastLibrary> library);
+
 }

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

@@ -3153,6 +3153,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									for (int i = 0; i < monthDiff; i++) {
 										//获取所有的预估数据
 										List<TForecastLibrary> libraryFundInfoList = null;
+										List<TForecastLibrary> libraryFundInfoList1 = new ArrayList<>();
 										libraryFundInfoList = forecastLibraryService.list(Wrappers.<TForecastLibrary>query().lambda()
 												.eq(TForecastLibrary::getEmpIdcard, sf.getEmpIdcard())
 												.eq(TForecastLibrary::getDataType, CommonConstants.ONE_INT)
@@ -3162,8 +3163,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 											for (TForecastLibrary library :libraryFundInfoList) {
 												//办理成功生成收入
 												createIncomeInfo(library);
+												if (CommonConstants.ZERO_INT == library.getDataPush()) {
+													libraryFundInfoList1.add(library);
+												}
+											}
+											if (Common.isNotNull(libraryFundInfoList1)) {
+												forecastLibraryService.pushForecastFundInfo(libraryFundInfoList1);
 											}
-											forecastLibraryService.pushForecastInfo(libraryFundInfoList);
 										}
 									}
 

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

@@ -1853,6 +1853,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				|| CommonConstants.THREE_STRING.equals(socialFundInfo.getSocialStatus())) {
 
 			//获取所有的预估数据
+			List<TForecastLibrary> librarySocialInfoList1 = new ArrayList<>();
 			List<TForecastLibrary> librarySocialInfoList = baseMapper.selectList(Wrappers.<TForecastLibrary>query().lambda()
 					.eq(TForecastLibrary::getEmpIdcard, empIdCard)
 					.eq(TForecastLibrary::getDataType, CommonConstants.ZERO_INT)
@@ -1862,8 +1863,13 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				for (TForecastLibrary library : librarySocialInfoList) {
 					//办理成功生成收入
 					createIncomeInfo(library);
+					if (CommonConstants.ZERO_INT == library.getDataPush()) {
+						librarySocialInfoList1.add(library);
+					}
+				}
+				if (Common.isNotNull(librarySocialInfoList1)) {
+					this.pushForecastInfo(librarySocialInfoList1);
 				}
-				this.pushForecastInfo(librarySocialInfoList);
 			}
 		}
 		if (isSaveAndUpdate) {
@@ -2308,6 +2314,14 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 		}
 	}
 
+	@Override
+	public void pushForecastFundInfo(List<TForecastLibrary> library) {
+		if (Common.isNotNull(library)) {
+			//推送数据封装并推送
+			initEkpPushFundParam(library);
+		}
+	}
+
 	public void initEkpPushSocialParam(List<TForecastLibrary> unPushInfo) {
 		List<String> pushList = new ArrayList<>();
 		Map<String,Integer> map = new HashMap<>();