From a84784cb70a27111f34c3d422559f0b4e8614beb Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 18 Nov 2021 16:37:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=89=E4=B8=AA=E6=96=B0=E6=B5=81?= =?UTF-8?q?=E7=A8=8BOa=E5=9C=B0=E5=9D=80=E7=BB=9F=E4=B8=80=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ydw/bat/wkflow/listener/aboliish/ProcessStep1Before.java | 2 +- .../ydw/bat/wkflow/listener/aboliish/ProcessStep2Before.java | 2 +- .../ydw/bat/wkflow/listener/aboliish/ProcessStep3Before.java | 2 +- .../ydw/bat/wkflow/listener/aboliish/ProcessStep4Before.java | 2 +- .../ydw/bat/wkflow/listener/aboliish/ProcessStep5Before.java | 2 +- .../ydw/bat/wkflow/listener/aboliish/ProcessStep6Before.java | 2 +- .../listener/enterpriseBidReviewProcess/ProcessStep1Before.java | 2 +- .../listener/enterpriseBidReviewProcess/ProcessStep2Before.java | 2 +- .../listener/enterpriseBidReviewProcess/ProcessStep3Before.java | 2 +- .../ProcessStep1Before.java | 2 +- .../enterpriseStandardSystemRevisionPlan/ProcessStep2After.java | 2 ++ .../ProcessStep2Before.java | 2 +- .../enterpriseStandardSystemRevisionPlan/ProcessStep3After.java | 2 ++ .../ProcessStep3Before.java | 2 +- .../enterpriseStandardSystemRevisionPlan/ProcessStep4After.java | 2 ++ .../ProcessStep4Before.java | 2 +- .../ProcessStep5Before.java | 2 +- 17 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1Before.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1Before.java index e763a98a..37855ba8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1Before.java @@ -27,7 +27,7 @@ public class ProcessStep1Before implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpg2Step11?prcType=6"); + one1.setLink("qbfzStep2?prcType=24"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2Before.java index 1d900501..a404b405 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2Before.java @@ -27,7 +27,7 @@ public class ProcessStep2Before implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpg2Step11?prcType=6"); + one1.setLink("qbfzStep3?prcType=24"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3Before.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3Before.java index e9f7d55b..395809c4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3Before.java @@ -27,7 +27,7 @@ public class ProcessStep3Before implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpg2Step11?prcType=6"); + one1.setLink("qbfzStep4?prcType=24"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4Before.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4Before.java index d6404920..c5be2640 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4Before.java @@ -27,7 +27,7 @@ public class ProcessStep4Before implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpg2Step11?prcType=6"); + one1.setLink("qbfzStep5?prcType=24"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5Before.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5Before.java index 0b3a7f4c..e13510f9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5Before.java @@ -27,7 +27,7 @@ public class ProcessStep5Before implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpg2Step11?prcType=6"); + one1.setLink("qbfzStep6?prcType=24"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6Before.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6Before.java index e9f25817..6d9ed849 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6Before.java @@ -27,7 +27,7 @@ public class ProcessStep6Before implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpg2Step11?prcType=6"); + one1.setLink("qbfzStep7?prcType=24"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep1Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep1Before.java index bc4d023a..dd8e6b60 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep1Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep1Before.java @@ -27,7 +27,7 @@ public class ProcessStep1Before implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpg2Step11?prcType=6"); + one1.setLink("qbfsStep2?prcType=23"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep2Before.java index bc3d3c7c..7c5e2d3e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep2Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep2Before.java @@ -27,7 +27,7 @@ public class ProcessStep2Before implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpg2Step11?prcType=6"); + one1.setLink("qbfsStep3?prcType=23"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep3Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep3Before.java index 20540fed..078ab78e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep3Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep3Before.java @@ -27,7 +27,7 @@ public class ProcessStep3Before implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpg2Step11?prcType=6"); + one1.setLink("qbfsStep4?prcType=23"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } 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 7839c4c8..f36b28d0 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 @@ -27,7 +27,7 @@ public class ProcessStep1Before implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpg2Step11?prcType=6"); + one1.setLink("qbzxdjhgkStep2?prcType=25"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } 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 28f0d90e..94c4267e 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 @@ -55,6 +55,8 @@ public class ProcessStep2After implements TaskListener { nextUserList.add(delegateTask.getVariable("prcCreateUser", String.class)); delegateTask.setVariable("createUser", delegateTask.getVariable("prcCreateUser", String.class)); prcName = "企标制修订计划整改"; + delegateTask.setVariable("deptCenterFlag", null); + delegateTask.setVariable("count",null); } } //截止时间 流程描述 创建人 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 267433dc..60ff5ea2 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 @@ -27,7 +27,7 @@ public class ProcessStep2Before implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpg2Step11?prcType=6"); + one1.setLink("qbzxdjhgkStep3?prcType=25"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } 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 ea0a1186..db1c2325 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 @@ -47,6 +47,8 @@ public class ProcessStep3After implements TaskListener { delegateTask.setVariable("bzFlag",1); nextUserList.add(delegateTask.getVariable("prcCreateUser",String.class)); delegateTask.setVariable("createUser",delegateTask.getVariable("prcCreateUser",String.class)); + delegateTask.setVariable("deptCenterFlag", null); + delegateTask.setVariable("count",null); } //截止时间 流程描述 创建人 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 b6555197..ec5839e3 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 @@ -27,7 +27,7 @@ public class ProcessStep3Before implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpg2Step11?prcType=6"); + one1.setLink("qbzxdjhgkStep4?prcType=25"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } 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 c991d2e9..827c8279 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 @@ -45,6 +45,8 @@ public class ProcessStep4After implements TaskListener { delegateTask.setVariable("bzfgbzFlag",1); nextUserList.add(delegateTask.getVariable("prcCreateUser",String.class)); delegateTask.setVariable("createUser",delegateTask.getVariable("prcCreateUser",String.class)); + delegateTask.setVariable("deptCenterFlag", null); + delegateTask.setVariable("count",null); } //截止时间 流程描述 创建人 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 e44bf789..f1721435 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 @@ -27,7 +27,7 @@ public class ProcessStep4Before implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpg2Step11?prcType=6"); + one1.setLink("qbzxdjhgkStep5?prcType=25"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } 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 5850cf66..8d7c8343 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 @@ -27,7 +27,7 @@ public class ProcessStep5Before implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpg2Step11?prcType=6"); + one1.setLink("qbzxdjhgkStep1?prcType=25"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } From 31095decb6a5de4127a309b564be86fb3b8b4ce2 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 19 Nov 2021 10:50:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E7=A0=94=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=B8=BAnull=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/StandardSurvey/DirectorSignAfter.java | 3 +-- .../StandardSurvey/DockingApprovalAfter.java | 2 +- .../StandardSurvey/MinisterAndDockerSignAfter.java | 2 +- .../listener/StandardSurvey/PresidentSignAfter.java | 2 +- .../listener/StandardSurvey/ResponUserSignAfter.java | 2 +- .../StandardSurvey/SelectResponsibleUserAfter.java | 6 +++--- .../listener/StandardSurvey/StartSurveyAfter.java | 1 + .../listener/StandardSurvey/SummarySurveyAfter.java | 2 +- .../StandardSurvey/UploadResearchResultAfter.java | 2 +- .../PEPffresPersonAfter.java | 2 -- .../projectEvaluationProcess/PEPstartAfter.java | 12 ------------ .../projectEvaluationProcess/PEPtaskLssueAfter.java | 2 -- 12 files changed, 11 insertions(+), 27 deletions(-) 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 daa7a937..497cd854 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 @@ -42,10 +42,9 @@ public class DirectorSignAfter implements TaskListener { //截止时间 流程描述 创建人 - String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("startId",String.class); String username = delegateTask.getVariable("startName",String.class); - String standName = object.getString("title"); + String standName = delegateTask.getVariable("title",String.class); String prcName = standName+"-标准调研流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java index fed5f8a9..32ff460e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java @@ -43,7 +43,7 @@ public class DockingApprovalAfter implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("startId",String.class); String username = delegateTask.getVariable("startName",String.class); - String standName = object.getString("title"); + String standName = delegateTask.getVariable("title",String.class); String prcName = standName+"-标准调研流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java index b2c429d8..46e723a9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java @@ -47,7 +47,7 @@ public class MinisterAndDockerSignAfter implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("startId",String.class); String username = delegateTask.getVariable("startName",String.class); - String standName = object.getString("title"); + String standName = delegateTask.getVariable("title",String.class); String prcName = standName+"-标准调研流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java index 70b23a72..520bdf00 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java @@ -44,7 +44,7 @@ public class PresidentSignAfter implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("startId",String.class); String username = delegateTask.getVariable("startName",String.class); - String standName = object.getString("title"); + String standName = delegateTask.getVariable("title",String.class); String prcName = standName+"-标准调研流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java index b146c367..8f41809c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java @@ -54,7 +54,7 @@ public class ResponUserSignAfter implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("startId",String.class); String username = delegateTask.getVariable("startName",String.class); - String standName = object.getString("title"); + String standName = delegateTask.getVariable("title",String.class); String prcName = standName+"-标准调研流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); 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 166eebab..69114918 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 @@ -68,9 +68,9 @@ public class SelectResponsibleUserAfter implements TaskListener { //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("startUser"); - String username = object.getString("startUserName"); - String standName = object.getString("title"); + String user = delegateTask.getVariable("startId",String.class); + String username = delegateTask.getVariable("startName",String.class); + String standName = delegateTask.getVariable("title",String.class); String prcName = standName+"-标准调研流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); 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 848bcfe2..ad9c94e1 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 @@ -69,6 +69,7 @@ public class StartSurveyAfter implements TaskListener { delegateTask.setVariable("startId",user); delegateTask.setVariable("startName",username); String standName = object.getString("title"); + delegateTask.setVariable("title",standName); String prcName = standName+"-标准调研流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java index d7b2e6f9..ead81dfd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java @@ -50,7 +50,7 @@ public class SummarySurveyAfter implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("startId",String.class); String username = delegateTask.getVariable("startName",String.class); - String standName = object.getString("title"); + String standName = delegateTask.getVariable("title",String.class); String prcName = standName+"-标准调研流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); 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 d7222aa2..cd4de4d5 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 @@ -67,7 +67,7 @@ public class UploadResearchResultAfter implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("startId",String.class); String username = delegateTask.getVariable("startName",String.class); - String standName = object.getString("title"); + String standName = delegateTask.getVariable("title",String.class); String prcName = standName+"-标准调研流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java index 55f10b37..5d26b627 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java @@ -83,7 +83,6 @@ public class PEPffresPersonAfter implements TaskListener { } } //截止时间 流程描述 创建人 - 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); @@ -91,7 +90,6 @@ public class PEPffresPersonAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { -// one1.setOverTime(OVERTIME); one1.setPrcType("5"); one1.setPrcName(prcName); one1.setCreatUser(user); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPstartAfter.java index 5bb2ab87..3c67a913 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPstartAfter.java @@ -53,7 +53,6 @@ public class PEPstartAfter implements TaskListener { delegateTask.setVariable("certifiedEngineerName",object.getString("certifiedEngineerName")); delegateTask.setVariable("qualityEngineerName",object.getString("qualityEngineerName")); //截止时间 流程描述 创建人 - String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); @@ -64,7 +63,6 @@ public class PEPstartAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { -// one1.setOverTime(OVERTIME); one1.setPrcType("5"); one1.setPrcName(prcName); one1.setCreatUser(user); @@ -72,16 +70,6 @@ public class PEPstartAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } - // 存储当前节点意见 -// BusProcessNew busProcessNew = new BusProcessNew(); -// busProcessNew.setMsgType("clause"); -// busProcessNew.setPId(delegateTask.getProcessInstanceId()); -// busProcessNew.setMesg(object.toJSONString()); -// busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); -// busProcessNew.setTaskId(delegateTask.getId()); -// busProcessNew.setFinishFlag("0"); -// busProcessNew.setTaskInfo(delegateTask.getName()); -// busBean.saveOrUpdate(busProcessNew); if (nextUserList != null && !nextUserList.isEmpty()) { for (String nextUser : nextUserList) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskLssueAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskLssueAfter.java index d2e10da8..24c4aa3d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskLssueAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskLssueAfter.java @@ -75,7 +75,6 @@ public class PEPtaskLssueAfter implements TaskListener { delegateTask.getVariable("workPeoples", List.class).addAll(workPeoples); } //截止时间 流程描述 创建人 - 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("stands",String.class)+"-标准项目合规评估-合规性评估"; @@ -83,7 +82,6 @@ public class PEPtaskLssueAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { -// one1.setOverTime(OVERTIME); one1.setPrcType("5"); one1.setPrcName(prcName); one1.setCreatUser(user);