From 5fa6e6f8410ef9d057174bcff2a3c5038c54a551 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 27 四月 2025 18:41:20 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml | 193 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 172 insertions(+), 21 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml
index 944919f..890c59c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml
@@ -5,33 +5,184 @@
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.ruoyi.system.model.TFaultRepairMessage">
<id column="id" property="id" />
- <result column="appUserId" property="appUserId" />
- <result column="itemId" property="itemId" />
- <result column="faultAreaName" property="faultAreaName" />
- <result column="describeName" property="describeName" />
- <result column="describeDetail" property="describeDetail" />
- <result column="faultPictures" property="faultPictures" />
- <result column="serviceAddress" property="serviceAddress" />
- <result column="repairType" property="repairType" />
- <result column="visitTime" property="visitTime" />
- <result column="contactNumber" property="contactNumber" />
- <result column="leaveMessage" property="leaveMessage" />
- <result column="handlePerson" property="handlePerson" />
- <result column="handleTime" property="handleTime" />
- <result column="reaultDescribe" property="reaultDescribe" />
- <result column="repairPicture" property="repairPicture" />
+ <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" />
+ <result column="fault_pictures" property="faultPictures" />
+ <result column="service_address" property="serviceAddress" />
+ <result column="repair_type" property="repairType" />
+ <result column="visit_time" property="visitTime" />
+ <result column="contact_number" property="contactNumber" />
+ <result column="leave_message" property="leaveMessage" />
+ <result column="handle_person" property="handlePerson" />
+ <result column="handle_time" property="handleTime" />
+ <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="createTime" property="createTime" />
- <result column="updateTime" property="updateTime" />
- <result column="createBy" property="createBy" />
- <result column="updateBy" property="updateBy" />
- <result column="isDelete" property="isDelete" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="create_by" property="createBy" />
+ <result column="update_by" property="updateBy" />
+ <result column="disabled" property="disabled" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, appUserId, itemId, faultAreaName, describeName, describeDetail, faultPictures, serviceAddress, repairType, visitTime, contactNumber, leaveMessage, handlePerson, handleTime, reaultDescribe, repairPicture, attachment, status, createTime, updateTime, createBy, updateBy, isDelete
+ 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.code,
+ t.create_time,
+ t.update_time,
+ t.create_by,
+ t.update_by,
+ t.disabled,
+ t.fault_cause,
+ 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,
+ t.code,
+ 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
+ LEFT JOIN t_contract tc ON t.contract_id = tc.id
+ <where>
+ <if test="query.residentName != null and query.residentName != ''">
+ AND tnt.resident_name LIKE CONCAT('%', #{query.residentName}, '%')
+ </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>
+ <if test="query.businessDeptId != null and query.businessDeptId != '' and query.businessDeptId != 0">
+ AND tc.business_dept_id = #{query.businessDeptId}
+ </if>
+ AND t.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </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,
+ t.code,
+ 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>
--
Gitblit v1.7.1