From 8b661d5e7be1e76811f8558ba7c66720ee7c2f57 Mon Sep 17 00:00:00 2001
From: "JinLu.Yin" <411641505@qq.com>
Date: Sat, 14 May 2022 00:14:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=BB=84=E6=88=90=E4=B8=8A?=
 =?UTF-8?q?=E9=81=93=E5=B7=A5=E5=BA=8F=E3=80=81=E4=B8=8B=E9=81=93=E5=B7=A5?=
 =?UTF-8?q?=E5=BA=8F=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/pro/ProRouteProcessMapper.xml      | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/ktg-mes/src/main/resources/mapper/pro/ProRouteProcessMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProRouteProcessMapper.xml
index f431930..597af31 100644
--- a/ktg-mes/src/main/resources/mapper/pro/ProRouteProcessMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/pro/ProRouteProcessMapper.xml
@@ -70,28 +70,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="findPreProcess" parameterType="ProRouteProcess" resultMap="ProRouteProcessResult">
         <include refid="selectProRouteProcessVo"/>
         where route_id = #{routeId}
-        AND order_num &lt; (
-        SELECT order_num
-        FROM pro_route_process
-        WHERE route_id = #{routeId}
-        <if test="processId != null "> and process_id = #{processId}</if>
-        <if test="orderNum != null "> and order_num = #{orderNum}</if>
-        AND order_num = #{orderNum} limit 1
-        )
+        <choose>
+            <when test="orderNum != null "> and order_num &lt; #{orderNum}</when>
+            <otherwise>
+                AND order_num &lt; (
+                    SELECT order_num
+                    FROM pro_route_process
+                    WHERE route_id = #{routeId} limit 1
+                )
+            </otherwise>
+        </choose>
         ORDER BY order_num DESC LIMIT 1
     </select>
 
     <select id="findNextProcess" parameterType="ProRouteProcess" resultMap="ProRouteProcessResult">
         <include refid="selectProRouteProcessVo"/>
         where route_id = #{routeId}
-        AND order_num &gt; (
-        SELECT order_num
-        FROM pro_route_process
-        WHERE route_id = #{routeId}
-        <if test="processId != null "> and process_id = #{processId}</if>
-        <if test="orderNum != null "> and order_num = #{orderNum}</if>
-        AND order_num = #{orderNum} limit 1
-        )
+        <choose>
+            <when test="orderNum != null "> and order_num &gt; #{orderNum}</when>
+            <otherwise>
+                AND order_num &gt; (
+                SELECT order_num
+                FROM pro_route_process
+                WHERE route_id = #{routeId} limit 1
+                )
+            </otherwise>
+        </choose>
         ORDER BY order_num ASC LIMIT 1
     </select>