From 60afc1c228318d136a273cd0b389217f87583277 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 11 十月 2025 11:29:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/AssetRepairRecordMapper.xml | 27 ++++++++++++++++++++++++++-
1 files changed, 26 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 84761b5..b42e869 100644
--- a/ruoyi-system/src/main/resources/mapper/system/AssetRepairRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/AssetRepairRecordMapper.xml
@@ -14,6 +14,7 @@
<result column="repair_remarks" property="repairRemarks" />
<result column="attachment_urls" property="attachmentUrls" />
<result column="repair_status" property="repairStatus" />
+ <result column="total_fee" property="totalFee" />
<result column="create_time" property="createTime" />
<result column="create_by" property="createBy" />
<result column="update_time" property="updateTime" />
@@ -23,7 +24,7 @@
<!-- 通用查询结果列 -->
<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
+ id, repair_request_id, repair_no, title, repair_time, repair_by, asset_type_id, repair_remarks, attachment_urls, repair_status, total_fee, 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,t3.nick_name as reporterName from asset_repair_request t1
@@ -93,4 +94,28 @@
order by t1.repair_status, t1.urgency_level asc
</select>
+ <!-- 查询维修记录关联的资产列表 -->
+ <select id="getRepairAssetList" resultType="com.ruoyi.system.vo.asset.AssetRepairRecordAssetVO">
+ SELECT
+ am.id,
+ am.asset_code,
+ am.asset_name,
+ dept.dept_name,
+ parent_type.type_name AS parentAssetType,
+ current_type.type_name AS assetType,
+ am.asset_status,
+ arri.repair_finish_time,
+ arri.repair_fee,
+ arri.status
+ FROM asset_repair_record_item arri
+ LEFT JOIN asset_main am ON arri.asset_main_id = am.id
+ LEFT JOIN asset_type current_type ON am.asset_type_id = current_type.id
+ LEFT JOIN asset_type parent_type ON current_type.parent_id = parent_type.id
+ LEFT JOIN t_dept dept ON am.use_dept_id = dept.dept_id
+ LEFT JOIN asset_repair_record arr ON arri.repair_record_id = arr.id
+ WHERE arri.repair_record_id = #{repairRecordId}
+ AND am.disabled = 0
+ ORDER BY am.asset_code
+ </select>
+
</mapper>
--
Gitblit v1.7.1