From ccc9d4533bc7b696f6d539720a6052abc44ff7a5 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期日, 11 十月 2026 23:46:17 +0800
Subject: [PATCH] fix: 添加设备名称字段并修复多个查询的排序和分组问题

---
 src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml b/src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml
index 611d51e..ec6b013 100644
--- a/src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml
+++ b/src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml
@@ -2,7 +2,14 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.measuringinstrumentledger.mapper.SparePartsMapper">
     <select id="listPage" resultType="com.ruoyi.measuringinstrumentledger.dto.SparePartsDto">
-        select sp.*,sp1.name as parentName
+        select sp.*, sp1.name as parentName,
+        <!-- 2026-10-12 淇锛氬墠绔垪琛ㄧ涓�鍒楀彇鐨勬槸 deviceNameStr锛屼絾 DTO 鍜� SQL 閮芥病鏈夎繖涓瓧娈碉紝
+             瀵艰嚧銆岃澶囧悕绉般�嶅垪姘歌繙绌虹櫧锛堢湅璧锋潵鍍�"娌＄粦瀹氳澶�"锛夈��
+             杩欓噷鎸� spare_parts.device_ids锛堥�楀彿鍒嗛殧锛夊弽鏌� device_ledger 鎷煎嚭璁惧鍚嶃�� -->
+        (select group_concat(d.device_name order by d.id separator ',')
+         from device_ledger d
+         where sp.device_ids is not null and sp.device_ids &lt;&gt; ''
+           and find_in_set(d.id, sp.device_ids)) as deviceNameStr
         from spare_parts sp
         left join spare_parts sp1 on sp1.id = sp.parent_id
         <where>

--
Gitblit v1.9.3