Merge branch 'develop' into feature-zhaji

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceDetailServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Sets;
+import com.yifu.cloud.plus.v1.check.entity.TCheckIdCard;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.SetInfoVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo;
@@ -533,7 +534,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				return R.failed(InsurancesConstants.EMP_IDCARD_NO_NOT_LEGITIMATE);
 			}
 			//校验身份合法
-			/*TCheckIdCard checkIdCard = new TCheckIdCard();
+			TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -542,7 +543,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				if (CommonConstants.ONE_INT != data.getIsTrue()){
 					return R.failed(InsurancesConstants.EMP_ID_CARD_NO_NOT_FIT);
 				}
-			}*/
+			}
 
 			if(!LocalDateUtil.isDate(param.getPolicyStart(),LocalDateUtil.NORM_DATE_PATTERN)){
 				return R.failed(InsurancesConstants.POLICY_START_PARSE_ERROR);
@@ -705,7 +706,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				return R.failed(InsurancesConstants.EMP_IDCARD_NO_NOT_LEGITIMATE);
 			}
 			//校验身份合法
-			/*TCheckIdCard checkIdCard = new TCheckIdCard();
+			TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -714,7 +715,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				if (CommonConstants.ONE_INT != data.getIsTrue()){
 					return R.failed(InsurancesConstants.EMP_ID_CARD_NO_NOT_FIT);
 				}
-			}*/
+			}
 
 			TInsuranceReplace one = tInsuranceReplaceService.getOne(Wrappers.<TInsuranceReplace>query().lambda()
 					.eq(TInsuranceReplace::getToInsuranceDetailId, byId.getId())
@@ -1427,7 +1428,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 
 			//校验身份合法
-			/*TCheckIdCard checkIdCard = new TCheckIdCard();
+			TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -1438,7 +1439,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					listResult.add(param);
 					continue;
 				}
-			}*/
+			}
 
 			//根据项目编码查询项目是否存在
 			R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(Arrays.asList(param.getDeptNo()));
@@ -1785,7 +1786,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 
 			//校验身份合法
-			/*TCheckIdCard checkIdCard = new TCheckIdCard();
+			TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -1796,7 +1797,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					listResult.add(param);
 					continue;
 				}
-			}*/
+			}
 
 			//根据项目编码查询项目是否存在
 			R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(Arrays.asList(param.getDeptNo()));
@@ -2143,7 +2144,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 
 			//校验身份合法
-			/*TCheckIdCard checkIdCard = new TCheckIdCard();
+			TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getReplaceEmpName());
 			checkIdCard.setIdCard(param.getReplaceEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -2154,7 +2155,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					listResult.add(param);
 					continue;
 				}
-			}*/
+			}
 
 			if (param.getEmpName().equals(param.getReplaceEmpName()) && param.getEmpIdcardNo().equals(param.getReplaceEmpIdcardNo())){
 				param.setErrorMessage(InsurancesConstants.REPLACE_EMP_INFO_SAME);

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccount.java

@@ -42,9 +42,8 @@ import java.util.List;
  */
 @Data
 @TableName("t_salary_account")
-@EqualsAndHashCode(callSuper = true)
 @Schema(description = "工资报账主表（工资条）")
-public class TSalaryAccount extends BaseEntity {
+public class TSalaryAccount {
 
 	/**
 	 * 主键

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java

@@ -146,7 +146,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
 		if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0) {
 			wrapper.last(" limit " + searchVo.getLimitStart() + "," + searchVo.getLimitEnd());
 		}
-		wrapper.orderByDesc(BaseEntity::getCreateTime);
+		wrapper.orderByDesc(TSalaryAccount::getSalaryMonth);
 		return baseMapper.selectList(wrapper);
 	}
 
@@ -160,9 +160,6 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
 
 	private LambdaQueryWrapper buildQueryWrapper(TSalaryAccountSearchVo entity) {
 		LambdaQueryWrapper<TSalaryAccount> wrapper = Wrappers.lambdaQuery();
-		if (Common.isNotNull(entity.getCreateName())) {
-			wrapper.eq(TSalaryAccount::getCreateName, entity.getCreateName());
-		}
 		return wrapper;
 	}
 

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

@@ -281,7 +281,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 		boolean isReduceFund = false;
 		// 核心刷新
 		R<String> coreR = this.doCore(payMonthList, socialInfoList, fundList, agentConfigHashMap, socialHistoryMap
-				, fundHistoryMap, socialPushMap, fundPushMap, saveLibraryMap, isReduceSocial, isReduceFund);
+				, fundHistoryMap, socialPushMap, fundPushMap, saveLibraryMap, isReduceSocial, isReduceFund, false);
 		if (coreR != null) return coreR;
 		boolean isSaveAndUpdate = false;
 		for (TForecastLibrary library : saveLibraryMap.values()) {
@@ -1615,7 +1615,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 	}
 
 	/**
-	 * @param isOnly 是否仅更新传过来的社保公积金，true：是
+	 * @param isOnly 是否仅更新传过来的社保公积金，true：是(同时，true时，是户调基，要判断断缴)
 	 * @param socialFundInfo
 	 * @Description: 根据社保公积金信息表更新预估库
 	 * @Author: hgw
@@ -1729,7 +1729,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 		boolean isReduceFund = false;
 		// 核心刷新
 		R<String> coreR = this.doCore(payMonthList, socialInfoList, fundList, agentConfigHashMap, socialHistoryMap
-				, fundHistoryMap, socialPushMap, fundPushMap, saveLibraryMap, isReduceSocial, isReduceFund);
+				, fundHistoryMap, socialPushMap, fundPushMap, saveLibraryMap, isReduceSocial, isReduceFund, isOnly);
 		if (coreR != null) return coreR;
 		boolean isSaveAndUpdate = false;
 		YifuUser user = SecurityUtils.getUser();
@@ -1839,7 +1839,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			, List<TSocialFundInfo> fundList, HashMap<String, TAgentConfig> agentConfigHashMap
 			, HashMap<String, TForecastLibrary> socialHistoryMap, HashMap<String, TForecastLibrary> fundHistoryMap
 			, HashMap<String, TForecastLibrary> socialPushMap, HashMap<String, TForecastLibrary> fundPushMap
-			, Map<String, TForecastLibrary> saveLibraryMap, boolean isReduceSocial, boolean isReduceFund) {
+			, Map<String, TForecastLibrary> saveLibraryMap, boolean isReduceSocial, boolean isReduceFund, boolean isOnly) {
 		// 预估历史，存储基数
 		TForecastLibrary historyLibrary;
 		boolean flag;
@@ -1867,6 +1867,20 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 						// 5 办理失败 10 审核不通过，且无推送数据，不新增
 						continue;
 					}
+					// 户调基，值看预估库历史数据有没有
+					if (isOnly) {
+						historyLibrary = socialHistoryMap.get(sfMapKey);
+						if (historyLibrary != null) {
+							// 初始化社保
+							initSocialLibary(diffType, payMonth, saveLibraryMap, tSocialInfo, isReduceFund, agentConfigHashMap, sfMapKey, historyLibrary);
+							if (null != tForecastLibrary) {
+								newForecastLibrary = saveLibraryMap.get(sfMapKey);
+								if (null != newForecastLibrary) {
+									this.getChangeReduceData(newForecastLibrary, tForecastLibrary);
+								}
+							}
+						}
+					} else {
 						//起缴月份在要生成的月份前不处理 || 截止月份在要生成的月份后不处理
 						if (Integer.parseInt(payMonth) < DateUtil.formatDateInt(minStartDate)
 								|| (Common.isNotNull(tSocialInfo.getSocialReduceDate())
@@ -1889,6 +1903,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 						}
 					}
 				}
+			}
 			//封装公积金预估数据
 			if (Common.isNotNull(fundList)) {
 				for (TSocialFundInfo providentFund : fundList) {
@@ -1904,6 +1919,20 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 						// 4办理失败9 审核不通过，且无推送数据，不新增
 						continue;
 					}
+					// 户调基，值看预估库历史数据有没有
+					if (isOnly) {
+						historyLibrary = fundHistoryMap.get(sfMapKey);
+						if (historyLibrary != null) {
+							// 初始化公积金
+							initFundLibary(diffType, payMonth, saveLibraryMap, providentFund, isReduceSocial, sfMapKey, historyLibrary);
+							if (null != tForecastLibrary) {
+								newForecastLibrary = saveLibraryMap.get(sfMapKey);
+								if (null != newForecastLibrary) {
+									this.getChangeReduceData(newForecastLibrary, tForecastLibrary);
+								}
+							}
+						}
+					} else {
 						//起缴月份在要生成的月份后不处理 || 截止月份在要生成的月份后不处理
 						if (Common.isNotNull(providentFund.getProvidentStart())
 								&& Integer.parseInt(payMonth) < DateUtil.formatDateInt(providentFund.getProvidentStart())
@@ -1925,6 +1954,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 								}
 							}
 						}
+					}
 
 				}
 			}
@@ -2025,7 +2055,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 		boolean isReduceFund = false;
 		// 核心刷新
 		R<String> coreR = this.doCore(payMonthList, socialInfoList, fundList, agentConfigHashMap, socialHistoryMap
-				, fundHistoryMap, socialPushMap, fundPushMap, saveLibraryMap, isReduceSocial, isReduceFund);
+				, fundHistoryMap, socialPushMap, fundPushMap, saveLibraryMap, isReduceSocial, isReduceFund, false);
 		if (coreR != null) return coreR;
 		boolean isSaveAndUpdate = false;
 		for (TForecastLibrary library : saveLibraryMap.values()) {