MVP1.5.4-SALARY实发倒推应发初次提交

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

@@ -1178,6 +1178,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		// +累计年金（个人含本期）+累计个人代扣(各类个人代扣费用，含本期)+免个税个人代扣（含本期）】
 		// - costReduction - specialDeductionSum
 		BigDecimal relaySalaryHistory = SalaryConstants.B_ZERO; // 历史应发
+		BigDecimal taxHistory = SalaryConstants.B_ZERO;  // 历史个税
 		//本次
 		for (TSalaryAccountItem item : itemList) {
 			if (SalaryConstants.ANNUAL_BONUS_JAVA.equals(item.getJavaFiedName()) && CommonConstants.ONE_STRING.equals(a.getAnnualBonusType())) {
@@ -1211,6 +1212,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 			}
 			if (SalaryConstants.SALARY_TAX_JAVA.equals(item.getJavaFiedName())) {
 				sumTax = sumTax.add(item.getSalaryMoney());
+				taxHistory = taxHistory.add(item.getSalaryMoney());
 			}
 			if (SalaryConstants.RELAY_SALARY_JAVA.equals(item.getJavaFiedName())) {
 				res = res.add(item.getSalaryMoney());
@@ -1273,7 +1275,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 						&& areaMoney.compareTo(sub.getMaxIncome()) <= SalaryConstants.EQUAL) {
 					// 3 计算应缴税所得额（参与计税的金额）＝ （税率档位－速算扣除数）/（1—税率）
 					doTaxMoney = (areaMoney.subtract(sub.getQuickDeducation())).divide(SalaryConstants.B_ONEHUNDRED.subtract(new BigDecimal(sub.getWithholdingRate())).divide(
-							SalaryConstants.B_ONEHUNDRED, SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP));
+							SalaryConstants.B_ONEHUNDRED, SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP), SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
 					break;
 				}
 			}
@@ -1299,7 +1301,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 			if (relaySalaryNow.compareTo(actualSalaryNow) <= SalaryConstants.EQUAL) {
 				relaySalaryNow = actualSalaryNow;
 			}
-			res = relaySalaryNow.subtract(actualSalaryNow);
+			res = taxAll.subtract(taxHistory);
 			// 本次个人应发合计
 			TSalaryAccountItem sai = new TSalaryAccountItem();
 			sai.setCnName(SalaryConstants.RELAY_SALARY);