From 1f8085709b65dbdd45e46e48ffdb72b514d9cbf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 6 Mar 2026 20:59:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E6=94=B6=E8=B4=A6=E5=8D=95=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=20=E7=A8=8E=E9=A2=9D=20=E6=97=A0=E7=A8=8E=E8=B4=B9?= =?UTF-8?q?=E7=94=A8;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mhd/common/core/domain/dto/ReconciliationDTO.java | 7 +++++-- .../domain/reconciliation/entity/Reconciliation.java | 7 ++++++- .../reconciliation/repository/po/ReconciliationPO.java | 6 +++++- .../reconciliation/repository/todo/ReconciliationDO.java | 7 ++++++- .../mapper/reconciliation/ReconciliationMapper.xml | 8 ++++++-- 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java index 744ccd476..9ccf18fb9 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java @@ -252,5 +252,8 @@ public class ReconciliationDTO extends BaseVOEntity{ @ApiModelProperty(value = "财务审核意见") private String financeReviewOpinion; - -} + @ApiModelProperty(value = "无税费用") + private BigDecimal taxFreeFee; + @ApiModelProperty(value = "税额") + private BigDecimal taxAmount; +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/entity/Reconciliation.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/entity/Reconciliation.java index 16c5c3cb7..934ae0aa5 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/entity/Reconciliation.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/entity/Reconciliation.java @@ -255,4 +255,9 @@ public class Reconciliation extends BaseVOEntity{ @ApiModelProperty(value = "财务审核意见") private String financeReviewOpinion; -} + @ApiModelProperty(value = "无税费用") + private BigDecimal taxFreeFee; + + @ApiModelProperty(value = "税额") + private BigDecimal taxAmount; +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/po/ReconciliationPO.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/po/ReconciliationPO.java index 6f02f2553..e3a9ed628 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/po/ReconciliationPO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/po/ReconciliationPO.java @@ -263,4 +263,8 @@ public class ReconciliationPO extends BaseVOEntity{ @ApiModelProperty(value = "财务审核意见") private String financeReviewOpinion; -} + @ApiModelProperty(value = "无税费用") + private BigDecimal taxFreeFee; + @ApiModelProperty(value = "税额") + private BigDecimal taxAmount; +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/todo/ReconciliationDO.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/todo/ReconciliationDO.java index 7b7feaeeb..9eeabe0bb 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/todo/ReconciliationDO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/todo/ReconciliationDO.java @@ -292,4 +292,9 @@ public class ReconciliationDO extends BaseVOEntity{ @ApiModelProperty(value = "账单科目明细") public List reconciliationAccountDTOList; -} + + @ApiModelProperty(value = "无税费用") + private BigDecimal taxFreeFee; + @ApiModelProperty(value = "税额") + private BigDecimal taxAmount; +} \ No newline at end of file diff --git a/mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml b/mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml index 6bba75cf4..48f89613d 100644 --- a/mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml +++ b/mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml @@ -279,7 +279,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sk_synchronous_status, sk_synchronous_time, sk_nc_id, - account_information + account_information, + tax_amount, + tax_free_fee ) VALUES ( #{verificationMoney}, #{settlementCount}, @@ -352,7 +354,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{skSynchronousStatus}, #{skSynchronousTime}, #{skNcId}, - #{accountInformation} + #{accountInformation}, + #{taxAmount}, + #{taxFreeFee} ) \ No newline at end of file