From 0d82e9bb89c8569847537f1ce8b9d994bbc4099b Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 九月 2025 19:57:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/AssetRepairRecordMapper.xml | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/AssetRepairRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AssetRepairRecordMapper.xml
index 8e52586..a1b48a1 100644
--- a/ruoyi-system/src/main/resources/mapper/system/AssetRepairRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/AssetRepairRecordMapper.xml
@@ -25,5 +25,15 @@
<sql id="Base_Column_List">
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_item 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>
+ 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