From bd7dfe8aeb3f96e4703d88d7ff7965a93c60b51e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 28 Jun 2022 11:27:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E5=91=BD?= =?UTF-8?q?=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);