From 6e2c3436dbe81afbdcf1b37d98bd35b0279c5b04 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 3 Dec 2025 10:31:31 +0800
Subject: [PATCH] =?UTF-8?q?2025-12-03=20ECN=E9=A9=B3=E5=9B=9E=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E8=A6=81=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4=E5=92=8C?=
 =?UTF-8?q?=E4=BC=9A=E7=AD=BE=E6=A0=87=E8=AF=86=E4=B8=BAN=EF=BC=8C?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=92=8C=E6=97=B6=E9=97=B4=E7=BD=AE=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../change/mapper/ChangeManagementMapper.java    |  4 ++++
 .../impl/ChangeManagementServiceImpl.java        |  6 ++++++
 .../mapper/change/ChangeManagementMapper.xml     | 16 ++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java b/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
index 1b81df19..9061c756 100644
--- a/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
+++ b/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
@@ -216,4 +216,8 @@ public interface ChangeManagementMapper extends BaseMapper<ChangeRequestEntity>{
     List<ChangeRequestDetailEntity> requestDetailSearch2(ChangeRequestEntity inData);
 
     void updateShowInQueryFlag(@Param("site") String site);
+
+    void updateChangeItemForReject(@Param("site") String site, @Param("changeNo") String docNo);
+
+    void updateChangeCountersignatureItemForReject(@Param("site") String site, @Param("changeNo") String docNo);
 }
diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
index b091db17..1f425028 100644
--- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
+++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
@@ -1941,6 +1941,12 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
                 }
             }
         }
+
+        // 2025-12-03 ECN驳回申请要修改提交和会签标识为N，时间置空
+        if ("ECN".equals(type)) {
+            changeManagementMapper.updateChangeItemForReject(paramData.getSite(), paramData.getDocNo());
+            changeManagementMapper.updateChangeCountersignatureItemForReject(paramData.getSite(), paramData.getDocNo());
+        }
     }
 
 
diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml
index 84c11500..137294d3 100644
--- a/src/main/resources/mapper/change/ChangeManagementMapper.xml
+++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml
@@ -1648,4 +1648,20 @@
     <select id="updateShowInQueryFlag" statementType="CALLABLE">
         {CALL UpdateShowInQueryFlag(#{site})}
     </select>
+
+    <update id="updateChangeItemForReject">
+        update plm_change_item
+            set execute_flag = 'N',
+                executor = '',
+                item_execution_date = null
+        where site = #{site} and change_no = #{changeNo}
+    </update>
+
+    <update id="updateChangeCountersignatureItemForReject">
+        update plm_change_countersignature_item
+        set execute_flag = 'N',
+            executor = '',
+            item_execution_date = null
+        where site = #{site} and change_no = #{changeNo}
+    </update>
 </mapper>