From fd0926ee7e3cffc97021d07a05e5b524bb766956 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 9 Nov 2022 14:10:43 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E5=9B=9E=E6=98=BE=E7=A8=8E=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/mail/PayMailBillVO.java | 2 ++ .../main/java/com/jero/mail/entity/PayMailBillProject.java | 2 ++ .../java/com/jero/meeting/entity/PayMeetingSituation.java | 1 + .../java/com/jero/member/entity/PayMemberProjectSubitem.java | 1 + .../java/com/jero/member/entity/TbCertificatePayment.java | 1 + .../java/com/jero/member/entity/TbMemberProjectSubitem.java | 1 + .../com/jero/payment/entity/PayConfirmPaymentRecord.java | 2 ++ .../main/java/com/jero/payment/entity/PayPaymentRecord.java | 1 + .../main/java/com/jero/project/entity/PayCommonProject.java | 1 + .../java/com/jero/project/entity/PayWorkingGroupSubItem.java | 1 + .../com/jero/project/mapper/xml/PayCommonProjectMapper.xml | 5 ++++- .../jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml | 5 ++++- 12 files changed, 21 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/PayMailBillVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/PayMailBillVO.java index 95f2c594..c2446906 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/PayMailBillVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/PayMailBillVO.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillProject; import io.swagger.annotations.ApiModelProperty; @@ -34,6 +35,7 @@ public class PayMailBillVO extends PayMailBill { /**税率*/ @ApiModelProperty(value = "税率") @JsonFormat(shape = JsonFormat.Shape.STRING) + @Dict(dicCode = "rate") private BigDecimal taxRate; /**税额*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillProject.java index 1ddb6452..faf9d6c5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillProject.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; import io.swagger.annotations.ApiModel; @@ -56,6 +57,7 @@ public class PayMailBillProject implements Serializable { /**税率*/ @ApiModelProperty(value = "税率") @JsonFormat(shape = JsonFormat.Shape.STRING) + @Dict(dicCode = "rate") private BigDecimal taxRate; /**税额*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java index 6a779491..a3914f69 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java @@ -502,6 +502,7 @@ public class PayMeetingSituation implements Serializable { /**税率*/ @ApiModelProperty(value = "税率") @JsonFormat(shape = JsonFormat.Shape.STRING) + @Dict(dicCode = "rate") private BigDecimal taxRate; /**税额*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java index 625c9a76..c20b8e5c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java @@ -339,6 +339,7 @@ public class PayMemberProjectSubitem implements Serializable { /**税率*/ @ApiModelProperty(value = "税率") @JsonFormat(shape = JsonFormat.Shape.STRING) + @Dict(dicCode = "rate") private BigDecimal taxRate; /**税额*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java index fba9ac1a..91f5bc6e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java @@ -332,6 +332,7 @@ public class TbCertificatePayment implements Serializable { /**税率*/ @ApiModelProperty(value = "税率") @JsonFormat(shape = JsonFormat.Shape.STRING) + @Dict(dicCode = "rate") private BigDecimal taxRate; /**税额*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java index 64b49b0b..5de91da8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java @@ -315,6 +315,7 @@ public class TbMemberProjectSubitem implements Serializable { /**税率*/ @ApiModelProperty(value = "税率") @JsonFormat(shape = JsonFormat.Shape.STRING) + @Dict(dicCode = "rate") private BigDecimal taxRate; /**税额*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayConfirmPaymentRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayConfirmPaymentRecord.java index c19f70c3..8caf323d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayConfirmPaymentRecord.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayConfirmPaymentRecord.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -108,6 +109,7 @@ public class PayConfirmPaymentRecord implements Serializable { /**税率*/ @ApiModelProperty(value = "税率") @JsonFormat(shape = JsonFormat.Shape.STRING) + @Dict(dicCode = "rate") private BigDecimal taxRate; /**税额*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java index 9821cc5d..58e10f59 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java @@ -119,6 +119,7 @@ public class PayPaymentRecord implements Serializable { /**税率*/ @ApiModelProperty(value = "税率") @JsonFormat(shape = JsonFormat.Shape.STRING) + @Dict(dicCode = "rate") private BigDecimal taxRate; /**税额*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java index a95de47f..3088e078 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java @@ -306,6 +306,7 @@ public class PayCommonProject implements Serializable { /**税率*/ @ApiModelProperty(value = "税率") @JsonFormat(shape = JsonFormat.Shape.STRING) + @Dict(dicCode = "rate") private BigDecimal taxRate; /**税额*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java index 1e1096be..9831c323 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java @@ -442,6 +442,7 @@ public class PayWorkingGroupSubItem implements Serializable { /**税率*/ @ApiModelProperty(value = "税率") @JsonFormat(shape = JsonFormat.Shape.STRING) + @Dict(dicCode = "rate") private BigDecimal taxRate; /**税额*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml index e8450c53..0cb5ff51 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml @@ -38,7 +38,10 @@ pcp.update_by, pcp.update_time, pcp.invoice_amount, - pcp.payment_status + pcp.payment_status, + pcp.tax, + pcp.tax_rate, + pcp.no_tax_amount FROM pay_common_project pcp left join sys_user su on pcp.principal_id = su.id LEFT JOIN pay_payment_record ppr ON ppr.project_id = pcp.id diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml index d7803d89..8785d831 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml @@ -40,7 +40,10 @@ pwgs.remarks, pwgs.create_by AS createBy, pwgs.create_time AS createTime, - pwgs.update_by AS updateBy + pwgs.update_by AS updateBy, + pwgs.tax, + pwgs.tax_rate, + pwgs.no_tax_amount FROM pay_working_group_subitem pwgs LEFT JOIN pay_payment_record ppr ON ppr.project_id = pwgs.id