From b606905fcaf748edfc4bafb236e388f3295f2899 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 07 四月 2025 09:16:46 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java | 1 +
ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
index c49375a..a5aaeda 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
@@ -329,6 +329,7 @@
save.setPayType(3);
save.setPayer(dto.getPayer());
save.setPayTime(billSave.getPayFeesTime());
+ save.setBusinessDeptId(bill.getBusinessDeptId());
save.setSysSerialNumber(OrderNos.getDid(30));
save.setFlowType(1);
save.setPaymentBillId(back.getId());
diff --git a/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
index e10c3ec..1e814c7 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
@@ -157,28 +157,28 @@
</select>
<select id="statisticsAllRent" resultType="java.math.BigDecimal">
- SELECT ifnull(sum(payable_fees_money),0) as amount FROM t_bill
+ SELECT ifnull(sum(payable_fees_money),0) as amount FROM t_bill where pay_fees_status!='5'
<if test='busDeptId != null and busDeptId != "" and busDeptId!="0"'>
- where business_dept_id = #{busDeptId}
+ and business_dept_id = #{busDeptId}
</if>
</select>
<select id="statisticsNoPay" resultType="java.math.BigDecimal">
- SELECT ifnull(sum(outstanding_money),0) 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' and pay_fees_status!='5'
<if test='busDeptId != null and busDeptId != "" and busDeptId!="0"'>
and business_dept_id = #{busDeptId}
</if>
</select>
<select id="statisticsPayed" resultType="java.math.BigDecimal">
- SELECT ifnull(sum(pay_fees_money),0) as amount FROM t_bill
+ SELECT ifnull(sum(pay_fees_money),0) as amount FROM t_bill where pay_fees_status!='5'
<if test='busDeptId != null and busDeptId != "" and busDeptId!="0"'>
- where business_dept_id = #{busDeptId}
+ and business_dept_id = #{busDeptId}
</if>
</select>
<select id="statisticsOverdue" resultType="java.math.BigDecimal">
- SELECT ifnull(sum(outstanding_money),0) 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'
<if test='busDeptId != null and busDeptId != "" and busDeptId!="0"'>
and business_dept_id = #{busDeptId}
</if>
--
Gitblit v1.7.1