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/TFaultRepairMessageMapper.xml | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml index efeb10c..f39bab5 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml @@ -130,5 +130,48 @@ </where> ORDER BY t.create_time DESC </select> + <select id="pageListApplet" resultType="com.ruoyi.system.vo.TFaultRepairMessageVO"> + SELECT + t.id, + t.tenant_id, + t.item_id, + t.item_type_id, + t.contract_id, + t.fault_area_name, + t.describe_name, + t.describe_detail, + t.fault_pictures, + t.service_address, + t.repair_type, + t.visit_time, + t.contact_number, + t.leave_message, + t.handle_person, + t.handle_time, + t.result_describe, + t.repair_picture, + t.attachment, + t.attachment_name, + t.status, + t.create_time, + t.update_time, + t.create_by, + t.update_by, + t.disabled, + i.item_name AS itemName, + it.type_name AS itemTypeName, + tnt.resident_name AS residentName + from t_fault_repair_message t + LEFT JOIN t_item i ON t.item_id = i.id + LEFT JOIN t_item_type it ON t.item_type_id = it.id + LEFT JOIN t_tenant tnt ON t.tenant_id = tnt.id + <where> + <if test="query.houseAddress != null and query.houseAddress != ''"> + AND tnt.service_address LIKE CONCAT('%', #{query.houseAddress}, '%') + </if> + AND t.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()} + </where> + ORDER BY t.create_time DESC + </select> </mapper> -- Gitblit v1.7.1