From 8ba8cd60021f4f1dccf1b3164c08ecc1c3b660e5 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 8 Jun 2026 13:29:41 +0800
Subject: [PATCH] =?UTF-8?q?2026-06-08=20=E3=80=90=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=B9=B2=E9=A2=84=E3=80=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/request/RequestManageMapper.xml    | 63 ++++++++++++-------
 1 file changed, 42 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/mapper/request/RequestManageMapper.xml b/src/main/resources/mapper/request/RequestManageMapper.xml
index d3bd57a6..b93387a5 100644
--- a/src/main/resources/mapper/request/RequestManageMapper.xml
+++ b/src/main/resources/mapper/request/RequestManageMapper.xml
@@ -483,30 +483,51 @@
 
     <select id="getThePreviousProcessInfo" resultType="com.spring.modules.change.vo.ProcessFormVo">
         <!-- 2025-06-17 同一个流程有多个路线 导致不能按照顺序取stepId -->
-        WITH OrderedData AS (
-        SELECT site, bu, node_id, id, is_remark, step_id,
-        ROW_NUMBER() OVER (ORDER BY id DESC) AS rn,
-        LAG(step_id) OVER (ORDER BY id DESC) AS prev_step_id,
-        update_by
+<!--        WITH OrderedData AS (-->
+<!--        SELECT site, bu, node_id, id, is_remark, step_id,-->
+<!--        ROW_NUMBER() OVER (ORDER BY id DESC) AS rn,-->
+<!--        LAG(step_id) OVER (ORDER BY id DESC) AS prev_step_id,-->
+<!--        update_by-->
+<!--        FROM plm_process_form-->
+<!--        WHERE site = #{site} AND document_no = #{documentNo} and ISNULL(process_intervention_flag ,' ') <![CDATA[<>]]> 'Y'-->
+<!--        ),-->
+<!--        Filtered AS (-->
+<!--        SELECT *-->
+<!--        FROM OrderedData-->
+<!--        WHERE step_id != prev_step_id OR prev_step_id IS NULL-->
+<!--        )-->
+<!--        SELECT site, bu, node_id, id, is_remark, step_id, update_by-->
+<!--        FROM Filtered-->
+<!--        ORDER BY rn OFFSET 1 ROW FETCH NEXT 1 ROW ONLY-->
+
+
+        <!-- 2026-06-08 同一个流程有多个路线 导致不能按照顺序取stepId优化 -->
+        ;WITH OrderedData AS
+        (
+        SELECT
+        site,
+        bu,
+        node_id,
+        id,
+        is_remark,
+        step_id,
+        update_by,
+        update_date,
+        ROW_NUMBER() OVER(ORDER BY id DESC) rn
         FROM plm_process_form
-        WHERE site = #{site} AND document_no = #{documentNo} and ISNULL(process_intervention_flag ,' ') <![CDATA[<>]]> 'Y'
+        WHERE site = #{site} AND document_no = #{documentNo} AND ISNULL(process_intervention_flag,' ') <![CDATA[<>]]> 'Y'
         ),
-        Filtered AS (
-        SELECT *
-        FROM OrderedData
-        WHERE step_id != prev_step_id OR prev_step_id IS NULL
+        PrevNodeInfo AS
+        (
+        SELECT od.node_id
+        FROM OrderedData od
+        JOIN OrderedData cur ON od.rn = cur.rn + 1
+        WHERE cur.is_remark = 0
         )
-        SELECT site, bu, node_id, id, is_remark, step_id, update_by
-        FROM Filtered
-        ORDER BY rn OFFSET 1 ROW FETCH NEXT 1 ROW ONLY
-<!--        select-->
-<!--            site,-->
-<!--            bu,-->
-<!--            node_id,-->
-<!--            id,-->
-<!--            is_remark-->
-<!--        from plm_process_form-->
-<!--        where site = #{site} and bu = #{bu} and document_no = #{documentNo} and step_id = #{stepId} and ISNULL(process_intervention_flag ,' ') <![CDATA[<>]]> 'Y'-->
+        SELECT TOP 1 site, bu, pni.node_id, id, is_remark, step_id, update_by
+        FROM OrderedData od
+        JOIN PrevNodeInfo pni ON od.node_id = pni.node_id
+        ORDER BY od.id ASC;
     </select>
 
     <update id="updateIsRemarkToZero">