From 37aef2a80d1402543a0132f0aaa97c2e2eb58827 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 27 Sep 2024 21:11:40 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/emis/domain/stat/BillPayStatInfo.java   |  5 +++--
 .../src/main/resources/mapper/EmisSettleBillMapper.xml | 10 +++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/BillPayStatInfo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/BillPayStatInfo.java
index 6358cb06e..63fcdd112 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/BillPayStatInfo.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/BillPayStatInfo.java
@@ -19,8 +19,9 @@ public class BillPayStatInfo implements Serializable {
 
     // 应收金额
     private BigDecimal recPayMoney;
-    // 已收金额
-    private BigDecimal hasRecdPayMoney;
+    // 总已收金额/总未收金额
+    private BigDecimal totalRecdPayMoney;
+    private BigDecimal totalNoRecdPayMoney;
     // 账单总数量
     private Integer totalBillCount;
     // 已收款账单数量
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
index 02e9257c2..7cf7f404f 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
@@ -71,7 +71,9 @@
         <result property="salesmen"    column="salesmen"    />
         <result property="billMonth"   column="billMonth"    />
         <result property="recPayMoney"    column="recPayMoney"    />
-        <result property="hasRecdPayMoney"    column="hasRecdPayMoney"    />
+        <result property="totalRecdPayMoney"    column="totalRecdPayMoney"    />
+        <result property="totalNoRecdPayMoney"    column="totalNoRecdPayMoney"    />
+
         <result property="totalBillCount"    column="totalBillCount" />
         <result property="hasPayBillCount"    column="hasPayBillCount" />
         <result property="somePayBillCount"    column="somePayBillCount"    />
@@ -108,7 +110,8 @@
                 tba.billMonth,
                 tba.recPayMoney,
                 tba.totalBillCount,
-                tba.hasRecdPayMoney,
+                tba.totalRecdPayMoney,
+                tba.totalNoRecdPayMoney,
                 tbb.hasPayBillCount,
                 tbb.somePayBillCount,
                 tbb.noPayBillCount,
@@ -120,7 +123,8 @@
                 select salesmen,bill_month as billMonth,
                      ROUND(sum(rec_money),2) as recPayMoney,
                      count(1) as totalBillCount,
-                     ROUND(sum(reced_money),2) as hasRecdPayMoney
+                     ROUND(sum(reced_money),2) as totalRecdPayMoney,
+                     ROUND(sum(rec_money-reced_money),2) as totalNoRecdPayMoney
                 from emis_settle_bill a
                 <where>
                     a.del_flag='0'