From 88f2a615a6c547adfd992334f42d7cd4aea8d55b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 11 十月 2025 11:28:12 +0800
Subject: [PATCH] 资产报修
---
ruoyi-system/src/main/resources/mapper/system/AssetRepairRecordMapper.xml | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/AssetRepairRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AssetRepairRecordMapper.xml
index 0842bb4..84761b5 100644
--- a/ruoyi-system/src/main/resources/mapper/system/AssetRepairRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/AssetRepairRecordMapper.xml
@@ -26,11 +26,18 @@
id, repair_request_id, repair_no, title, repair_time, repair_by, asset_type_id, repair_remarks, attachment_urls, repair_status, create_time, create_by, update_time, update_by, disabled
</sql>
<select id="pageList" resultType="com.ruoyi.system.vo.AssetRepairRequestVO">
- select t1.*,t2.asset_main_id as assetMainId from asset_repair_request t1
+ select t1.*,t2.asset_main_id as assetMainId,t3.nick_name as reporterName from asset_repair_request t1
left join asset_repair_request_item t2 on t1.id = t2.repair_request_id
+ left join sys_user t3 on t1.reporter_id = t3.user_id
where 1=1
<if test="query.numberOrTitle != null and query.numberOrTitle != ''">
AND (t1.repair_no like concat('%', #{query.numberOrTitle}, '%') or t1.title like concat('%', #{query.numberOrTitle}, '%'))
+ </if>
+ <if test="query.userIds != null and query.userIds.size() > 0">
+ AND t1.reporter_id IN
+ <foreach item="item" index="index" collection="query.userIds" open="(" separator="," close=")">
+ #{item}
+ </foreach>
</if>
AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
order by t1.repair_status, t1.urgency_level asc
@@ -63,5 +70,27 @@
</if>
ORDER BY arr.create_time DESC
</select>
+ <select id="listAll" resultType="com.ruoyi.system.vo.AssetRepairRequestVO">
+ select t1.*,t2.asset_main_id as assetMainId from asset_repair_request t1
+ left join asset_repair_request_item t2 on t1.id = t2.repair_request_id
+ where 1=1
+ <if test="query.numberOrTitle != null and query.numberOrTitle != ''">
+ AND (t1.repair_no like concat('%', #{query.numberOrTitle}, '%') or t1.title like concat('%', #{query.numberOrTitle}, '%'))
+ </if>
+ <if test="query.assetMainIds != null and query.assetMainIds.size() > 0">
+ AND t2.asset_main_id IN
+ <foreach item="item" index="index" collection="query.assetMainIds" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="query.userIds != null and query.userIds.size() > 0">
+ AND t1.reporter_id IN
+ <foreach item="item" index="index" collection="query.userIds" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ order by t1.repair_status, t1.urgency_level asc
+ </select>
</mapper>
--
Gitblit v1.7.1