From 4c8302471963b00c1522f7e6978b96d5c539e819 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 15 四月 2026 10:46:34 +0800
Subject: [PATCH] fix: 工艺路线根据根据日期排序、迷糊查询
---
src/main/resources/mapper/production/ProcessRouteMapper.xml | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index fc989ad..abc0d7d 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -4,23 +4,28 @@
<resultMap id="basicMap" type="com.ruoyi.production.pojo.ProcessRoute">
- <id property="id" column="id"/>
- <result property="productModelId" column="product_model_id"/>
- <result property="description" column="description"/>
- <result property="tenantId" column="tenant_id"/>
- <result property="createTime" column="create_time"/>
- <result property="updateTime" column="update_time"/>
+ <id property="id" column="id"/>
+ <result property="productModelId" column="product_model_id"/>
+ <result property="description" column="description"/>
+ <result property="processRouteName" column="process_route_name"/>
+ <result property="isDefault" column="is_default"/>
+ <result property="tenantId" column="tenant_id"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
</resultMap>
<select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
- select ps.*, pm.speculative_trading_name,pm.product_id,pm.model
- from process_route ps
- left join product_model pm on ps.product_model_id = pm.id
+ SELECT
+ ps.*,
+ p.id AS productId,
+ p.product_name AS productName
+ FROM process_route ps
+ LEFT JOIN product p ON ps.product_model_id = p.id
<where>
- <if test="c.speculativeTradingName != null and c.speculativeTradingName != ''">
- and pm.speculative_trading_name like concat('%',#{c.speculativeTradingName},'%')
+ <if test="c.processRouteName != null and c.processRouteName != ''">
+ AND ps.process_route_name LIKE CONCAT('%', #{c.processRouteName}, '%')
</if>
</where>
- order by ps.id asc
+ ORDER BY ps.update_time DESC, ps.id DESC
</select>
</mapper>
--
Gitblit v1.9.3