From d4b2252268142d9b6f35f6fdc590c4e7cf6f0df3 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期日, 28 六月 2026 20:37:20 +0800
Subject: [PATCH] fix: 销售台账根据合同号倒序

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

diff --git a/src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml b/src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml
index 2968e9a..475cd9c 100644
--- a/src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml
+++ b/src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml
@@ -2,12 +2,21 @@
         "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 from spare_parts sp
+        select sp.*,sp1.name as parentName
+        from spare_parts sp
         left join spare_parts sp1 on sp1.id = sp.parent_id
         <where>
-            <if test="spareParts.name != null">
-                and name like concat('%',#{spareParts.name},'%')
+            <if test="spareParts.name != null and spareParts.name != ''">
+                and sp.name like concat('%',#{spareParts.name},'%')
             </if>
         </where>
     </select>
+
+    <select id="listByDeviceLedgerId" resultType="com.ruoyi.measuringinstrumentledger.dto.SparePartsDto">
+        select sp.*
+        from spare_parts sp
+        where sp.status = '姝e父'
+          and FIND_IN_SET(#{deviceLedgerId}, sp.device_ids) > 0
+        order by sp.id desc
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3