From d852cfef620029cf6a54c0af10a2a011a2300a31 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Wed, 15 Dec 2021 15:43:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB=E5=8A=A8-?=
 =?UTF-8?q?=E5=85=A5=E4=BC=9A=E5=8F=82=E4=BC=9A=E6=B5=81=E7=A8=8B-?=
 =?UTF-8?q?=E5=85=A8=E4=B8=8D=E6=B6=89=E5=8F=8A=E6=83=85=E5=86=B5=E4=B8=8B?=
 =?UTF-8?q?=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StandardMeetProcess/DirectorChooseAfter.java  | 12 ++++++++++++
 .../DirectorChooseAfter.java                      | 15 ++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java
index d82b3d03..d77a228b 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java
@@ -15,7 +15,9 @@ import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -65,9 +67,15 @@ public class DirectorChooseAfter implements TaskListener {
             }else {
                 delegateTask.setVariable("memberList",nextUserList);
             }
+            delegateTask.setVariable("passFlag","0");
             delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size());
         }
 
+        if (delegateTask.getVariable("memberList",List.class).size()==0){
+            delegateTask.setVariable("passFlag","1");
+            prcName = prcName + "流程结束";
+        }
+
 
         //         存储当前节点意见
         if (null != object.getString("commentText")) {
@@ -93,7 +101,11 @@ public class DirectorChooseAfter implements TaskListener {
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         if (one1 != null) {
+            if ("1".equals(delegateTask.getVariable("passFlag"))){
+                one1.setOverTime(OVERTIME);
+            }
             one1.setPrcType("21");
             one1.setPrcName(prcName);
             one1.setCreatUser(user);
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java
index b2c3df50..b0a5235b 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java
@@ -14,7 +14,9 @@ import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -45,7 +47,7 @@ public class DirectorChooseAfter implements TaskListener {
         }
 
         //全员不通过，检测条件 directorCount
-        Integer allCount = delegateTask.getVariable("directorList",List.class).size();;
+        Integer allCount = delegateTask.getVariable("directorList",List.class).size();
         Integer count = 0;
         if(null == delegateTask.getVariable("directorCount")){
             delegateTask.setVariable("directorCount", count);
@@ -63,9 +65,13 @@ public class DirectorChooseAfter implements TaskListener {
             }else {
                 delegateTask.setVariable("memberList",nextUserList);
             }
+            delegateTask.setVariable("passFlag","0");
             delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size());
         }
-
+        if (delegateTask.getVariable("memberList",List.class).size()==0){
+            delegateTask.setVariable("passFlag","1");
+            prcName = prcName + "流程结束";
+        }
 
         //         存储当前节点意见
         if (null != object.getString("commentText")) {
@@ -88,11 +94,14 @@ public class DirectorChooseAfter implements TaskListener {
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
 
-
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if (one1 != null) {
+            if ("1".equals(delegateTask.getVariable("passFlag"))){
+                one1.setOverTime(OVERTIME);
+            }
             one1.setPrcType("20");
             one1.setPrcName(prcName);
             one1.setCreatUser(user);