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 @@
-
+
+
+
@@ -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
a.del_flag='0'