From d65c72126f95ad379b6b5302325812b1228976aa Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 23 十二月 2025 17:46:35 +0800
Subject: [PATCH] feat(production): 接口修改

---
 src/main/resources/mapper/production/ProcessRouteMapper.xml |    4 ++--
 src/main/resources/mapper/basic/ProductModelMapper.xml      |    5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 4e889f7..a3214d0 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -15,7 +15,7 @@
         <result column="product_id" property="productId" />
     </resultMap>
     <select id="listPageProductModel" resultType="com.ruoyi.basic.pojo.ProductModel">
-        select pm.*,p.product_name
+        select pm.*,p.product_name,
         from product_model pm
         left join product p on pm.product_id = p.id
         <where>
@@ -24,9 +24,6 @@
             </if>
             <if test="c.productName != null and c.productName != ''">
                 and p.product_name  like  concat('%',#{c.productName},'%')
-            </if>
-            <if test="c.speculativeTradingName != null and c.speculativeTradingName != ''">
-                and pm.speculative_trading_name like  concat('%',#{c.speculativeTradingName},'%')
             </if>
         </where>
         order by  pm.id
diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index fc989ad..cd9d931 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -17,8 +17,8 @@
         from process_route ps
                  left join product_model pm on ps.product_model_id = pm.id
         <where>
-            <if test="c.speculativeTradingName != null and 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

--
Gitblit v1.9.3