From 191a4bb404614a3952147f1cb65f4451f182b045 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 31 十二月 2025 09:51:38 +0800
Subject: [PATCH] refactor(production): 优化工艺路线实体映射和查询逻辑

---
 src/main/resources/mapper/production/ProcessRouteMapper.xml |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index 058faf3..c5e09fc 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -13,13 +13,15 @@
     </resultMap>
 
     <select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
-        select ps.*, pm.speculative_trading_name
+        select ps.*, p.product_name,pm.product_id,pm.model
         from process_route ps
-                 left join product_model pm on ps.product_model_id = pm.id
+        left join product_model pm on ps.product_model_id = pm.id
+        left join product p on pm.product_id = p.id
         <where>
-            <if test="c.speculativeTradingName != null || c.speculativeTradingName != ''">
-                and pm.speculative_trading_name like concat('%',#{c.speculativeTradingName},'%')
+            <if test="c.model != null and c.model != ''">
+                and pm.model like concat('%',#{c.model},'%')
             </if>
         </where>
+        order by ps.id asc
     </select>
 </mapper>

--
Gitblit v1.9.3