From 9bd59a96755b3e9838e1bd786f54cadf62b12818 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 28 Jun 2022 11:08:19 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wkflow/listener/StandardSurvey/StartSurveyAfter.java | 6 ------ .../standardRegulatoryProcess/CountersignSRPAfter.java | 2 +- .../standardRegulatoryProcess/SRPApplyApplicantAfter.java | 2 +- .../standardRegulatoryProcess/SRPManagerApproveAfter.java | 2 +- .../listener/standardRegulatoryProcess/SRPstartAfter.java | 3 +-- 5 files changed, 4 insertions(+), 11 deletions(-) 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 48f4ee76..6351cec1 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 @@ -9,15 +9,9 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.util.SpringContextUtil; -import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; -import org.apache.commons.lang.StringUtils; - -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; import java.util.List; public class StartSurveyAfter implements TaskListener { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/CountersignSRPAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/CountersignSRPAfter.java index 54b0b572..2063a781 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/CountersignSRPAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/CountersignSRPAfter.java @@ -52,7 +52,7 @@ public class CountersignSRPAfter implements TaskListener{ String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); // object.getString("standName") - String prcName = delegateTask.getVariable("listName",String.class)+"-标准法规清单-修订"; + String prcName = delegateTask.getVariable("prcName",String.class); 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/standardRegulatoryProcess/SRPApplyApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPApplyApplicantAfter.java index e38b711f..25a9f595 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPApplyApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPApplyApplicantAfter.java @@ -50,7 +50,7 @@ public class SRPApplyApplicantAfter implements TaskListener{ String username = object.getString("prcCreateUserName"); // object.getString("standName") - String prcName = delegateTask.getVariable("listName",String.class)+"-标准法规清单申请-经理人审批"; + String prcName = delegateTask.getVariable("prcName",String.class); 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/standardRegulatoryProcess/SRPManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java index 30bf5e03..7affa1eb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java @@ -55,7 +55,7 @@ public class SRPManagerApproveAfter implements TaskListener{ busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNew.setUserId(delegateTask.getVariable("createUser",String.class)); - busProcessNew.setPrcName(delegateTask.getVariable("listName",String.class)+"-标准法规清单-修订"); + busProcessNew.setPrcName(delegateTask.getVariable("prcName",String.class)); busBean.save(busProcessNew); func1(delegateTask, busBean, object,"1"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java index 0725d19c..5beda0fb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java @@ -22,8 +22,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; public class SRPstartAfter implements TaskListener { @@ -92,6 +90,7 @@ public class SRPstartAfter implements TaskListener { String standName = object.getString("listName"); delegateTask.setVariable("listName",standName); String prcName=object.getString("listName")+"-清单确认"; + delegateTask.setVariable("prcName",prcName); QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); From 0e4fba793699bee0f2e353212d89a7d6a0a1a19c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 28 Jun 2022 11:18:00 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java | 2 +- .../com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java index 7f1e0d9c..d2f2979a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java @@ -46,7 +46,7 @@ public class ChooseZrAfter implements TaskListener{ String user = object.getString("applyUserId"); String username = object.getString("applyUserIdName"); - String prcName = delegateTask.getVariable("titles",String.class)+"-标准解读流程"; + String prcName = delegateTask.getVariable("prcName",String.class); 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/standardRead/ResolveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java index 321ab87c..32c28626 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java @@ -70,6 +70,7 @@ public class ResolveAfter implements TaskListener{ // String prcName = title+"-标准解读流程-选择执行人"; String prcName = object.getString("itemsNum")+"-"+object.getString("itemsName")+"-"+"解读"; String prcName1 = object.getString("itemsNum")+"-"+object.getString("itemsName")+"-"+"解读"; + delegateTask.setVariable("prcName",prcName); QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); From bd7dfe8aeb3f96e4703d88d7ff7965a93c60b51e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 28 Jun 2022 11:27:47 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PCAComplianceAssessmentAfter.java | 2 +- .../PCAbafgManagerApproveAfter.java | 4 ++-- .../ProjectComplianceAssessment/PCAbzManagerApproveAfter.java | 4 ++-- .../ProjectComplianceAssessment/PCAdlApproveAfter.java | 4 ++-- .../ProjectComplianceAssessment/PCAffLiableApproveAfter.java | 4 ++-- .../PCAffLiableDistributeAfter.java | 2 +- .../ProjectComplianceAssessment/PCAgcManagerApproveAfter.java | 4 ++-- .../ProjectComplianceAssessment/PCAgcManagerDeliverAfter.java | 2 +- .../ProjectComplianceAssessment/PCAjgManagerApproveAfter.java | 4 ++-- .../PCAjgManagerDistributeAfter.java | 2 +- .../listener/ProjectComplianceAssessment/PCAstartAfter.java | 3 ++- .../listener/ProjectComplianceAssessment/PCAsumAfter.java | 2 +- 12 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java index e4639cd2..83f8c061 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java @@ -74,7 +74,7 @@ public class PCAComplianceAssessmentAfter 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); - String prcName = delegateTask.getVariable("stId",String.class)+"-项目合规评估流程-审批"; + String prcName = delegateTask.getVariable("prcName", String.class); 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/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java index 81b1dca2..99c184cf 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java @@ -64,9 +64,9 @@ public class PCAbafgManagerApproveAfter implements TaskListener { String username = delegateTask.getVariable("prcCreateUserName", String.class); String prcName=""; if ("1".equals(object.getString("bzFlag"))) { - prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-汇总审批"; + prcName = delegateTask.getVariable("prcName", String.class); }else { - prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-责任人填写评估反馈"; + prcName = delegateTask.getVariable("prcName", String.class); } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzManagerApproveAfter.java index 4a9ae0ae..0232ae69 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzManagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzManagerApproveAfter.java @@ -55,9 +55,9 @@ public class PCAbzManagerApproveAfter implements TaskListener { String username = delegateTask.getVariable("prcCreateUserName", String.class); String prcName=""; if ("1".equals(object.getString("BZFlag"))) { - prcName= delegateTask.getVariable("stId", String.class) + "-合规评估流程-工程经理转办"; + prcName= delegateTask.getVariable("prcName", String.class); }else { - prcName= delegateTask.getVariable("stId", String.class) + "-合规评估流程-流程结束"; + prcName= delegateTask.getVariable("prcName", String.class); } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java index 783c5614..3550ada6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java @@ -216,9 +216,9 @@ public class PCAdlApproveAfter implements TaskListener { String username = delegateTask.getVariable("prcCreateUserName",String.class); String prcName=""; if ("1".equals(object.get("dlFlag"))) { - prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-流程结束"; + prcName = delegateTask.getVariable("prcName", String.class); }else { - prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-标准法规工程师汇总审核"; + prcName = delegateTask.getVariable("prcName", String.class); } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableApproveAfter.java index 7394777c..5c47b23b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableApproveAfter.java @@ -54,9 +54,9 @@ public class PCAffLiableApproveAfter implements TaskListener { String username = delegateTask.getVariable("prcCreateUserName",String.class); String prcName=""; if ("1".equals(object.getString("ffFlag"))){ - prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-架构经理审批"; + prcName = delegateTask.getVariable("prcName", String.class); }else { - prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-责任人填写评估反馈"; + prcName = delegateTask.getVariable("prcName", String.class); } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java index e0b26618..e67dc3d1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java @@ -162,7 +162,7 @@ public class PCAffLiableDistributeAfter 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); - String prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-合规性评估"; + String prcName = delegateTask.getVariable("prcName", String.class); 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/ProjectComplianceAssessment/PCAgcManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerApproveAfter.java index c374f13c..dab93d55 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerApproveAfter.java @@ -55,9 +55,9 @@ public class PCAgcManagerApproveAfter implements TaskListener { String username = delegateTask.getVariable("prcCreateUserName",String.class); String prcName=""; if ("1".equals(object.getString("gcFlag"))) { - prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-标准法规部经理审批"; + prcName = delegateTask.getVariable("prcName", String.class); }else { - prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-责任人填写评估反馈"; + prcName = delegateTask.getVariable("prcName", String.class); } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerDeliverAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerDeliverAfter.java index b1f84e1f..a6de470a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerDeliverAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerDeliverAfter.java @@ -49,7 +49,7 @@ public class PCAgcManagerDeliverAfter 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); - String prcName = delegateTask.getVariable("stId",String.class)+"-合规评估流程-架构经理任务分发"; + String prcName = delegateTask.getVariable("prcName", String.class); 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/ProjectComplianceAssessment/PCAjgManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerApproveAfter.java index 156dfca6..f1719775 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerApproveAfter.java @@ -55,9 +55,9 @@ public class PCAjgManagerApproveAfter implements TaskListener { String username = delegateTask.getVariable("prcCreateUserName",String.class); String prcName=""; if ("1".equals(object.getString("jgFlag"))) { - prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-工程经理审批"; + prcName = delegateTask.getVariable("prcName", String.class); }else { - prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-责任人填写评估反馈"; + prcName = delegateTask.getVariable("prcName", String.class); } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerDistributeAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerDistributeAfter.java index 3dac4a0e..f65fc15e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerDistributeAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerDistributeAfter.java @@ -76,7 +76,7 @@ public class PCAjgManagerDistributeAfter 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); - String prcName = delegateTask.getVariable("stId",String.class)+"-项目合规评估流程-流程下发"; + String prcName = delegateTask.getVariable("prcName",String.class); 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/ProjectComplianceAssessment/PCAstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAstartAfter.java index 4bedb316..524310e0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAstartAfter.java @@ -54,7 +54,8 @@ public class PCAstartAfter implements TaskListener { delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); delegateTask.setVariable("stId",object.getString("projectNumber")); - String prcName = object.getString("projectNumber")+"-项目合规评估流程-项目维度"; + String prcName = object.getString("projectNumber")+"-合规评估"; + delegateTask.setVariable("prcName",prcName); 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/ProjectComplianceAssessment/PCAsumAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAsumAfter.java index c8ca0662..b69e672c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAsumAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAsumAfter.java @@ -43,7 +43,7 @@ public class PCAsumAfter 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); - String prcName = delegateTask.getVariable("stId",String.class)+"-项目合规评估流程-标准法规部部长审核"; + String prcName = delegateTask.getVariable("prcName",String.class); QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); From ae86fb2cbbc30bae4cf9a4c0dfc7047987f7e6be Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 28 Jun 2022 16:09:16 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E8=AF=A5=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/projectEvaluationNewProcess/Step3Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step4Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step5Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step7Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step8Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step9Before.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step3Before.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step3Before.java index f26ed52e..01744917 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step3Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step3Before.java @@ -28,7 +28,7 @@ public class Step3Before implements TaskListener { busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpgStep6?prcType=5&routerType=oa"); + one1.setLink("bzpgStep3?prcType=5&routerType=oa"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4Before.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4Before.java index 00d3b9f8..070ff1dd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4Before.java @@ -28,7 +28,7 @@ public class Step4Before implements TaskListener { busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpgStep6?prcType=5&routerType=oa"); + one1.setLink("bzpgStep4?prcType=5&routerType=oa"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5Before.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5Before.java index acefd8c7..6aac2aff 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5Before.java @@ -28,7 +28,7 @@ public class Step5Before implements TaskListener { busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpgStep6?prcType=5&routerType=oa"); + one1.setLink("xmpgStep5?prcType=5&routerType=oa"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7Before.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7Before.java index 5480c4a6..52923699 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7Before.java @@ -28,7 +28,7 @@ public class Step7Before implements TaskListener { busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpgStep6?prcType=5&routerType=oa"); + one1.setLink("xmpgStep7?prcType=5&routerType=oa"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8Before.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8Before.java index ecb6c1f6..2c6f6c38 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8Before.java @@ -28,7 +28,7 @@ public class Step8Before implements TaskListener { busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpgStep6?prcType=5&routerType=oa"); + one1.setLink("xmpgStep8?prcType=5&routerType=oa"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9Before.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9Before.java index 653c015b..9ec842d3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9Before.java @@ -28,7 +28,7 @@ public class Step9Before implements TaskListener { busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpgStep6?prcType=5&routerType=oa"); + one1.setLink("bzpgStep8-1?prcType=5&routerType=oa"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } From cffeae5643de0846cc6691131e5100c38d60609b Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 28 Jun 2022 16:18:56 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/projectEvaluationNewProcess/Step5Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step6Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step7Before.java | 2 +- .../listener/projectEvaluationNewProcess/Step8Before.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5Before.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5Before.java index 6aac2aff..00799f63 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5Before.java @@ -28,7 +28,7 @@ public class Step5Before implements TaskListener { busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpgStep5?prcType=5&routerType=oa"); + one1.setLink("bzpgStep5?prcType=5&routerType=oa"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6Before.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6Before.java index 48de42f9..db80fbd9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6Before.java @@ -28,7 +28,7 @@ public class Step6Before implements TaskListener { busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpgStep6?prcType=5&routerType=oa"); + one1.setLink("bzpgStep6?prcType=5&routerType=oa"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7Before.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7Before.java index 52923699..889c6e21 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7Before.java @@ -28,7 +28,7 @@ public class Step7Before implements TaskListener { busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpgStep7?prcType=5&routerType=oa"); + one1.setLink("bzpgStep7?prcType=5&routerType=oa"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8Before.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8Before.java index 2c6f6c38..65997dde 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8Before.java @@ -28,7 +28,7 @@ public class Step8Before implements TaskListener { busBean.saveOrUpdate(one1); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("xmpgStep8?prcType=5&routerType=oa"); + one1.setLink("bzpgStep8?prcType=5&routerType=oa"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); }