From 6f97a42dccaedb7a8950feac205080e63d8be439 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 26 二月 2025 14:27:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml
index 2e99a8c..cbff79f 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.checkMoney,
+ 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
@@ -76,5 +80,25 @@
</where>
ORDER BY t.create_time DESC
</select>
+ <select id="pageListApplet" resultType="com.ruoyi.system.vo.TCheckAcceptRecordVO">
+ select
+ t.*,
+ c.contract_number,
+ h.house_name
+ 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
+ <where>
+
+ <if test="query.status != null">
+ AND t.status = #{query.status}
+ </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>
+ AND t.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY t.create_time DESC
+ </select>
</mapper>
--
Gitblit v1.7.1