Merge branch 'master' of https://gitee.com/xiaochen991015/xizang into xizan...

zhangmei

2025-02-14 728a54cc02ff66e38bc8719ecc0f3155e597084c

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

@@ -5,8 +5,10 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TFaultRepairMessage">
        <id column="id" property="id" />
        <result column="app_user_id" property="appUserId" />
        <result column="tenant_id" property="tenantId" />
        <result column="item_id" property="itemId" />
        <result column="item_type_id" property="itemTypeId" />
        <result column="contract_id" property="contractId" />
        <result column="fault_area_name" property="faultAreaName" />
        <result column="describe_name" property="describeName" />
        <result column="describe_detail" property="describeDetail" />
@@ -18,9 +20,10 @@
        <result column="leave_message" property="leaveMessage" />
        <result column="handle_person" property="handlePerson" />
        <result column="handle_time" property="handleTime" />
        <result column="reault_describe" property="reaultDescribe" />
        <result column="result_describe" property="resultDescribe" />
        <result column="repair_picture" property="repairPicture" />
        <result column="attachment" property="attachment" />
        <result column="attachment_name" property="attachmentName" />
        <result column="status" property="status" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
@@ -31,7 +34,101 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, app_user_id, item_id, fault_area_name, describe_name, describe_detail, fault_pictures, service_address, repair_type, visit_time, contact_number, leave_message, handle_person, handle_time, reault_describe, repair_picture, attachment, status, create_time, update_time, create_by, update_by, disabled
        id, tenant_id, item_id,item_type_id,contract_id, fault_area_name, describe_name, describe_detail, fault_pictures, service_address, repair_type,
            visit_time, contact_number, leave_message, handle_person, handle_time, result_describe, repair_picture, attachment,attachment_name, status,
            create_time,update_time, create_by, update_by, disabled
    </sql>
    <select id="getDetailById" 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 t.id = #{id}
    </select>
    <select id="pageList" 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.tenantId != null and query.tenantId != ''">
                AND t.tenant_id = #{query.tenantId}
            </if>
            <if test="query.contactNumber != null and query.contactNumber != ''">
                AND t.contact_number LIKE CONCAT('%', #{query.contactNumber}, '%')
            </if>
            <if test="query.status != null">
                AND t.status = #{query.status}
            </if>
            <if test="query.repairType != null">
                AND t.repair_type = #{query.repairType}
            </if>
            <if test="query.handlePerson != null and query.handlePerson != ''">
                AND t.handle_person LIKE CONCAT('%', #{query.handlePerson}, '%')
            </if>
            AND t.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        </where>
        ORDER BY t.create_time DESC
    </select>

</mapper>