优化修改

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

@@ -91,4 +91,6 @@ public interface TForecastLibraryMapper extends BaseMapper<TForecastLibrary> {
 	 **/
 	int changeForecastDept(@Param("idSet") Set<String> idSet, @Param("dept") TSettleDomainSelectVo dept);
 
+	int updateForecastById(@Param("tForecastLibrary") TForecastLibrary tForecastLibrary);
+
 }

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

@@ -206,6 +206,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 	 **/
 	@Override
 	public R<String> createForecastlibary(String payMonths, String empIdCard, String settleDomainIds) {
+		YifuUser user = SecurityUtils.getUser();
 		//定义未推送的按条件查询得到的预估数据
 		List<TForecastLibrary> librarySocialList = null;
 		//定义已推送的按条件查询得到的预估数据
@@ -328,7 +329,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				continue;
 			}
 			if (Common.isNotNull(library.getId())) {
-				baseMapper.updateById(library);
+				library.setUpdateBy(user.getId());
+				long startTime = System.currentTimeMillis();
+				baseMapper.updateForecastById(library);
+				long times = System.currentTimeMillis() - startTime;
+				log.error("更新一条预估耗时：" + times + "毫秒");
 				isSaveAndUpdate = true;
 			} else {
 				if (BigDecimal.ZERO.compareTo(BigDecimalUtils.isNullToZero(library.getUnitSocialSum())) != CommonConstants.ZERO_INT
@@ -1893,8 +1898,10 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			}
 			if (Common.isNotNull(library.getId())) {
 				library.setUpdateBy(userId);
-				library.setUpdateTime(LocalDateTime.now());
-				baseMapper.updateById(library);
+				long startTime = System.currentTimeMillis();
+				baseMapper.updateForecastById(library);
+				long times = System.currentTimeMillis() - startTime;
+				log.error("更新一条预估耗时：" + times + "毫秒");
 				isSaveAndUpdate = true;
 			} else {
 				if (BigDecimal.ZERO.compareTo(BigDecimalUtils.isNullToZero(library.getUnitSocialSum())) != CommonConstants.ZERO_INT
@@ -2249,8 +2256,10 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			}
 			if (Common.isNotNull(library.getId())) {
 				library.setUpdateBy("305");
-				library.setUpdateTime(LocalDateTime.now());
-				baseMapper.updateById(library);
+				long startTime = System.currentTimeMillis();
+				baseMapper.updateForecastById(library);
+				long times = System.currentTimeMillis() - startTime;
+				log.error("更新一条预估耗时：" + times + "毫秒");
 			} else {
 				library.setCreateBy("305");
 				library.setCreateName("定时生成");
@@ -2452,9 +2461,6 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				selectVoMap = this.getSelectVoMap();
 			}
 			initEkpPushSocialParam(library,synFlag, selectVoMap);
-			if (null != selectVoMap) {
-				selectVoMap.clear();
-			}
 		}
 	}
 
@@ -2470,9 +2476,6 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			}
 			//推送数据封装并推送
 			initEkpPushFundParam(library,synFlag, selectVoMap);
-			if (null != selectVoMap) {
-				selectVoMap.clear();
-			}
 		}
 	}
 

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

@@ -726,4 +726,197 @@
 		</foreach>
 	</update>
 
+	<!-- 根据id更新 -->
+	<update id="updateForecastById">
+		update
+		t_forecast_library
+		set
+		<if test="tForecastLibrary.unitPensionFee != null">
+			UNIT_PENSION_FEE = #{tForecastLibrary.unitPensionFee},
+		</if>
+		<if test="tForecastLibrary.unitMedicalFee != null">
+			UNIT_MEDICAL_FEE = #{tForecastLibrary.unitMedicalFee},
+		</if>
+		<if test="tForecastLibrary.unitUnemploymentFee != null">
+			UNIT_UNEMPLOYMENT_FEE = #{tForecastLibrary.unitUnemploymentFee},
+		</if>
+		<if test="tForecastLibrary.unitWorkInjuryFee != null">
+			UNIT_WORK_INJURY_FEE = #{tForecastLibrary.unitWorkInjuryFee},
+		</if>
+		<if test="tForecastLibrary.unitBirthFee != null">
+			UNIT_BIRTH_FEE = #{tForecastLibrary.unitBirthFee},
+		</if>
+		<if test="tForecastLibrary.unitBitailmentFee != null">
+			UNIT_BITAILMENT_FEE = #{tForecastLibrary.unitBitailmentFee},
+		</if>
+		<if test="tForecastLibrary.personalPensionFee != null">
+			PERSONAL_PENSION_FEE = #{tForecastLibrary.personalPensionFee},
+		</if>
+		<if test="tForecastLibrary.personalMedicalFee != null">
+			PERSONAL_MEDICAL_FEE = #{tForecastLibrary.personalMedicalFee},
+		</if>
+		<if test="tForecastLibrary.personalUnemploymentFee != null">
+			PERSONAL_UNEMPLOYMENT_FEE = #{tForecastLibrary.personalUnemploymentFee},
+		</if>
+		<if test="tForecastLibrary.personalBigailmentFee != null">
+			PERSONAL_BIGAILMENT_FEE = #{tForecastLibrary.personalBigailmentFee},
+		</if>
+		<if test="tForecastLibrary.socialPayMonth != null and tForecastLibrary.socialPayMonth.trim() != ''">
+			SOCIAL_PAY_MONTH = #{tForecastLibrary.socialPayMonth},
+		</if>
+		<if test="tForecastLibrary.socialCreateMonth != null and tForecastLibrary.socialCreateMonth.trim() != ''">
+			SOCIAL_CREATE_MONTH = #{tForecastLibrary.socialCreateMonth},
+		</if>
+		<if test="tForecastLibrary.providentPayMonth != null and tForecastLibrary.providentPayMonth.trim() != ''">
+			PROVIDENT_PAY_MONTH = #{tForecastLibrary.providentPayMonth},
+		</if>
+		<if test="tForecastLibrary.providentCreateMonth != null and tForecastLibrary.providentCreateMonth.trim() != ''">
+			PROVIDENT_CREATE_MONTH = #{tForecastLibrary.providentCreateMonth},
+		</if>
+		<if test="tForecastLibrary.unitSocialSum != null">
+			UNIT_SOCIAL_SUM = #{tForecastLibrary.unitSocialSum},
+		</if>
+		<if test="tForecastLibrary.unitFundSum != null">
+			UNIT_FUND_SUM = #{tForecastLibrary.unitFundSum},
+		</if>
+		<if test="tForecastLibrary.personalSocialSum != null">
+			PERSONAL_SOCIAL_SUM = #{tForecastLibrary.personalSocialSum},
+		</if>
+		<if test="tForecastLibrary.personalFundSum != null">
+			PERSONAL_FUND_SUM = #{tForecastLibrary.personalFundSum},
+		</if>
+		<if test="tForecastLibrary.sumAll != null">
+			SUM_ALL = #{tForecastLibrary.sumAll},
+		</if>
+		<if test="tForecastLibrary.unitPensionBase != null">
+			UNIT_PENSION_BASE = #{tForecastLibrary.unitPensionBase},
+		</if>
+		<if test="tForecastLibrary.unitMedicalBase != null">
+			UNIT_MEDICAL_BASE = #{tForecastLibrary.unitMedicalBase},
+		</if>
+		<if test="tForecastLibrary.unitUnemploymentBase != null">
+			UNIT_UNEMPLOYMENT_BASE = #{tForecastLibrary.unitUnemploymentBase},
+		</if>
+		<if test="tForecastLibrary.unitInjuryBase != null">
+			UNIT_INJURY_BASE = #{tForecastLibrary.unitInjuryBase},
+		</if>
+		<if test="tForecastLibrary.unitBirthBase != null">
+			UNIT_BIRTH_BASE = #{tForecastLibrary.unitBirthBase},
+		</if>
+		<if test="tForecastLibrary.unitBigailmentBase != null">
+			UNIT_BIGAILMENT_BASE = #{tForecastLibrary.unitBigailmentBase},
+		</if>
+		<if test="tForecastLibrary.personalPensionBase != null">
+			PERSONAL_PENSION_BASE = #{tForecastLibrary.personalPensionBase},
+		</if>
+		<if test="tForecastLibrary.personalMedicalBase != null">
+			PERSONAL_MEDICAL_BASE = #{tForecastLibrary.personalMedicalBase},
+		</if>
+		<if test="tForecastLibrary.personalUnemploymentBase != null">
+			PERSONAL_UNEMPLOYMENT_BASE = #{tForecastLibrary.personalUnemploymentBase},
+		</if>
+		<if test="tForecastLibrary.personalBigailmentBase != null">
+			PERSONAL_BIGAILMENT_BASE = #{tForecastLibrary.personalBigailmentBase},
+		</if>
+		<if test="tForecastLibrary.unitPersionPro != null">
+			UNIT_PERSION_PRO = #{tForecastLibrary.unitPersionPro},
+		</if>
+		<if test="tForecastLibrary.unitMedicalPro != null">
+			UNIT_MEDICAL_PRO = #{tForecastLibrary.unitMedicalPro},
+		</if>
+		<if test="tForecastLibrary.unitUnemploymentPro != null">
+			UNIT_UNEMPLOYMENT_PRO = #{tForecastLibrary.unitUnemploymentPro},
+		</if>
+		<if test="tForecastLibrary.unitInjuryPro != null">
+			UNIT_INJURY_PRO = #{tForecastLibrary.unitInjuryPro},
+		</if>
+		<if test="tForecastLibrary.unitBirthPro != null">
+			UNIT_BIRTH_PRO = #{tForecastLibrary.unitBirthPro},
+		</if>
+		<if test="tForecastLibrary.unitBigailmentPro != null">
+			UNIT_BIGAILMENT_PRO = #{tForecastLibrary.unitBigailmentPro},
+		</if>
+		<if test="tForecastLibrary.personalPersionPro != null">
+			PERSONAL_PERSION_PRO = #{tForecastLibrary.personalPersionPro},
+		</if>
+		<if test="tForecastLibrary.personalMedicalPro != null">
+			PERSONAL_MEDICAL_PRO = #{tForecastLibrary.personalMedicalPro},
+		</if>
+		<if test="tForecastLibrary.personalUnemploymentPro != null">
+			PERSONAL_UNEMPLOYMENT_PRO = #{tForecastLibrary.personalUnemploymentPro},
+		</if>
+		<if test="tForecastLibrary.personalBigailmentPro != null">
+			PERSONAL_BIGAILMENT_PRO = #{tForecastLibrary.personalBigailmentPro},
+		</if>
+		<if test="tForecastLibrary.unitFundBase != null">
+			UNIT_FUND_BASE = #{tForecastLibrary.unitFundBase},
+		</if>
+		<if test="tForecastLibrary.personalFundBase != null">
+			PERSONAL_FUND_BASE = #{tForecastLibrary.personalFundBase},
+		</if>
+		<if test="tForecastLibrary.unitFundProp != null">
+			UNIT_FUND_PROP = #{tForecastLibrary.unitFundProp},
+		</if>
+		<if test="tForecastLibrary.personalFundProp != null">
+			PERSONAL_FUND_PROP = #{tForecastLibrary.personalFundProp},
+		</if>
+		<if test="tForecastLibrary.unitInterestFee != null">
+			UNIT_INTEREST_FEE = #{tForecastLibrary.unitInterestFee},
+		</if>
+		<if test="tForecastLibrary.personalInterestFee != null">
+			PERSONAL_INTEREST_FEE = #{tForecastLibrary.personalInterestFee},
+		</if>
+		<if test="tForecastLibrary.socialHousehold != null and tForecastLibrary.socialHousehold.trim() != ''">
+			SOCIAL_HOUSEHOLD = #{tForecastLibrary.socialHousehold},
+		</if>
+		<if test="tForecastLibrary.socialHouseholdName != null and tForecastLibrary.socialHouseholdName.trim() != ''">
+			SOCIAL_HOUSEHOLD_NAME = #{tForecastLibrary.socialHouseholdName},
+		</if>
+		<if test="tForecastLibrary.providentHousehold != null and tForecastLibrary.providentHousehold.trim() != ''">
+			PROVIDENT_HOUSEHOLD = #{tForecastLibrary.providentHousehold},
+		</if>
+		<if test="tForecastLibrary.providentHouseholdName != null and tForecastLibrary.providentHouseholdName.trim() != ''">
+			PROVIDENT_HOUSEHOLD_NAME = #{tForecastLibrary.providentHouseholdName},
+		</if>
+		<if test="tForecastLibrary.salarySocialFlag != null and tForecastLibrary.salarySocialFlag.trim() != ''">
+			SALARY_SOCIAL_FLAG = #{tForecastLibrary.salarySocialFlag},
+		</if>
+		<if test="tForecastLibrary.salaryFundFlag != null and tForecastLibrary.salaryFundFlag.trim() != ''">
+			SALARY_FUND_FLAG = #{tForecastLibrary.salaryFundFlag},
+		</if>
+		<if test="tForecastLibrary.settleDomainId != null and tForecastLibrary.settleDomainId.trim() != ''">
+			SETTLE_DOMAIN_ID = #{tForecastLibrary.settleDomainId},
+		</if>
+		<if test="tForecastLibrary.unitId != null and tForecastLibrary.unitId.trim() != ''">
+			UNIT_ID = #{tForecastLibrary.unitId},
+		</if>
+		<if test="tForecastLibrary.unitName != null and tForecastLibrary.unitName.trim() != ''">
+			UNIT_NAME = #{tForecastLibrary.unitName},
+		</if>
+		<if test="tForecastLibrary.deptName != null and tForecastLibrary.deptName.trim() != ''">
+			DEPT_NAME = #{tForecastLibrary.deptName},
+		</if>
+		<if test="tForecastLibrary.deptNo != null and tForecastLibrary.deptNo.trim() != ''">
+			DEPT_NO = #{tForecastLibrary.deptNo},
+		</if>
+		<if test="tForecastLibrary.empNatrue != null and tForecastLibrary.empNatrue.trim() != ''">
+			EMP_NATRUE = #{tForecastLibrary.empNatrue},
+		</if>
+		SOCIAL_ID = #{tForecastLibrary.socialId},
+		PROVIDENT_ID = #{tForecastLibrary.providentId},
+		FUND_PROVINCE = #{tForecastLibrary.fundProvince},
+		FUND_CITY = #{tForecastLibrary.fundCity},
+		FUND_TOWN = #{tForecastLibrary.fundTown},
+		SOCIAL_PROVINCE = #{tForecastLibrary.socialProvince},
+		SOCIAL_CITY = #{tForecastLibrary.socialCity},
+		SOCIAL_TOWN = #{tForecastLibrary.socialTown},
+		DATA_PUSH = #{tForecastLibrary.dataPush},
+		DATA_TYPE = #{tForecastLibrary.dataType},
+		DIFF_TYPE = #{tForecastLibrary.diffType},
+		UPDATE_BY = #{tForecastLibrary.updateBy},
+		UPDATE_TIME = now()
+		where
+		ID = #{tForecastLibrary.id}
+	</update>
+
 </mapper>