From 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 06 五月 2026 15:44:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/technology/TechnologyRoutingMapper.xml | 34 ++++++++++++++--------------------
1 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/src/main/resources/mapper/technology/TechnologyRoutingMapper.xml b/src/main/resources/mapper/technology/TechnologyRoutingMapper.xml
index 231905b..bda31ba 100644
--- a/src/main/resources/mapper/technology/TechnologyRoutingMapper.xml
+++ b/src/main/resources/mapper/technology/TechnologyRoutingMapper.xml
@@ -16,17 +16,17 @@
<select id="pageTechnologyRouting" resultType="com.ruoyi.technology.bean.vo.TechnologyRoutingVo">
select tr.id,
- tr.product_model_id as productModelId,
- tr.description,
- tr.create_time as createTime,
- tr.update_time as updateTime,
- tr.process_route_code as processRouteCode,
- tr.bom_id as bomId,
- tr.create_user as createUser,
- tr.dept_id as deptId,
- p.product_name as productName,
- pm.model,
- tb.bom_no as bomNo
+ tr.product_model_id as productModelId,
+ tr.description,
+ tr.create_time as createTime,
+ tr.update_time as updateTime,
+ tr.process_route_code as processRouteCode,
+ tr.bom_id as bomId,
+ tr.create_user as createUser,
+ tr.dept_id as deptId,
+ p.product_name as productName,
+ pm.model,
+ tb.bom_no as bomNo
from technology_routing tr
left join product_model pm on tr.product_model_id = pm.id
left join product p on pm.product_id = p.id
@@ -39,6 +39,9 @@
<if test="c.productModelId != null">
and tr.product_model_id = #{c.productModelId}
</if>
+ <if test="c.model != null and c.model != ''">
+ and pm.model like concat('%', #{c.model}, '%')
+ </if>
<if test="c.bomId != null">
and tr.bom_id = #{c.bomId}
</if>
@@ -47,15 +50,6 @@
</if>
<if test="c.description != null and c.description != ''">
and tr.description like concat('%', #{c.description}, '%')
- </if>
- <if test="c.model != null and c.model != ''">
- and pm.model like concat('%', #{c.model}, '%')
- </if>
- <if test="c.productName != null and c.productName != ''">
- and p.product_name like concat('%', #{c.productName}, '%')
- </if>
- <if test="c.bomNo != null and c.bomNo != ''">
- and tb.bom_no like concat('%', #{c.bomNo}, '%')
</if>
</if>
</where>
--
Gitblit v1.9.3