From 95985b5a5bb7c5656098cc8923ed3d1d8aaa3d2b Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期五, 24 一月 2025 10:44:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun

---
 ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml
index 6531e6f..27b7137 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml
@@ -38,5 +38,22 @@
     <sql id="Base_Column_List">
         id, contract_number, contract_name, start_time, end_time, total_rent, deposit, pay_type, first_pay_time, isIncreasing, isIncreasing_deposit, proportion, house_id, party_one_name, party_one_person, party_one_phone, tenant_id, party_two_name, party_two_person, party_two_phone, contract_file, remark, status, create_time, update_time, create_by, update_by, disabled
     </sql>
+    <select id="contractList" resultType="com.ruoyi.system.model.TContract">
+        select t1.* from t_contract t1
+        <where>
+            <if test="query.partyTwoName != null and query.partyTwoName != ''">
+                and t1.party_two_name like concat('%',#{query.partyTwoName},'%')
+            </if>
+            <if test="query.contractNumber != null and query.contractNumber != ''">
+                and t1.contract_number like concat('%',#{query.contractNumber},'%')
+            </if>
+             <if test="query.contractName != null and query.contractName != ''">
+                and t1.contract_name like concat('%',#{query.contractName},'%')
+            </if>
+            <if test="query.status != null">
+                and t1.status = #{query.status}
+            </if>
+        </where>
+    </select>
 
 </mapper>

--
Gitblit v1.7.1