From a4ed0c4cb332c78eed9a72d153df01da0803cff1 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 03 四月 2025 21:00:12 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml | 14 ++++++++++++++
1 files changed, 14 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 5d3627a..510dffe 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
@@ -213,6 +213,7 @@
LEFT JOIN t_contract tc ON tc.house_id = th.id
LEFT JOIN t_bill tb ON tc.id = tb.contract_id
<where>
+ tc.pay_type = 2 AND tb.pay_fees_status != 5
<if test="businessDeptId != 0">
AND th.business_dept_id = #{businessDeptId}
</if>
@@ -220,4 +221,17 @@
GROUP BY ts.id
ORDER BY rentAmount DESC
</select>
+ <select id="getJiFuBillList" resultType="com.ruoyi.system.model.TBill" parameterType="java.lang.String">
+ SELECT tb.* FROM t_bill tb LEFT JOIN t_contract tt ON tb.contract_id = tt.id
+ <where>
+ tt.pay_type = 2 AND tb.bill_type = ${@com.ruoyi.common.enums.BillTypeEnum@Zujin.getCode()} AND tb.pay_fees_status != 5
+ <if test="businessDeptId != null and businessDeptId != 0">
+ AND tb.business_dept_id = #{businessDeptId}
+ </if>
+ <if test="first!=null and last !=null">
+ AND tb.payable_fees_time BETWEEN #{first} AND #{last}
+ </if>
+ GROUP BY tt.id
+ </where>
+ </select>
</mapper>
--
Gitblit v1.7.1