From 361d0eee2fba188a9bfd0f69c5b81689f6543019 Mon Sep 17 00:00:00 2001
From: wangzhijiang <1358525938@qq.com>
Date: Wed, 27 Mar 2024 15:55:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=9B=BE=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StartSurveyAfter.java                     | 29 +++++++++++++++++++
 .../StandardCommentNewProcess/Step4After.java |  1 +
 .../StandardCommentNewProcess/Step8After.java | 14 +++++++++
 3 files changed, 44 insertions(+)

diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/StartSurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/StartSurveyAfter.java
index e1206822..dba890d7 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/StartSurveyAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/StartSurveyAfter.java
@@ -283,6 +283,35 @@ public class StartSurveyAfter implements TaskListener {
         pzBph.setIsMany("2");
         bphList.add(pzBph);
 
+        // 审定
+        if (StringUtils.isNotEmpty(json.getString("directorUser"))) {
+            // 审定节点父节点信息
+            BusProcessHistory sdPBph = new BusProcessHistory();
+            String sdPBphId = UUID.randomUUID().toString();
+            sdPBph.setId(sdPBphId);
+            sdPBph.setActiProcInstId(delegateTask.getProcessInstanceId());
+            sdPBph.setTaskKey(StandardCommentNewProcessNodeKeyEnum.STAND_ASK_FOR_OPINION10.getValue());
+            sdPBph.setFlowType(FlowTypeEnum.BZZQYJLC.getValue());
+            sdPBph.setOrderNum(StandardCommentNewProcessNodeKeyEnum.STAND_ASK_FOR_OPINION10.getOrderNum());
+            sdPBph.setIsSub("2");
+            sdPBph.setIsMany("1");
+            bphList.add(sdPBph);
+
+            List<String> directorUserList = Arrays.asList(json.getString("directorUser").split(","));
+            for (String sdUserId : directorUserList) {
+                BusProcessHistory sdBph = new BusProcessHistory();
+                sdBph.setActiProcInstId(delegateTask.getProcessInstanceId());
+                sdBph.setUserId(sdUserId);
+                sdBph.setTaskKey(StandardCommentNewProcessNodeKeyEnum.STAND_ASK_FOR_OPINION10.getValue());
+                sdBph.setFlowType(FlowTypeEnum.BZZQYJLC.getValue());
+                sdBph.setOrderNum(StandardCommentNewProcessNodeKeyEnum.STAND_ASK_FOR_OPINION10.getOrderNum());
+                sdBph.setIsSub("2");
+                sdBph.setIsMany("1");
+                sdBph.setManyPId(sdPBphId);
+                bphList.add(sdBph);
+            }
+        }
+
         bphService.insertBatch(bphList);
     }
 }
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4After.java
index c144f24e..0a0ba904 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4After.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4After.java
@@ -155,6 +155,7 @@ public class Step4After implements TaskListener {
                 glyBph.setOrderNum(orderNum + 1);
                 glyBph.setIsSub("2");
                 glyBph.setIsMany("2");
+                glyBph.setParentUserId(delegateTask.getAssignee());
                 bphList.add(glyBph);
                 bphService.updateOrderNum(delegateTask.getProcessInstanceId(),orderNum + 1,bphList.size());
             }
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step8After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step8After.java
index a7580c3b..ee4e6f96 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step8After.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step8After.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 //新征求意见流程!!!!!
 public class Step8After implements TaskListener {
@@ -148,6 +149,19 @@ public class Step8After implements TaskListener {
             if (StringUtils.equals(bdFlag,"0")) {
                 // 审定
                 if (CollectionUtils.isNotEmpty(sdUserIdList)) {
+                    // 删除之前审定节点的信息。
+                    QueryWrapper<BusProcessHistory> bphQueryWrap = new QueryWrapper<>();
+                    bphQueryWrap.lambda().eq(BusProcessHistory::getActiProcInstId,delegateTask.getProcessInstanceId());
+                    bphQueryWrap.lambda().eq(BusProcessHistory::getTaskKey,StandardCommentNewProcessNodeKeyEnum.STAND_ASK_FOR_OPINION10.getValue());
+                    bphQueryWrap.lambda().isNull(BusProcessHistory::getTaskId);
+                    List<BusProcessHistory> oldSdBphList = bphService.list(bphQueryWrap);
+                    if (CollectionUtils.isNotEmpty(oldSdBphList)) {
+                        if (oldSdBphList.size() > 1) {
+                            List<String> oldSdBphIdList = oldSdBphList.stream().map(BusProcessHistory::getId).distinct().collect(Collectors.toList());
+                            bphService.removeByIds(oldSdBphIdList);
+                        }
+                    }
+
                     // 审定节点父节点信息
                     BusProcessHistory sdPBph = new BusProcessHistory();
                     String sdPBphId = UUID.randomUUID().toString();