From 61af1d5c09ffbb82e791c1fe99fd4a35323e92a8 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 17 Jul 2025 17:18:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E7=89=B9=E4=B8=AA=E7=A8=8E=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=8F=AA=E8=83=BD=E4=BB=8E?= =?UTF-8?q?=E7=A8=8E=E5=B1=80=E5=8F=96=EF=BC=8C=E4=B8=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E8=AE=A1=E7=A8=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/impl/SalaryAcctCalculateServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java index 5b64f9b1c..ffa21899c 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java @@ -303,7 +303,10 @@ public class SalaryAcctCalculateServiceImpl extends Service implements SalaryAcc resultValue = formulaVarValueMap.getOrDefault(key, StringUtils.EMPTY); } // 处理合并计税 - resultValue = handleConsolidatedTax(resultValue, salaryItemPO, salaryAcctCalculateBO, otherSalaryAcctEmployeePOMap.get(salaryAcctEmployeePO.getEmployeeId() + "_" + salaryAcctEmployeePO.getTaxAgentId()), otherSalaryAcctResultPOMap.get(salaryAcctEmployeePO.getEmployeeId() + "_" + salaryAcctEmployeePO.getTaxAgentId())); + if (!taxIds.contains(salaryItemId)) { + //个税项目，默认只能从税局取。 + resultValue = handleConsolidatedTax(resultValue, salaryItemPO, salaryAcctCalculateBO, otherSalaryAcctEmployeePOMap.get(salaryAcctEmployeePO.getEmployeeId() + "_" + salaryAcctEmployeePO.getTaxAgentId()), otherSalaryAcctResultPOMap.get(salaryAcctEmployeePO.getEmployeeId() + "_" + salaryAcctEmployeePO.getTaxAgentId())); + } // 处理小数点 resultValue = SalaryAcctFormulaBO.roundResultValue(resultValue, salaryItemPO, salarySobBackItems, salarySobBackItemMap, salaryItemIdKeySalarySobItemPOMap);