From fb88391ffa5e2dbaaccccffd65ae127382df8126 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 05 三月 2025 16:47:35 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang

---
 ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
index c6177a6..1e5bc53 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
@@ -63,7 +63,7 @@
                 and t.id = #{query.userId}
             </if>
         </where>
-        order by b.create_time desc
+        order by b.payable_fees_time
     </select>
     <select id="getBillList" resultType="com.ruoyi.system.dto.TBillDto">
         SELECT
@@ -95,7 +95,7 @@
             </if>
             and b.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
         </where>
-        order by b.payable_fees_time
+        order by b.bill_type,b.payable_fees_time
     </select>
     <select id="invoiceList" resultType="com.ruoyi.system.dto.TBillDto">
         SELECT
@@ -146,4 +146,20 @@
         LEFT JOIN t_tenant t ON t.id = c.tenant_id and t.disabled=0
         where b.id = #{billId}
     </select>
+
+    <select id="statisticsAllRent" resultType="java.math.BigDecimal">
+        SELECT sum(payable_fees_money) as amount FROM t_bill
+    </select>
+
+    <select id="statisticsNoPay" resultType="java.math.BigDecimal">
+        SELECT sum(outstanding_money) as amount FROM t_bill where pay_fees_status!=3
+    </select>
+
+    <select id="statisticsPayed" resultType="java.math.BigDecimal">
+        SELECT sum(pay_fees_money) as amount FROM t_bill
+    </select>
+
+    <select id="statisticsOverdue" resultType="java.math.BigDecimal">
+        SELECT sum(outstanding_money) as amount FROM t_bill where pay_fees_status=4
+    </select>
 </mapper>

--
Gitblit v1.7.1