From 5fa6e6f8410ef9d057174bcff2a3c5038c54a551 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 27 四月 2025 18:41:20 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml | 40 +++++++++++++++++-----------------------
1 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml
index 42b13b5..09fa6b1 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml
@@ -53,8 +53,12 @@
t.create_by,
t.update_by,
t.disabled,
+ t.code,
+ t.check_money,
+ t.status,
c.contract_number,
- h.house_name
+ h.house_name,
+ h.house_address
from t_check_accept_record t
left join t_contract c on t.contract_id = c.id
left join t_house h on t.house_id = h.id
@@ -72,32 +76,16 @@
AND t.check_time >= #{query.startTime}
AND t.check_time <= #{query.endTime}
</if>
+ <if test="query.businessDeptId != null and query.businessDeptId != '' and query.businessDeptId != 0">
+ AND c.business_dept_id = #{query.businessDeptId}
+ </if>
AND t.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
ORDER BY t.create_time DESC
</select>
<select id="pageListApplet" resultType="com.ruoyi.system.vo.TCheckAcceptRecordVO">
select
- t.id,
- t.contract_id,
- t.house_id,
- t.check_time,
- t.lease_reason,
- t.check_person,
- t.accompany_person,
- t.overall_situation,
- t.furniture_situation,
- t.device_situation,
- t.clean_situation,
- t.other_problem,
- t.pictures,
- t.check_result,
- t.check_money,
- t.create_time,
- t.update_time,
- t.create_by,
- t.update_by,
- t.disabled,
+ t.*,
c.contract_number,
h.house_name
from t_check_accept_record t
@@ -105,12 +93,18 @@
left join t_house h on t.house_id = h.id
<where>
- <if test="query.status != null">
- AND t.status = #{query.status}
+ <if test="query.status != null and query.status != '' and query.status == 1">
+ AND t.status = 0
+ </if>
+ <if test="query.status != null and query.status != '' and query.status == 2">
+ AND t.status = 1
</if>
<if test="query.houseNameOrAddress != null and query.houseNameOrAddress != ''">
AND (h.house_name LIKE concat('%', #{query.houseNameOrAddress}, '%') or h.house_address LIKE concat('%', #{query.houseNameOrAddress}, '%'))
</if>
+ <if test="query.businessDeptId != null and query.businessDeptId != '' and query.businessDeptId!=0">
+ AND h.business_dept_id =#{query.businessDeptId}
+ </if>
AND t.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
ORDER BY t.create_time DESC
--
Gitblit v1.7.1