MVP1.5.4-SALARY实发倒推应发最后提交

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

@@ -1166,14 +1166,12 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		//本次纳税额
 		BigDecimal res = SalaryConstants.B_ZERO;
 		BigDecimal sumTax = SalaryConstants.B_ZERO;
-		BigDecimal realDeduSalary = SalaryConstants.B_ZERO;
 
 		// 实发倒推-属性：
 		BigDecimal actualSalaryNow = SalaryConstants.B_ZERO;  // 本次实发
 		BigDecimal actualSalary = SalaryConstants.B_ZERO;  // 实发
 		BigDecimal annualBonus = SalaryConstants.B_ZERO; // -单独年终奖
 		BigDecimal annualBonusTax = SalaryConstants.B_ZERO; // -单独年终奖税
-		BigDecimal annualBonusTaxHistory = SalaryConstants.B_ZERO; // -单独年终奖税-历史
 		BigDecimal deduction = SalaryConstants.B_ZERO; // +个人代扣
 		BigDecimal phoneSubsidy = SalaryConstants.B_ZERO; // -通讯补贴（不计税）
 		BigDecimal otherDeduction = SalaryConstants.B_ZERO; // -其他扣除项，包含【累计个人社保（含代扣，含本期）+累计个人公积金（含代扣）
@@ -1202,25 +1200,22 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 				phoneSubsidy = phoneSubsidy.add(item.getSalaryMoney());
 			}
 			if (SalaryConstants.ACTUAL_SALARY_SUM_JAVA.equals(item.getJavaFiedName())) {
-				realDeduSalary = realDeduSalary.add(item.getSalaryMoney());
 				actualSalary = actualSalary.add(item.getSalaryMoney());
 				actualSalaryNow = actualSalaryNow.add(item.getSalaryMoney());
 			}
 			if (CommonConstants.ONE_INT == item.getIsTax()) {
 				res = res.subtract(item.getSalaryMoney());
-				realDeduSalary = realDeduSalary.subtract(item.getSalaryMoney());
 			}
 			otherDeduction = getOtherDeducation(otherDeduction, item);
 		}
 		//历史累计
 		for (TSalaryAccountItem item : itemHistoryList) {
-			if (CommonConstants.ONE_STRING.equals(a.getAnnualBonusType())) {
+			if (CommonConstants.ONE_STRING.equals(item.getAnnualBonusType())) {
 				if (SalaryConstants.ANNUAL_BONUS_JAVA.equals(item.getJavaFiedName())) {
 					annualBonus = annualBonus.add(item.getSalaryMoney());
 				}
 				if (SalaryConstants.ANNUAL_BONUS_TAX_JAVA.equals(item.getJavaFiedName())) {
 					annualBonusTax = annualBonusTax.add(item.getSalaryMoney());
-					annualBonusTaxHistory = annualBonusTaxHistory.add(item.getSalaryMoney());
 				}
 			}
 			if (SalaryConstants.SALARY_TAX_JAVA.equals(item.getJavaFiedName())) {
@@ -1239,7 +1234,6 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 				otherDeduction = otherDeduction.add(item.getSalaryMoney());
 			}
 			if (SalaryConstants.ACTUAL_SALARY_SUM_JAVA.equals(item.getJavaFiedName())) {
-				realDeduSalary = realDeduSalary.add(item.getSalaryMoney());
 				actualSalary = actualSalary.add(item.getSalaryMoney());
 			}
 			if (CommonConstants.ONE_INT == item.getIsTax()) {
@@ -1249,11 +1243,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		}
 		if (specialDeductionSum != null) {
 			res = res.subtract(specialDeductionSum);
-			realDeduSalary = realDeduSalary.subtract(specialDeductionSum);
 		}
 		if (costReduction != null) {
 			res = res.subtract(costReduction);
-			realDeduSalary = realDeduSalary.subtract(costReduction);
 		}
 		if (!isActual) {
 			for (TSalaryTaxConfig sub : subs) {
@@ -1319,7 +1311,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 			if (relaySalaryNow.compareTo(actualSalaryNow) <= SalaryConstants.EQUAL) {
 				relaySalaryNow = actualSalaryNow;
 			}
-			res = taxAll.subtract(taxHistory).subtract(annualBonusTaxHistory);
+			res = taxAll.subtract(taxHistory);
 			// 本次个人应发合计
 			TSalaryAccountItem sai = new TSalaryAccountItem();
 			sai.setCnName(SalaryConstants.RELAY_SALARY);