From 2f66177b85f9220463cf61f2090e3aec00cdb518 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Tue, 28 Dec 2021 13:34:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=B4=E5=BA=A6=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=8C=E6=AD=A5=E9=A9=B3=E5=9B=9E=20=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=97=B6=E9=97=B4=20=E6=9C=AA=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BAbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PCAbzManagerApproveAfter.java             | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzManagerApproveAfter.java
index 176f48d1..fd80bd7a 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzManagerApproveAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzManagerApproveAfter.java
@@ -37,28 +37,35 @@ public class PCAbzManagerApproveAfter implements TaskListener {
         JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson", object);
         //后续节点所需要的数据
-        List<String> nextUserList=new ArrayList<>();
+        List<String> nextUserList = new ArrayList<>();
 
-        if ("1".equals(object.getString("BZFlag"))){
-            delegateTask.setVariable("BZFlag","1");
-            delegateTask.setVariable("GCUserId",String.valueOf(delegateTask.getVariable("gcjl")));
+        if ("1".equals(object.getString("BZFlag"))) {
+            delegateTask.setVariable("BZFlag", "1");
+            delegateTask.setVariable("GCUserId", String.valueOf(delegateTask.getVariable("gcjl")));
             nextUserList.add(String.valueOf(delegateTask.getVariable("gcjl")));
-        }else {
+        } else {
             //流程直接结束，抄送消息提示
-            delegateTask.setVariable("BZFlag","2");
+            delegateTask.setVariable("BZFlag", "2");
         }
 
 
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
-        String user = delegateTask.getVariable("prcCreateUser",String.class);
-        String username = delegateTask.getVariable("prcCreateUserName",String.class);
-        String prcName = delegateTask.getVariable("stId",String.class)+"-合规评估流程-工程经理转办";
+        String user = delegateTask.getVariable("prcCreateUser", String.class);
+        String username = delegateTask.getVariable("prcCreateUserName", String.class);
+        String prcName="";
+        if ("1".equals(object.getString("BZFlag"))) {
+             prcName= delegateTask.getVariable("stId", String.class) + "-合规评估流程-工程经理转办";
+        }else {
+            prcName= delegateTask.getVariable("stId", String.class) + "-合规评估流程-流程结束";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if (one1 != null) {
-//            one1.setOverTime(OVERTIME);
+            if (!"1".equals(object.getString("BZFlag"))) {
+                one1.setOverTime(OVERTIME);
+            }
             one1.setPrcType("6");
             one1.setPrcName(prcName);
             one1.setCreatUser(user);
@@ -67,20 +74,20 @@ public class PCAbzManagerApproveAfter implements TaskListener {
         }
 
         // 存储当前节点意见1
-        if (null!=object.getString("commentText")) {
+        if (null != object.getString("commentText")) {
             QueryWrapper queryWrapper3 = new QueryWrapper();
             queryWrapper3.eq("TASK_ID", delegateTask.getId());
-            queryWrapper3.eq("USER_ID",delegateTask.getAssignee());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
             List<BusProcessNew> list = busBean.list(queryWrapper3);
-            if(!list.isEmpty()){
+            if (!list.isEmpty()) {
                 BusProcessNew busProcessNews = list.get(0);
                 busProcessNews.setTaskId(delegateTask.getId());
                 busProcessNews.setCommitText(object.getString("commentText"));
                 busBean.saveOrUpdate(busProcessNews);
             }
         }
-        if(nextUserList != null && !nextUserList.isEmpty()){
-            for(String userId : nextUserList){
+        if (nextUserList != null && !nextUserList.isEmpty()) {
+            for (String userId : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());