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

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

@@ -1173,6 +1173,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		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; // -其他扣除项，包含【累计个人社保（含代扣，含本期）+累计个人公积金（含代扣）
@@ -1184,10 +1185,10 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		for (TSalaryAccountItem item : itemList) {
 			if (CommonConstants.ONE_STRING.equals(a.getAnnualBonusType())) {
 				if (SalaryConstants.ANNUAL_BONUS_JAVA.equals(item.getJavaFiedName())) {
-					annualBonus = item.getSalaryMoney();
+					annualBonus = annualBonus.add(item.getSalaryMoney());
 				}
 				if (SalaryConstants.ANNUAL_BONUS_TAX_JAVA.equals(item.getJavaFiedName())) {
-					annualBonusTax = item.getSalaryMoney();
+					annualBonusTax = annualBonusTax.add(item.getSalaryMoney());
 				}
 			}
 			if (SalaryConstants.RELAY_SALARY_JAVA.equals(item.getJavaFiedName())) {
@@ -1215,10 +1216,11 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		for (TSalaryAccountItem item : itemHistoryList) {
 			if (CommonConstants.ONE_STRING.equals(a.getAnnualBonusType())) {
 				if (SalaryConstants.ANNUAL_BONUS_JAVA.equals(item.getJavaFiedName())) {
-					annualBonus = item.getSalaryMoney();
+					annualBonus = annualBonus.add(item.getSalaryMoney());
 				}
 				if (SalaryConstants.ANNUAL_BONUS_TAX_JAVA.equals(item.getJavaFiedName())) {
-					annualBonusTax = item.getSalaryMoney();
+					annualBonusTax = annualBonusTax.add(item.getSalaryMoney());
+					annualBonusTaxHistory = annualBonusTaxHistory.add(item.getSalaryMoney());
 				}
 			}
 			if (SalaryConstants.SALARY_TAX_JAVA.equals(item.getJavaFiedName())) {
@@ -1317,7 +1319,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 			if (relaySalaryNow.compareTo(actualSalaryNow) <= SalaryConstants.EQUAL) {
 				relaySalaryNow = actualSalaryNow;
 			}
-			res = taxAll.subtract(taxHistory);
+			res = taxAll.subtract(taxHistory).subtract(annualBonusTaxHistory);
 			// 本次个人应发合计
 			TSalaryAccountItem sai = new TSalaryAccountItem();
 			sai.setCnName(SalaryConstants.RELAY_SALARY);