From 71d7eac953028391c428b4c3989f4c6cd1afa00a Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Tue, 26 Oct 2021 11:28:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=B8=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/mail/controller/PayMailBillController.java | 1 + .../src/main/java/com/jero/mail/entity/PayMailBill.java | 4 ++++ .../main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java index ac5f9058..8ed8d3af 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java @@ -1,6 +1,7 @@ package com.jero.mail.controller; import java.math.BigDecimal; +import java.text.DecimalFormat; import java.util.*; import java.util.stream.Collectors; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java index 92dea5e8..950db141 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java @@ -134,6 +134,10 @@ public class PayMailBill implements Serializable { @ApiModelProperty(value = "项目id") private String projectId; + @TableField(exist = false) + @ApiModelProperty(value = "开票金额") + private String invoiceAmountString; + @ApiModelProperty(value = "邮寄人") private String mailer; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml index dd80a221..d7cb1429 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml @@ -61,7 +61,7 @@ SELECT pmb.id, project_name as projectName, bill_no AS billNo, - pmb.invoice_amount as invoiceAmount, + pmb.invoice_amount as invoiceAmountString, principal_name as principalName, charge_company_name as chargeCompanyName, contact_name as contactName,