From 5e7b6b7ebe8ebc0d13fcddda06cca4511dbbf488 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Wed, 16 Feb 2022 13:37:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=90=8D=E7=A7=B0=E5=92=8C?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0=E6=B1=87?=
 =?UTF-8?q?=E6=80=BBbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StartSurveyAfter.java                       |  3 +--
 .../ProcessstartAfter.java                      | 17 ++++++++++++++++-
 .../projectEvaluationNewProcess/Step7After.java |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/StartSurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/StartSurveyAfter.java
index 0edcb0ff..a5616948 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/StartSurveyAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/StartSurveyAfter.java
@@ -50,12 +50,11 @@ public class StartSurveyAfter implements TaskListener {
         String standName= object1.getString("standId");
 
         delegateTask.setVariable("number",standName);
-        String prcName = standName+"-未符合项整改";
+        String prcName = standName+"-"+object1.getString("standName")+"-未符合项整改";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-//            one1.setOverTime(OVERTIME);
             one1.setPrcType("8");
             one1.setPrcName(prcName);
             one1.setCreatUser(user);
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartAfter.java
index 5cfefa12..1901e95a 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartAfter.java
@@ -13,7 +13,9 @@ import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class ProcessstartAfter implements TaskListener {
 
@@ -48,7 +50,20 @@ public class ProcessstartAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
         delegateTask.setVariable("prcCreateUser", user);
         delegateTask.setVariable("prcCreateUserName", username);
-        String prcName = "企标制修订计划-部门高级经理审批";
+        //1合并 2延期 3取消 4更名 5立项
+        String prcName = "";
+        String type=object.getString("type");
+        if ("5".equals(type)){
+            prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项";
+        }else if ("2".equals(type)){
+            prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期";
+        }else if ("1".equals(type)){
+            prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并";
+        }else if ("3".equals(type)){
+            prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消";
+        }else {
+            prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7After.java
index 3438ec22..c5d1cc79 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7After.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7After.java
@@ -90,7 +90,7 @@ public class Step7After implements TaskListener {
                     BusProcessNew busProcessNewNext = new BusProcessNew();
                     busProcessNewNext.setMsgType("clause");
                     busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                    busProcessNewNext.setMesg(object.toJSONString());
+                    busProcessNewNext.setMesg(delegateTask.getVariable("Step7Res",JSONObject.class).toJSONString());
                     busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                     busProcessNewNext.setFinishFlag("0");
                     busProcessNewNext.setTaskInfo(delegateTask.getName());