Merge branch 'develop' into feature-licancan

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

@@ -544,7 +544,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			// 初始化大病：
 			this.initLibraryBigMoneyBySocial(library, socialInfo, sysBaseSetInfo);
 
-			initUnitAndPersonalLibrary(library, socialInfo, sysBaseSetInfo);
+			initUnitAndPersonalLibrary(library, socialInfo, sysBaseSetInfo, historyLibrary);
 			if (null != configAll || null != configUnit || null != configPersonal) {
 				if (null != configPersonal) {
 					initPersonalLibByConfig(library, configPersonal);
@@ -773,13 +773,13 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 	 * @Date 2020-08-03
 	 **/
 	private void initUnitAndPersonalLibrary(TForecastLibrary library, TSocialFundInfo socialInfo
-			, SysBaseSetInfo sysBaseSetInfo) {
-		initLibrayOfPersonal(library, socialInfo, sysBaseSetInfo);
-		initLibraryOfUnit(library, socialInfo, sysBaseSetInfo);
+			, SysBaseSetInfo sysBaseSetInfo, TForecastLibrary historyLibrary) {
+		initLibrayOfPersonal(library, socialInfo, sysBaseSetInfo, historyLibrary);
+		initLibraryOfUnit(library, socialInfo, sysBaseSetInfo, historyLibrary);
 	}
 
 	private void initLibrayOfPersonal(TForecastLibrary library, TSocialFundInfo socialInfo
-			, SysBaseSetInfo sysBaseSetInfo) {
+			, SysBaseSetInfo sysBaseSetInfo, TForecastLibrary historyLibrary) {
 		// 个人养老基数
 		BigDecimal personalPersionBase = BigDecimal.ZERO;
 		// 个人医疗基数
@@ -810,14 +810,18 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				personalPersionBase = baseLimit;
 				personalMedicalBase = baseLimit;
 				personalUnemploymentBase = baseLimit;
-				personalPersionPro = sysBaseSetInfo.getPersonalPersionPro();
-				personalMedicalPro = sysBaseSetInfo.getPersonalMedicalPro();
-				personalUnemploymentPro = sysBaseSetInfo.getPersonalUnemploymentPro();
 			} else {
 				personalPersionBase = socialInfo.getPersonalPensionCardinal();
 				personalMedicalBase = socialInfo.getPersonalMedicalCardinal();
 				personalUnemploymentBase = socialInfo.getPersonalUnemploymentCardinal();
-
+			}
+			if (historyLibrary != null) {
+				if (historyLibrary.getUnitPersionPro() != null) {
+					personalPersionPro = historyLibrary.getPersonalPersionPro();
+					personalMedicalPro = historyLibrary.getPersonalMedicalPro();
+					personalUnemploymentPro = historyLibrary.getPersonalUnemploymentPro();
+				}
+			} else {
 				personalPersionPro = socialInfo.getPersonalPensionPer();
 				personalMedicalPro = socialInfo.getPersonalMedicalPer();
 				personalUnemploymentPro = socialInfo.getPersonalUnemploymentPer();
@@ -845,7 +849,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 	}
 
 	private void initLibraryOfUnit(TForecastLibrary library, TSocialFundInfo socialInfo
-			, SysBaseSetInfo sysBaseSetInfo) {
+			, SysBaseSetInfo sysBaseSetInfo, TForecastLibrary historyLibrary) {
 		// 单位养老基数
 		BigDecimal unitPersionBase = BigDecimal.ZERO;
 		// 单位医疗基数
@@ -894,18 +898,24 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				unitUnemploymentBase = baseLimit;
 				unitInjuryBase = baseLimit;
 				unitBirthBase = baseLimit;
-				unitPersionPro = sysBaseSetInfo.getUnitPersionPro();
-				unitMedicalPro = sysBaseSetInfo.getUnitMedicalPro();
-				unitUnemploymentPro = sysBaseSetInfo.getUnitUnemploymentPro();
-				unitInjuryPro = sysBaseSetInfo.getUnitInjuryPro();
-				unitBirthPro = sysBaseSetInfo.getUnitBirthPro();
 			} else {
 				unitPersionBase = socialInfo.getUnitPensionCardinal();
 				unitMedicalBase = socialInfo.getUnitMedicalCardinal();
 				unitUnemploymentBase = socialInfo.getUnitUnemploymentCardinal();
 				unitInjuryBase = socialInfo.getUnitWorkInjuryCardinal();
 				unitBirthBase = socialInfo.getUnitBirthCardinal();
-
+			}
+			if (historyLibrary != null) {
+				if (historyLibrary.getUnitPersionPro() != null) {
+					unitPersionPro = historyLibrary.getUnitPersionPro();
+					unitMedicalPro = historyLibrary.getUnitMedicalPro();
+					unitUnemploymentPro = historyLibrary.getUnitUnemploymentPro();
+					unitInjuryPro = historyLibrary.getUnitInjuryPro();
+					unitBirthPro = historyLibrary.getUnitBirthPro();
+				} else if (historyLibrary.getUnitInjuryPro() != null) {
+					unitInjuryPro = historyLibrary.getUnitInjuryPro();
+				}
+			} else {
 				unitPersionPro = socialInfo.getUnitPensionPer();
 				unitMedicalPro = socialInfo.getUnitMedicalPer();
 				unitUnemploymentPro = socialInfo.getUnitUnemploymentPer();
@@ -1521,7 +1531,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 		if (Common.isNotNull(libraryFundList)) {
 			baseMapper.deleteBatchIds(libraryFundList);
 		}
-		// 未推送的预估明细Map
+		// 新基数，老比例，存放Map
 		HashMap<String, TForecastLibrary> socialHistoryMap = new HashMap<>();
 		HashMap<String, TForecastLibrary> fundHistoryMap = new HashMap<>();
 		// 已推送的预估明细Map