From b2ff53fa48438443a384e0f2756fecf5ab741e93 Mon Sep 17 00:00:00 2001
From: "ys.git" <18439391935@163.com>
Date: Mon, 15 Dec 2025 10:31:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E7=8A=B6=E6=80=81=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E6=8A=A2=E7=AD=BE=E4=B8=8E=E8=A2=AB=E6=8A=A2=E7=AD=BE?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ActivitiProcessServiceImpl.java      | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java
index 7f6480a..da83f70 100644
--- a/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java
@@ -328,6 +328,22 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
 
         //必须已经全部通过  不是会签的话例外
         if (operatedUsers.containsAll(assigneeList) || notAll) {
+            //当前环节审批人 用来完成当前环节审批人的待办
+            String assignees = approvalConfigPojo.getAssignees();
+            for (String assID : Arrays.asList(assignees.split(","))) {
+                Integer isd;
+                if (assID.equals(approver)) {
+                    isd = 1;//抢签者完成
+                } else {
+                    isd = 2;//被抢签完成
+                }
+                sw.buildFromDatasource("xdap_app_223770822127386625")
+                        .update("is_delete", isd)
+                        .update("last_update_date", new Date())
+                        .eq("document_no", approvalId)
+                        .eq("owner_id", assID)
+                        .doUpdate(TodoTaskPojo.class);
+            }
             // 获取下一个环节
             List<ApprovalConfigPojo> approvalConfigPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
                     .eq("approval_id", approvalId)
@@ -335,15 +351,7 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
                     .doQuery(ApprovalConfigPojo.class);
 
             if (ObjectUtils.isNotEmpty(approvalConfigPojos)) {
-                //当前环节审批人 用来完成当前环节审批人的待办
-                String assignees = approvalConfigPojo.getAssignees();
-                for (String assID : Arrays.asList(assignees.split(","))) {
-                    sw.buildFromDatasource("xdap_app_223770822127386625")
-                            .update("is_delete", 1)
-                            .update("last_update_date", new Date())
-                            .eq("document_no", approvalId)
-                            .doUpdate(TodoTaskPojo.class);
-                }
+
                 ApprovalConfigPojo approvalConfigPojo1 = approvalConfigPojos.get(0);
                 for (String nextAssId : Arrays.asList(approvalConfigPojo1.getAssignees().split(","))) {
                     TodoTaskPojo todoTaskPojo = new TodoTaskPojo();
@@ -415,12 +423,6 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
                         .update("approver_persons", "")
                         .update("last_update_date", new Date())
                         .eq("id", approvalId).doUpdate(EngineReviewListPojo.class);
-                //审批流所有的待办完成处理
-                sw.buildFromDatasource("xdap_app_223770822127386625")
-                        .update("is_delete", 1)
-                        .update("last_update_date", new Date())
-                        .eq("document_no", approvalId)
-                        .doUpdate(TodoTaskPojo.class);
             }
         } else {
             //如果还有未通过的  找到未通过的