优化-预估库获取基数配置

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

@@ -449,7 +449,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 	private void initSocialLibary(String diffType, String payMonth, Map<String, TForecastLibrary> saveLibraryMap
 			, TSocialFundInfo tSocialInfo, boolean isReduceFund, HashMap<String, TAgentConfig> agentConfigMap
 			, TForecastLibrary lib, String sfMapKey, TForecastLibrary historyLibrary) {
-		lib = new TForecastLibrary();
+		if (null == lib) {
+			lib = new TForecastLibrary();
+		} else if (Common.isNotNull(lib.getId())) {
+			lib.setId(null);
+		}
 		lib.setSocialHousehold(tSocialInfo.getSocialHousehold());
 		lib.setSocialHouseholdName(tSocialInfo.getSocialHouseholdName());
 		lib.setDiffType(diffType);
@@ -1080,7 +1084,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 	 * @param library        预估库
 	 * @param socialInfo     社保
 	 * @param sysBaseSetInfo 基数配置
-	 * @param paymentType    0最低、1自定义、2最高
+	 * @param paymentType    0最低缴纳、1自定义、2最高缴纳
 	 * @Description: 塞大病金额
 	 * @Author: hgw
 	 * @Date: 2020/11/25 15:51
@@ -1244,7 +1248,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 	private void initFundLibary(String diffType, String payMonth, Map<String, TForecastLibrary> saveLibraryMap
 			, TSocialFundInfo providentFund, boolean isReduceSocial, TForecastLibrary lib, String mapKeyStr
 			, TForecastLibrary historyLibrary) {
-		lib = new TForecastLibrary();
+		if (lib == null) {
+			lib = new TForecastLibrary();
+		} else if (Common.isNotNull(lib.getId())) {
+			lib.setId(null);
+		}
 		lib.setProvidentHousehold(providentFund.getProvidentHousehold());
 		lib.setProvidentHouseholdName(providentFund.getProvidentHouseholdName());
 		lib.setDiffType(diffType);