From bc10a0ad457b259aa8a51bbd0dc532c11bde237a Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 10 Aug 2026 11:50:18 +0800
Subject: [PATCH] =?UTF-8?q?2026-08-10=20RoHS=EF=BC=9A=20=E5=BD=93=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E7=8A=B6=E6=80=81=20=3D=20=E5=B7=B2=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=20=E4=B8=94=20=E5=A4=B1=E6=95=88=E6=A0=87=E8=AF=86=20=3D=20Y?=
 =?UTF-8?q?=EF=BC=8C=E9=82=A3=E4=B9=88=E2=80=9C=E5=BD=93=E5=89=8D=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E2=80=9D=E5=B0=B1=E6=98=BE=E7=A4=BA=E4=B8=BA=E2=80=9C?=
 =?UTF-8?q?Waiting=20For=20HSF=20Update=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/rohs/RohsMapper.xml | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/rohs/RohsMapper.xml b/src/main/resources/mapper/rohs/RohsMapper.xml
index 94cbf104..eeaf65f7 100644
--- a/src/main/resources/mapper/rohs/RohsMapper.xml
+++ b/src/main/resources/mapper/rohs/RohsMapper.xml
@@ -108,7 +108,10 @@
         select
             <include refid="Base_Column_List"/>,
             d.node_id as nodeId,
-            d.node_name as nodeName,
+            case
+                when a.status = '已完成' and isnull(a.is_expiring, 'N') = 'Y' then 'Waiting For HSF Update'
+                else d.node_name
+            end as nodeName,
             isnull(approverData.currentApprover, '') as currentApprover,
             isnull(approverData.currentApprover, '') as createBy2,
             isnull(d.is_reject, 'N') as isReject,
@@ -347,7 +350,10 @@
         select
             <include refid="Base_Column_List"/>,
             d.node_id as nodeId,
-            d.node_name as nodeName,
+            case
+                when a.status = '已完成' and isnull(a.is_expiring, 'N') = 'Y' then 'Waiting For HSF Update'
+                else d.node_name
+            end as nodeName,
             isnull(approverData.currentApprover, '') as currentApprover,
             isnull(approverData.currentApprover, '') as createBy2,
             isnull(d.is_reject, 'N') as isReject,
@@ -507,7 +513,10 @@
         select
             <include refid="Base_Column_List"/>,
             d.node_id as nodeId,
-            d.node_name as nodeName,
+            case
+                when a.status = '已完成' and isnull(a.is_expiring, 'N') = 'Y' then 'Waiting For HSF Update'
+                else d.node_name
+            end as nodeName,
             isnull(approverData.currentApprover, '') as currentApprover,
             isnull(approverData.currentApprover, '') as createBy2,
             isnull(d.is_reject, 'N') as isReject,
@@ -630,7 +639,10 @@
         select
             <include refid="Base_Column_List"/>,
             d.node_id as nodeId,
-            d.node_name as nodeName,
+            case
+                when a.status = '已完成' and isnull(a.is_expiring, 'N') = 'Y' then 'Waiting For HSF Update'
+                else d.node_name
+            end as nodeName,
             isnull(approverData.currentApprover, '') as currentApprover,
             isnull(approverData.currentApprover, '') as createBy2,
             isnull(d.is_reject, 'N') as isReject,