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 63fcdd112..459f66897 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
@@ -22,6 +22,12 @@ public class BillPayStatInfo implements Serializable {
// 总已收金额/总未收金额
private BigDecimal totalRecdPayMoney;
private BigDecimal totalNoRecdPayMoney;
+
+ private BigDecimal totalSatisfyMoney;
+ private BigDecimal totalAllowanceMoney;
+ private BigDecimal totalDeductionMoney;
+ private BigDecimal totalOtherMoney;
+
// 账单总数量
private Integer totalBillCount;
// 已收款账单数量
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
index 817b23ba8..4255adac1 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
@@ -74,12 +74,18 @@
+
+
+
+
+
+
@@ -112,6 +118,13 @@
tba.totalBillCount,
tba.totalRecdPayMoney,
tba.totalNoRecdPayMoney,
+
+ tba.totalSatisfyMoney,
+ tba.totalAllowanceMoney,
+ tba.totalDeductionMoney,
+ tba.totalOtherMoney,
+
+
tbb.hasPayBillCount,
tbb.somePayBillCount,
tbb.noPayBillCount,
@@ -124,8 +137,12 @@
ROUND(sum(rec_money),2) as recPayMoney,
count(1) as totalBillCount,
ROUND(sum(reced_money),2) as totalRecdPayMoney,
- ROUND(sum(rec_money-reced_money),2) as totalNoRecdPayMoney
- from emis_settle_bill a
+ ROUND(sum(rec_money-reced_money-satisfy_money-allowance_money-deduction_money-other_money),2) as totalNoRecdPayMoney,
+ ROUND(sum(satisfy_money),2) as totalSatisfyMoney,
+ ROUND(sum(allowance_money),2) as totalAllowanceMoney,
+ ROUND(sum(deduction_money-other_money),2) as totalDeductionMoney,
+ ROUND(sum(other_money),2) as totalOtherMoney
+ from emis_settle_bill a
a.del_flag='0'
and a.salesmen = #{salesmen}