From 427b5535b12532a5d09dee495be4016431e555b3 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 15 Nov 2022 21:23:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A0=87=E5=87=86=E8=B0=83?= =?UTF-8?q?=E7=A0=94=E6=B5=81=E7=A8=8B=EF=BC=8C=E8=B0=83=E7=A0=94=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E5=8F=8D=E9=A6=88=E6=B2=A1=E6=9C=89=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/sql/20221114_流程名称字段加长.sql | 14 ++++++++++++++ .../listener/StandardSurvey/DirectorSignAfter.java | 3 +++ .../StandardSurvey/SelectResponsibleUserAfter.java | 3 +++ .../SelectResponsibleUserBefore.java | 3 +++ .../listener/StandardSurvey/StartSurveyAfter.java | 3 +++ .../listener/StandardSurvey/StartSurveyBefore.java | 3 +++ .../StandardSurvey/UploadResearchResultAfter.java | 3 +++ .../StandardSurvey/UploadResearchResultBefore.java | 9 ++++++--- .../ProcessStep1After.java | 3 +++ .../ProcessStep1Before.java | 3 +++ .../ProcessStep2After.java | 3 +++ .../ProcessStep2Before.java | 3 +++ .../ProcessStep3After.java | 3 +++ .../ProcessStep3Before.java | 3 +++ .../ProcessStep4After.java | 3 +++ .../ProcessStep4Before.java | 3 +++ .../ProcessStep5After.java | 3 +++ .../ProcessStep5Before.java | 3 +++ .../ProcessstartAfter.java | 3 +++ .../ProcessstartBefore.java | 3 +++ .../bat/wkflow/listener/qbzxdlxjh/Step2After.java | 5 +++-- .../bat/wkflow/listener/qbzxdlxjh/Step2Before.java | 3 +++ .../bat/wkflow/listener/qbzxdlxjh/startAfter.java | 3 +++ .../bat/wkflow/listener/qbzxdlxjh/startBefore.java | 3 +++ 24 files changed, 86 insertions(+), 5 deletions(-) create mode 100644 doc/sql/20221114_流程名称字段加长.sql diff --git a/doc/sql/20221114_流程名称字段加长.sql b/doc/sql/20221114_流程名称字段加长.sql new file mode 100644 index 00000000..5e9e6af4 --- /dev/null +++ b/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`; \ No newline at end of file diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java index a6cc1ddb..b4acc2e4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java +++ b/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) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java index 47031041..5909b73a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java +++ b/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) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserBefore.java index cf835b04..705839fd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserBefore.java +++ b/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) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java index 6351cec1..0002ca7f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java +++ b/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) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyBefore.java index ee874ab0..1f0a6d71 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyBefore.java +++ b/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) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java index b772794f..6a40d4f0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java +++ b/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 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultBefore.java index ce7d7152..3fc3b1ed 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultBefore.java +++ b/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); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java index 9d6affca..bbef0f7c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java +++ b/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 { //分发多个责任人 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1Before.java index f36b28d0..660eab2d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1Before.java +++ b/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 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java index 331fdf5a..7a855778 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java +++ b/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 { //分发多个责任人 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2Before.java index 60ff5ea2..6b2aaf4e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2Before.java +++ b/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 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java index 8bceabf5..b50dd899 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java +++ b/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 { //分发多个责任人 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3Before.java index ec5839e3..357483bb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3Before.java +++ b/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 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java index 56c98205..1467ff2b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java +++ b/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 { //分发多个责任人 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4Before.java index f1721435..c48d93c9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4Before.java +++ b/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 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java index 3148feec..ac0547d6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java +++ b/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 { //分发多个责任人 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5Before.java index 8d7c8343..edcf9f91 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5Before.java +++ b/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 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 1901e95a..75b3b5dd 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 @@ -17,6 +17,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +/** + * 企标制修订计划管控-起草 + */ public class ProcessstartAfter implements TaskListener { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartBefore.java index f16c7ddc..e2841210 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartBefore.java +++ b/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 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2After.java b/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2After.java index f210aed3..024d2ad8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2After.java +++ b/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 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2Before.java index 21214b53..38cbc367 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2Before.java +++ b/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 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/startAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/startAfter.java index e9883a6b..0dcb74d1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/startAfter.java +++ b/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 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/startBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/startBefore.java index 23a3b8d0..576e98ea 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/startBefore.java +++ b/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) {