From bdcdef34c222c2d1297a67a0f4968f5f261f03d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 1 Jul 2024 15:09:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E6=AD=A3=E5=B8=B8=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E8=96=AA=E9=87=91=E7=9A=84=E4=B8=AA=E7=A8=8E=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GetASynIndividualIncomeTaxFeedbackResponse.java | 4 ++-- .../service/impl/SalarySobTaxRuleServiceImpl.java | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/remote/tax/response/calculate/GetASynIndividualIncomeTaxFeedbackResponse.java b/src/com/engine/salary/remote/tax/response/calculate/GetASynIndividualIncomeTaxFeedbackResponse.java index f1bd7e0c7..741d0a9d5 100644 --- a/src/com/engine/salary/remote/tax/response/calculate/GetASynIndividualIncomeTaxFeedbackResponse.java +++ b/src/com/engine/salary/remote/tax/response/calculate/GetASynIndividualIncomeTaxFeedbackResponse.java @@ -495,12 +495,12 @@ public class GetASynIndividualIncomeTaxFeedbackResponse extends BaseResponse { /** * 税率 必填：否 */ - @TaxField(name = "本月（次）工资薪金税税率", taxIndex = "sl") + @TaxField(name = "税率", taxIndex = "sl") private BigDecimal sl; /** * 速算扣除数 必填：否 */ - @TaxField(name = "本月（次）工资薪金税速算扣除数", taxIndex = "sskcs") + @TaxField(name = "速算扣除数", taxIndex = "sskcs") private BigDecimal sskcs; /** diff --git a/src/com/engine/salary/service/impl/SalarySobTaxRuleServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobTaxRuleServiceImpl.java index 65e81008f..2b95251dc 100644 --- a/src/com/engine/salary/service/impl/SalarySobTaxRuleServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobTaxRuleServiceImpl.java @@ -92,7 +92,15 @@ public class SalarySobTaxRuleServiceImpl extends Service implements SalarySobTax for (Integer incomeCategoryId : incomeCategoryIds) { IncomeCategoryEnum incomeCategoryEnum = IncomeCategoryEnum.parseByValue(incomeCategoryId); - List taxRules = incomeCategoryEnum.getReportType().getTaxRules(); + List taxRules = new ArrayList<>(); + if (incomeCategoryEnum == IncomeCategoryEnum.WAGES_AND_SALARIES || incomeCategoryEnum == IncomeCategoryEnum.NON_RESIDENT_INCOME_WAGES_AND_SALARIES) { + //只有正常工资薪金，才显示算税明细规则 + taxRules = incomeCategoryEnum.getReportType().getTaxRules(); + } else { + taxRules.add(SalarySobTaxRuleDTO.TaxRuleDTO.builder().name("税率").taxIndex("sl").build()); + taxRules.add(SalarySobTaxRuleDTO.TaxRuleDTO.builder().name("速算扣除数").taxIndex("sskcs").build()); + taxRules.add(SalarySobTaxRuleDTO.TaxRuleDTO.builder().name("本月（次）应补税额").taxIndex("ybtse").build()); + } for (SalarySobTaxRuleDTO.TaxRuleDTO taxRule : taxRules) { Long salaryItemId = salarySobTaxReportRuleMap.get(incomeCategoryId + "-" + taxRule.getTaxIndex()); SalaryItemPO salaryItem = idKeySalaryItemMap.get(salaryItemId);