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

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

diff --git a/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
index 1e5bc53..5415d26 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.payable_fees_time
+        order by b.payable_fees_time desc,b.create_time desc
     </select>
     <select id="getBillList" resultType="com.ruoyi.system.dto.TBillDto">
         SELECT
@@ -148,18 +148,18 @@
     </select>
 
     <select id="statisticsAllRent" resultType="java.math.BigDecimal">
-        SELECT sum(payable_fees_money) as amount FROM t_bill
+        SELECT ifnull(sum(payable_fees_money),0) 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 ifnull(sum(outstanding_money),0) 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 ifnull(sum(pay_fees_money),0) 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 ifnull(sum(outstanding_money),0) as amount FROM t_bill where pay_fees_status=4
     </select>
 </mapper>

--
Gitblit v1.7.1