项目档案问题修复

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

@@ -371,17 +371,10 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
 						if (wSalary.compareTo(oneBecimal) <= 0) {
 							if (!isSend) {
 								minSalary = socialFundTax;
-								maxAnualSalary = BigDecimalUtils.safeSubtract(wSalary,socialFundTax);
 							}
 						}else {
-							minSalary =  BigDecimalUtils.safeSubtract(wSalary,new BigDecimal("36000"));
-							maxAnualSalary = new BigDecimal("36000");
-						}
-					} else if (BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(ySalary, wSalary), sumDeductSalary).
-							compareTo(new BigDecimal("72000")) <= 0) {
-						if (wSalary.compareTo(new BigDecimal("36000")) <= 0) {
 							if (isSend) {
-								maxAnualSalary = wSalary;
+								minSalary =  subOneBecimal;
 							} else {
 								minSalary = subOneBecimal.compareTo(socialFundTax) >0 ? subOneBecimal : socialFundTax;
 							}
@@ -391,17 +384,10 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
 						if (wSalary.compareTo(oneBecimal) <= 0) {
 							if (!isSend) {
 								minSalary = socialFundTax;
-								maxAnualSalary = BigDecimalUtils.safeSubtract(wSalary,socialFundTax);
 							}
 						}else {
-							minSalary =  BigDecimalUtils.safeSubtract(wSalary,new BigDecimal("36000"));
-							maxAnualSalary = new BigDecimal("36000");
-						}
-					}else if (BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(ySalary, wSalary), sumDeductSalary).
-							compareTo(new BigDecimal("203100")) <= 0) {
-						if (wSalary.compareTo(new BigDecimal("36000")) <= 0) {
 							if (isSend) {
-								maxAnualSalary = wSalary;
+								minSalary =  subOneBecimal;
 							} else {
 								minSalary = subOneBecimal.compareTo(socialFundTax) >0 ? subOneBecimal : socialFundTax;
 							}
@@ -424,17 +410,10 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
 						if (wSalary.compareTo(twoBecimal) <= 0) {
 							if (!isSend) {
 								minSalary = socialFundTax;
-								maxAnualSalary = BigDecimalUtils.safeSubtract(wSalary,socialFundTax);
 							}
 						}else {
-							minSalary =  BigDecimalUtils.safeSubtract(wSalary,new BigDecimal("144000"));
-							maxAnualSalary = new BigDecimal("144000");
-						}
-					}else if (BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(ySalary, wSalary), sumDeductSalary).
-							compareTo(new BigDecimal("672000")) <= 0) {
-						if (wSalary.compareTo(new BigDecimal("144000")) <= 0) {
 							if (isSend) {
-								maxAnualSalary = wSalary;
+								minSalary =  subTwoBecimal;
 							} else {
 								minSalary = subTwoBecimal.compareTo(socialFundTax) >0 ? subTwoBecimal : socialFundTax;
 							}