From fd53edf3fba99ac9d3a609d380a169d61b072962 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 12 二月 2025 09:50:07 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java | 2 +-
ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml | 20 +++++++++++---------
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java
index 9d29fb1..98558e2 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java
@@ -62,7 +62,7 @@
return R.ok(pageInfo);
}
- @ApiOperation(value = "缴费账单查询分页列表")
+ @ApiOperation(value = "缴费账单查询列表")
@PostMapping("/getBillIds")
public R<List<String>> getBillIds(@RequestBody TBillQuery query){
if (StringUtils.isEmpty(query.getUserId())){
diff --git a/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
index 8ac1c4a..c52d5ba 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
@@ -73,9 +73,9 @@
h.house_name as houseName
FROM
t_bill b
- LEFT JOIN t_contract c ON c.contract_number = b.contract_number
- LEFT JOIN t_house h ON h.id = c.house_id
- LEFT JOIN t_tenant t ON t.id = c.tenant_id
+ 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="query.payFeesStatus != null">
and b.pay_fees_status = #{query.payFeesStatus}
@@ -92,7 +92,9 @@
<if test="query.userId != null and query.userId !=''">
and t.id = #{query.userId}
</if>
+ and b.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
+ order by b.payable_fees_time
</select>
<select id="invoiceList" resultType="com.ruoyi.system.dto.TBillDto">
SELECT
@@ -103,14 +105,11 @@
h.house_name as houseName
FROM
t_bill b
- LEFT JOIN t_contract c ON c.contract_number = b.contract_number
- LEFT JOIN t_house h ON h.id = c.house_id
- LEFT JOIN t_tenant t ON t.id = c.tenant_id
+ 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
LEFT JOIN t_invoice_to_bill tb ON b.id = tb.bill_id
<where>
- <if test="query.payFeesStatus != null">
- and b.pay_fees_status = #{query.payFeesStatus}
- </if>
<if test="query.phone != null and query.phone !=''">
and t.phone = #{query.phone}
</if>
@@ -123,7 +122,10 @@
<if test="query.userId != null and query.userId !=''">
and t.id = #{query.userId}
</if>
+ and b.pay_fees_status = 3
and tb.invoice_id IS NULL
+ and b.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
+ order by b.pay_fees_time
</select>
</mapper>
--
Gitblit v1.7.1