Merge branch 'develop' into FOTON

doc/sql/20221114_流程名称字段加长.sql

@@ -0,0 +1,14 @@
+ALTER TABLE `foton-bat-wkflow`.`bus_process_name`
+    MODIFY COLUMN `PRC_NAME` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '流程名称' AFTER `ID`;
+
+ALTER TABLE `foton-bat-wkflow`.`bus_process_new`
+    MODIFY COLUMN `PRC_NAME` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程名称' AFTER `SUB_ID`;
+
+ALTER TABLE `foton-bat-wkflow`.`bus_process_entrust`
+    MODIFY COLUMN `PRC_NAME` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL AFTER `TASK_NAME`;
+
+ALTER TABLE `foton-bat-wkflow`.`bus_process_model_his`
+    MODIFY COLUMN `PRC_NAME` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程名称' AFTER `P_ID`;
+
+ALTER TABLE `foton-bat-wkflow`.`bus_process_evaluation_his`
+    MODIFY COLUMN `PRC_NAME` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '流程名称' AFTER `P_ID`;

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java

@@ -17,6 +17,9 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * 标准调研流程
+ */
 public class DirectorSignAfter implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java

@@ -18,6 +18,9 @@ import java.rmi.activation.ActivationException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+/**
+ * 标准调研流程-任务分发
+ */
 public class SelectResponsibleUserAfter implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserBefore.java

@@ -10,6 +10,9 @@ import org.activiti.engine.delegate.TaskListener;
 
 import java.util.List;
 
+/**
+ * 标准调研流程-任务分发
+ */
 public class SelectResponsibleUserBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java

@@ -14,6 +14,9 @@ import org.activiti.engine.delegate.TaskListener;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * 标准调研流程-起草
+ */
 public class StartSurveyAfter implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyBefore.java

@@ -9,6 +9,9 @@ import org.activiti.engine.delegate.TaskListener;
 
 import java.util.List;
 
+/**
+ * 标准调研流程-起草
+ */
 public class StartSurveyBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java

@@ -19,6 +19,9 @@ import org.activiti.engine.impl.task.TaskDefinition;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+/**
+ * 标准调研流程-调研结果反馈
+ */
 @Slf4j
 public class UploadResearchResultAfter  implements TaskListener {
     @Override

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultBefore.java

@@ -12,6 +12,9 @@ import org.activiti.engine.delegate.TaskListener;
 
 import java.util.List;
 
+/**
+ * 标准调研流程-调研结果反馈
+ */
 public class UploadResearchResultBefore  implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -30,12 +33,12 @@ public class UploadResearchResultBefore  implements TaskListener {
             busBean.saveOrUpdate(one1);
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            JSONObject object =  JSONObject.parseObject(one1.getMesg());
+//            JSONObject object =  JSONObject.parseObject(one1.getMesg());
             one1.setLink("bzdyStep3?prcType=2");
             one1.setTaskInfo(delegateTask.getName());
             // 干活节点流程
-            one1.setTaskStatus(2);
-            one1.setEndTime(Utils.interceptTime(object.getString("date")));
+//            one1.setTaskStatus(2);
+//            one1.setEndTime(Utils.interceptTime(object.getString("date")));
             oaService.sendTodoMq(one1);
         }
     }

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java

@@ -18,6 +18,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+/**
+ * 企标制修订计划管控-审核
+ */
 public class ProcessStep1After implements TaskListener {
 
     //分发多个责任人

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1Before.java

@@ -10,6 +10,9 @@ import org.activiti.engine.delegate.TaskListener;
 
 import java.util.List;
 
+/**
+ * 企标制修订计划管控-审核
+ */
 public class ProcessStep1Before implements TaskListener {
 
     @Override

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java

@@ -18,6 +18,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+/**
+ * 企标制修订计划管控-会签
+ */
 public class ProcessStep2After implements TaskListener {
 
     //分发多个责任人

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2Before.java

@@ -10,6 +10,9 @@ import org.activiti.engine.delegate.TaskListener;
 
 import java.util.List;
 
+/**
+ * 企标制修订计划管控-会签
+ */
 public class ProcessStep2Before implements TaskListener {
 
     @Override

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java

@@ -17,6 +17,9 @@ import org.activiti.engine.delegate.TaskListener;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * 企标制修订计划管控-审定
+ */
 public class ProcessStep3After implements TaskListener {
 
     //分发多个责任人

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3Before.java

@@ -10,6 +10,9 @@ import org.activiti.engine.delegate.TaskListener;
 
 import java.util.List;
 
+/**
+ * 企标制修订计划管控-审定
+ */
 public class ProcessStep3Before implements TaskListener {
 
     @Override

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java

@@ -21,6 +21,9 @@ import org.apache.commons.lang.StringUtils;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+/**
+ * 企标制修订计划管控-批准
+ */
 public class ProcessStep4After implements TaskListener {
 
     //分发多个责任人

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4Before.java

@@ -10,6 +10,9 @@ import org.activiti.engine.delegate.TaskListener;
 
 import java.util.List;
 
+/**
+ * 企标制修订计划管控-批准
+ */
 public class ProcessStep4Before implements TaskListener {
 
     @Override

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java

@@ -17,6 +17,9 @@ import org.activiti.engine.delegate.TaskListener;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * 企标制修订计划管控-重新起草
+ */
 public class ProcessStep5After implements TaskListener {
 
     //分发多个责任人

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5Before.java

@@ -10,6 +10,9 @@ import org.activiti.engine.delegate.TaskListener;
 
 import java.util.List;
 
+/**
+ * 企标制修订计划管控-重新起草
+ */
 public class ProcessStep5Before implements TaskListener {
 
     @Override

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartAfter.java

@@ -17,6 +17,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * 企标制修订计划管控-起草
+ */
 public class ProcessstartAfter implements TaskListener {
 
 

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartBefore.java

@@ -3,6 +3,9 @@ package com.ydw.bat.wkflow.listener.enterpriseStandardSystemRevisionPlan;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 
+/**
+ * 企标制修订计划管控-起草
+ */
 public class ProcessstartBefore implements TaskListener {
 
     @Override

src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2After.java

@@ -1,7 +1,5 @@
 package com.ydw.bat.wkflow.listener.qbzxdlxjh;
 
-
-
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
@@ -17,6 +15,9 @@ import org.activiti.engine.delegate.TaskListener;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+/**
+ * 企标制修订立项计划-立项确认
+ */
 public class Step2After implements TaskListener {
 
     @Override

src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2Before.java

@@ -10,6 +10,9 @@ import org.activiti.engine.delegate.TaskListener;
 
 import java.util.List;
 
+/**
+ * 企标制修订立项计划-立项确认
+ */
 public class Step2Before implements TaskListener {
 
     @Override

src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/startAfter.java

@@ -15,6 +15,9 @@ import org.activiti.engine.delegate.TaskListener;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * 企标制修订立项计划-起草
+ */
 //启动
 public class startAfter implements TaskListener {
     @Override

src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/startBefore.java

@@ -3,6 +3,9 @@ package com.ydw.bat.wkflow.listener.qbzxdlxjh;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 
+/**
+ * 企标制修订立项计划-起草
+ */
 public class startBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {