Merge remote-tracking branch 'origin/master' into xizang-changyun

yupeng

2025-02-26 6f97a42dccaedb7a8950feac205080e63d8be439

 ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml

@@ -130,5 +130,51 @@
        </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 t.service_address LIKE CONCAT('%', #{query.houseAddress}, '%')
            </if>
            <if test="query.status != null">
                AND t.status = #{query.status}
            </if>
            AND t.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        </where>
        ORDER BY t.create_time DESC
    </select>

</mapper>