生成收入接口修改

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

@@ -2697,7 +2697,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		} else {
 			exitIncome = detailMapper.selectList(Wrappers.<TIncomeDetail>query().lambda()
 					.eq(TIncomeDetail::getEmpIdcard, paymentInfo.getEmpIdcard())
-					.eq(TIncomeDetail::getPayMonth, paymentInfo.getSocialPayMonth())
+					.eq(TIncomeDetail::getPayMonth, paymentInfo.getProvidentPayMonth())
 					.eq(TIncomeDetail::getDeptId, paymentInfo.getSettleDomainId())
 					.eq(TIncomeDetail::getSourceType, CommonConstants.TWO_STRING));
 		}
@@ -2713,8 +2713,9 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 
 		if (Common.isNotNull(settleDomain)) {
 			// 含有社保，则计算收入
-			if (Common.isNotNull(settleDomain.getManageServerItem()) && (settleDomain.getManageServerItem().contains(CommonConstants.ONE_STRING)
-					|| settleDomain.getManageServerItem().contains(CommonConstants.TWO_STRING))) {
+			if (Common.isNotNull(settleDomain.getManageServerItem()) && ((settleDomain.getManageServerItem().contains(CommonConstants.ONE_STRING)
+					&& CommonConstants.ONE_STRING.equals(socialFundFlag)) || (settleDomain.getManageServerItem().contains(CommonConstants.TWO_STRING)
+					&& CommonConstants.TWO_STRING.equals(socialFundFlag)))) {
 				//预估模式
 				if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
 					if (CommonConstants.ZERO_STRING.equals(settleDomain.getManagementTag())) {
@@ -2745,8 +2746,9 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 					}
 				}
 			}
-			if (Common.isNotNull(settleDomain.getRiskServerItem()) && (settleDomain.getRiskServerItem().contains(CommonConstants.ONE_STRING)
-					|| settleDomain.getRiskServerItem().contains(CommonConstants.TWO_STRING))) {
+			if (Common.isNotNull(settleDomain.getRiskServerItem()) && ((settleDomain.getRiskServerItem().contains(CommonConstants.ONE_STRING)
+					&& CommonConstants.ONE_STRING.equals(socialFundFlag)) || (settleDomain.getRiskServerItem().contains(CommonConstants.TWO_STRING)
+					&& CommonConstants.TWO_STRING.equals(socialFundFlag)))) {
 				//预估模式
 				if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType()) &&
 						CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag())) {