From b9c032d96e236d9c45ca748be63a327755b82a06 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 20 二月 2025 13:43:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml
index 4e23099..832d505 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TTenantMapper.xml
@@ -43,5 +43,32 @@
</where>
ORDER BY create_time DESC
</select>
+ <select id="pageListApplet" resultType="com.ruoyi.system.vo.TenantVO">
+ SELECT id, resident_name, checkIn_time, tenant_attributes, tenant_type, phone, id_card, email,
+ bank_number, mail_address, create_time, disabled,account
+ FROM t_tenant
+ <where>
+ <if test="query.residentNameOrPhone != null and query.residentNameOrPhone != ''">
+ AND (resident_name LIKE concat('%',#{query.residentNameOrPhone},'%')or phone LIKE concat('%',#{query.residentNameOrPhone},'%'))
+ </if>
+ AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY create_time DESC
+ </select>
+ <select id="listBill" resultType="com.ruoyi.system.vo.TBillVO">
+ select t1.* from
+ t_bill t1
+ where 1=1
+ <if test="query.payFeesStatus != null and query.payFeesStatus != ''">
+ AND t1.pay_fees_status = #{query.payFeesStatus}
+ </if>
+ <if test="null != query.contractIds and query.contractIds.size() > 0">
+ and t1.contract_id in
+ <foreach collection="query.contractIds" item="item" index="index" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </select>
</mapper>
--
Gitblit v1.7.1