明细接口改造

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpSalaryInfoServiceImpl.java

@@ -140,7 +140,7 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
 		//结算月份
 		salaryInfo.setFd_3adfee0690737c(salaryParam.getFd_3adfee0690737c());
 		//薪酬申请编号
-		salaryInfo.setFd_3b13b1d1ff9678(salaryParam.getFd_3b3bef19b61c38());
+		salaryInfo.setFd_3b3beee3ec7e12(salaryParam.getFd_3b3bef19b61c38());
 		//开户行支行
 		salaryInfo.setFd_3b73c214e52982(salaryParam.getFd_3b73de2809465a());
 		//初始化导入

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TForecastLibraryMapper.java

@@ -98,4 +98,8 @@ public interface TForecastLibraryMapper extends BaseMapper<TForecastLibrary> {
 
 	int updateForecastStatusById(@Param("tForecastLibrary") TForecastLibrary tForecastLibrary);
 
+	List<TForecastLibrary> selectTForecastSocialInfoList();
+
+	List<TForecastLibrary> selectTForecastFundInfoList();
+
 }

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

@@ -2416,22 +2416,26 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				.eq(TForecastLibrary::getDataPush, CommonConstants.ZERO_INT)
 				.eq(TForecastLibrary::getDataType, CommonConstants.ZERO_INT));
 		if (count > 0) {
-			Map<String,TSettleDomainSelectVo> selectVoMap = this.getSelectVoMap();
+			Map<String, TSettleDomainSelectVo> selectVoMap = this.getSelectVoMap();
 			//获取所有未推送的社保预估明细数据
-			List<TForecastLibrary> unPushInfo = null;
+			List<TForecastLibrary> unPushInfo = baseMapper.selectTForecastSocialInfoList();
 			int i = (int) Math.ceil((double) count / CommonConstants.TEN_THOUSAND_INT);
+			if (!unPushInfo.isEmpty()) {
+				List<TForecastLibrary> pushList;
+				int k = 0;
 				for (int j = 0; j < i; j++) {
-				unPushInfo= baseMapper.selectList(Wrappers.<TForecastLibrary>query().lambda()
-						.eq(TForecastLibrary::getDataPush, CommonConstants.ZERO_INT)
-						.eq(TForecastLibrary::getDataType, CommonConstants.ZERO_INT)
-						.last(" limit 0, 10000"));
-				if (Common.isNotNull(unPushInfo)){
+					if (j == i - 1) {
+						pushList = unPushInfo.subList(k, unPushInfo.size());
+					} else {
+						pushList = unPushInfo.subList(k, k + 1000);
+					}
+					k = k + 1000;
+					if (Common.isNotNull(pushList)) {
 						//推送数据封装并推送
-					initEkpPushSocialParam(unPushInfo,true,selectVoMap);
+						initEkpPushSocialParam(pushList, true, selectVoMap);
+					}
 				}
 			}
-//			unPushInfo.clear();
-//			selectVoMap.clear();
 		}
 	}
 
@@ -2453,22 +2457,26 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				.eq(TForecastLibrary::getDataPush, CommonConstants.ZERO_INT)
 				.eq(TForecastLibrary::getDataType, CommonConstants.ONE_INT));
 		if (count > 0) {
-			Map<String,TSettleDomainSelectVo> selectVoMap = this.getSelectVoMap();
-			//获取所有未推送的公积金预估明细数据
-			List<TForecastLibrary> unPushInfo = null;
+			Map<String, TSettleDomainSelectVo> selectVoMap = this.getSelectVoMap();
+			//获取所有未推送的社保预估明细数据
+			List<TForecastLibrary> unPushInfo = baseMapper.selectTForecastFundInfoList();
 			int i = (int) Math.ceil((double) count / CommonConstants.TEN_THOUSAND_INT);
+			if (!unPushInfo.isEmpty()) {
+				List<TForecastLibrary> pushList;
+				int k = 0;
 				for (int j = 0; j < i; j++) {
-				unPushInfo= baseMapper.selectList(Wrappers.<TForecastLibrary>query().lambda()
-						.eq(TForecastLibrary::getDataPush, CommonConstants.ZERO_INT)
-						.eq(TForecastLibrary::getDataType, CommonConstants.ONE_INT)
-						.last(" limit 0, 10000"));
-				if (Common.isNotNull(unPushInfo)){
+					if (j == i - 1) {
+						pushList = unPushInfo.subList(k, unPushInfo.size());
+					} else {
+						pushList = unPushInfo.subList(k, k + 1000);
+					}
+					k = k + 1000;
+					if (Common.isNotNull(pushList)) {
 						//推送数据封装并推送
-					initEkpPushFundParam(unPushInfo,true,selectVoMap);
+						initEkpPushFundParam(pushList, true, selectVoMap);
+					}
 				}
 			}
-//			unPushInfo.clear();
-//			selectVoMap.clear();
 		}
 	}
 

yifu-social/yifu-social-biz/src/main/resources/mapper/TForecastLibraryMapper.xml

@@ -947,4 +947,15 @@
 		ID = #{tForecastLibrary.id}
 	</update>
 
+	<select id="selectTForecastSocialInfoList" resultMap="tForecastLibraryMap">
+		SELECT
+		<include refid="Base_Column_List"/>
+		FROM t_forecast_library a where a.data_push = 0 and a.data_type = 0
+	</select>
+
+	<select id="selectTForecastFundInfoList" resultMap="tForecastLibraryMap">
+		SELECT
+		<include refid="Base_Column_List"/>
+		FROM t_forecast_library a where a.data_push = 0 and a.data_type = 1
+	</select>
 </mapper>