From 96a7015065775e5c3bc3d6458b86b28ad7bfb46b Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期四, 13 三月 2025 17:53:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
index 5415d26..81d281c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
@@ -93,6 +93,9 @@
<if test="query.userId != null and query.userId !=''">
and t.id = #{query.userId}
</if>
+ <if test="query.billType != null">
+ and b.bill_type = #{query.billType}
+ </if>
and b.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
order by b.bill_type,b.payable_fees_time
@@ -162,4 +165,25 @@
<select id="statisticsOverdue" resultType="java.math.BigDecimal">
SELECT ifnull(sum(outstanding_money),0) as amount FROM t_bill where pay_fees_status=4
</select>
+ <select id="batchBillCount" resultType="java.lang.Integer">
+ SELECT
+ count(b.id)
+ FROM
+ t_bill b
+ LEFT JOIN t_contract c ON c.contract_number = b.contract_number and c.disabled=0
+ LEFT JOIN t_house h ON h.id = c.house_id and h.disabled=0
+ LEFT JOIN t_tenant t ON t.id = c.tenant_id and t.disabled=0
+ <where>
+ <if test="userId != null and userId !=''">
+ AND t.id = #{userId}
+ </if>
+ <if test="billIds != null and billIds.size() > 0">
+ AND b.id NOT IN
+ <foreach collection="billIds" item="item" index="index" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ AND b.bill_type = 3
+ </where>
+ </select>
</mapper>
--
Gitblit v1.7.1