add 回显税率

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;
 
     /**税额*/

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;
 
     /**税额*/

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;
 
     /**税额*/

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;
 
     /**税额*/

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;
 
     /**税额*/

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;
 
     /**税额*/

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;
 
     /**税额*/

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;
 
     /**税额*/

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;
 
     /**税额*/

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;
 
     /**税额*/

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

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
         <where>