From 5ddd70262cd267367bc947c8315cb4c4f98013ac Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 15 Sep 2021 17:46:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ydw/bat/wkflow/business_main/datas/dto/Step3DTO.java | 1 + .../listener/StandardCommentProcess/DirectorSignAfter.java | 2 +- .../listener/StandardCommentProcess/DockingApprovalAfter.java | 2 +- .../StandardCommentProcess/MinisterAndDockerSignAfter.java | 2 +- .../listener/StandardCommentProcess/PresidentSignAfter.java | 2 +- .../listener/StandardCommentProcess/ResponUserSignAfter.java | 2 +- .../StandardCommentProcess/SelectResponsibleUserAfter.java | 2 +- .../listener/StandardCommentProcess/StartSurveyAfter.java | 1 + .../listener/StandardCommentProcess/SummarySurveyAfter.java | 2 +- .../StandardCommentProcess/UploadResearchResultAfter.java | 2 +- 10 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/Step3DTO.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/Step3DTO.java index a6349cb7..08f03c41 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/Step3DTO.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/Step3DTO.java @@ -12,6 +12,7 @@ import lombok.Data; @Data public class Step3DTO { + private String id; private String uname; private String itemNum; private String itemsName; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DirectorSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DirectorSignAfter.java index eaeee777..e62334ba 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DirectorSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DirectorSignAfter.java @@ -44,7 +44,7 @@ public class DirectorSignAfter 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("cid"); + String standName = delegateTask.getVariable("cid",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/StandardCommentProcess/DockingApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalAfter.java index 905843fc..080b05e4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalAfter.java @@ -42,7 +42,7 @@ public class DockingApprovalAfter 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("cid"); + String standName = delegateTask.getVariable("cid",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/StandardCommentProcess/MinisterAndDockerSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java index f1bfacbd..153a7dd2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java @@ -33,7 +33,7 @@ public class MinisterAndDockerSignAfter implements TaskListener { List nextUserList = new ArrayList(); - String standName = object.getString("cid"); + String standName = delegateTask.getVariable("cid",String.class); String prcName = standName+"标准-标准征求意见流程"; if(delegateTask.getVariable("actionFlag",Integer.class)==0){ diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignAfter.java index 15087ed8..8407f22f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignAfter.java @@ -43,7 +43,7 @@ public class PresidentSignAfter 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("cid"); + String standName = delegateTask.getVariable("cid",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/StandardCommentProcess/ResponUserSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java index 4b76003f..08e49446 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java @@ -50,7 +50,7 @@ public class ResponUserSignAfter 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("cid"); + String standName = delegateTask.getVariable("cid",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/StandardCommentProcess/SelectResponsibleUserAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java index 6314ef74..0cfe3893 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java @@ -85,7 +85,7 @@ 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("cid"); + String standName = delegateTask.getVariable("cid",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/StandardCommentProcess/StartSurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java index a49021f0..05dac21d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java @@ -70,6 +70,7 @@ public class StartSurveyAfter implements TaskListener { String user = object.getString("startUser"); String username = object.getString("startUserName"); String standName = object.getString("cid"); + delegateTask.setVariable("cid",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/StandardCommentProcess/SummarySurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyAfter.java index 8d158e22..759ce5ac 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyAfter.java @@ -48,7 +48,7 @@ public class SummarySurveyAfter 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("cid"); + String standName = delegateTask.getVariable("cid",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/StandardCommentProcess/UploadResearchResultAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java index 20e3cca2..219a0bc0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/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 = object.getString("startUser"); String username = object.getString("startUserName"); - String standName = object.getString("cid"); + String standName = delegateTask.getVariable("cid",String.class); String prcName = standName+"标准-标准征求意见流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());