From 0493b9f694d46970950c644bd4c45b3c89374bbc Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 27 Dec 2023 12:02:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E4=B8=BB=E8=B5=B7=E8=8D=89=E4=BA=BA=E5=88=86=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OtherDrafterUploadCreateListener.java     |  4 +--
 .../service/impl/EsRevisionServiceImpl.java   | 33 ++++++++++++-------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/OtherDrafterUploadCreateListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/OtherDrafterUploadCreateListener.java
index e8386120..3bd99b35 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/OtherDrafterUploadCreateListener.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/OtherDrafterUploadCreateListener.java
@@ -21,14 +21,12 @@ public class OtherDrafterUploadCreateListener implements ExecutionListener {
     @Override
     public void notify(DelegateExecution delegateExecution) {
         log.info("企标制修订流程 其他起草人上传节点 创建监听执行器开始执行");
-        // 获取流程实例ID
-        String processInstanceId = delegateExecution.getProcessInstanceId();
         // 获取执行人
         String otherDraftUser = (String) delegateExecution.getVariable("otherDraftUser");
         // 获取对应的结束时间
         String deadline = (String) delegateExecution.getVariable(otherDraftUser + "-deadline");
         // 设置流程变量
-        delegateExecution.setVariableLocal("deadline", deadline);
+        delegateExecution.setVariable("deadline", deadline);
         log.info("企标制修订流程 其他起草人上传节点 创建监听执行器开始执行");
     }
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
index 8dfcc642..160a29a8 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
@@ -132,6 +132,13 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
             actVariables.put("distribute", true);
             actVariables.put("otherDraftUserList", otherDraftUserVOS.stream().map(OtherDraftUserVO::getUser)
                     .collect(Collectors.toList()));
+            // 遍历其他起草人列表，将截止时间放置到流程变量中
+            Map<String, Object> deadlineMap = new HashMap<>();
+            otherDraftUserVOS.forEach(otherDraftUserVO -> deadlineMap
+                    .put(otherDraftUserVO.getUser() + "-deadline", otherDraftUserVO.getISODeadlineTime()));
+            actVariables.putAll(deadlineMap);
+            data.setOtherDraftUserVOS(otherDraftUserVOS);
+            data.setOtherDrafterUploadFileJson(otherDraftUserVOS);
         }
         // 获取分发人
         return actVariables;
@@ -413,18 +420,20 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 break;
             case CONTACT_USER_LEADER_APPROVAL:
                 // 保存流程数据
-                data = revisionData.getData();
-                saveOrUpdate(data);
-                // 保存征求意见记录 先删后增
-                adviceService.remove(new LambdaQueryWrapper<EsRevisionAdvice>()
-                        .eq(EsRevisionAdvice::getProcessInstanceId, processInstanceId)
-                        .eq(EsRevisionAdvice::getExecutionId, executionId));
-                advices = data.getAdvices();
-                adviceWrapper.eq(EsRevisionAdvice::getExecutionId, executionId);
-                adviceService.remove(adviceWrapper);
-                advices.forEach(advice -> advice.setProcessInstanceId(processInstanceId));
-                advices.forEach(advice -> advice.setExecutionId(executionId));
-                adviceService.saveBatch(advices);
+                if (pass) {
+                    data = revisionData.getData();
+                    saveOrUpdate(data);
+                    // 保存征求意见记录 先删后增
+                    adviceService.remove(new LambdaQueryWrapper<EsRevisionAdvice>()
+                            .eq(EsRevisionAdvice::getProcessInstanceId, processInstanceId)
+                            .eq(EsRevisionAdvice::getExecutionId, executionId));
+                    advices = data.getAdvices();
+                    adviceWrapper.eq(EsRevisionAdvice::getExecutionId, executionId);
+                    adviceService.remove(adviceWrapper);
+                    advices.forEach(advice -> advice.setProcessInstanceId(processInstanceId));
+                    advices.forEach(advice -> advice.setExecutionId(executionId));
+                    adviceService.saveBatch(advices);
+                }
                 break;
             case MAIN_DRAFT_USER_COLLECT_SECOND:
                 // 保存流程数据