From dc690b2afaa7c7f557434a634e1e1d6086ff1a55 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 14 Jun 2022 09:54:20 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=B7=A5=E4=BD=9C=E7=BB=84=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E4=B8=AD=E5=B7=B2=E5=BC=80=E7=A5=A8=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E5=92=8C=E5=88=B0=E8=B4=A6=E7=8E=87=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/project/entity/PayWorkingGroupStatistics.java | 10 ++++++++--
 .../jero/project/mapper/xml/PayWorkingGroupMapper.xml  |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java
index 97649312..07da5fc2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java
@@ -25,8 +25,14 @@ public class PayWorkingGroupStatistics {
     @Excel(name = "实收总金额", width = 15)
     @ApiModelProperty(value = "实收总金额")
     private String comeAllMoney;
-    @Excel(name = "实收总金额", width = 15)
-    @ApiModelProperty(value = "实收总金额")
+    @Excel(name = "实收完成率", width = 15)
+    @ApiModelProperty(value = "实收完成率")
     private String moneyRate;
+    @Excel(name = "开票金额", width = 15)
+    @ApiModelProperty(value = "开票金额")
+    private String billMoney;
+    @Excel(name = "确认到账金额", width = 15)
+    @ApiModelProperty(value = "确认到账金额")
+    private String confirmAmount;
 
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
index 5639c628..61387271 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
@@ -132,14 +132,14 @@
 
 <!--    工作组统计-->
     <select id="queryPageListForStatistics" resultType="com.jero.project.entity.PayWorkingGroupStatistics">
-        select *
+        select *,
+        CONCAT(CAST(ROUND((comeAllMoney/allMoney)*100,2) AS CHAR),'%') AS moneyRate
         from (
         select
         superId as id,
         projectName as workGroup,
         sum(allMoney) as allMoney,
         sum(comeAllMoney) as comeAllMoney,
-        CONCAT(CAST(ROUND((comeAllMoney/allMoney)*100,2) AS CHAR),'%') AS moneyRate,
         if(sum(pmb.invoice_amount) is null, 0.00, sum(pmb.invoice_amount)) as billMoney,
         sum(confirmAmount) as confirmAmount
         from