From a0a24f8e3fb54f8757e65cde23129c61b930fa6c Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Fri, 15 Jul 2022 16:33:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20bug=20#55699=20=E3=80=90WELINK?= =?UTF-8?q?=E3=80=91=E5=BB=B6=E6=9C=9F=20=E5=AE=A1=E5=AE=9A=E8=8A=82?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E6=89=8B=E6=9C=BA=E7=AB=AF=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=90=8C=E6=84=8F=E6=B2=A1=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessStep2After.java | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) 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 b10d9b10..331fdf5a 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 @@ -9,10 +9,13 @@ 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 net.sf.json.JSONArray; +import net.sf.json.util.JSONTokener; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public class ProcessStep2After implements TaskListener { @@ -60,16 +63,24 @@ public class ProcessStep2After implements TaskListener { } } String type=object.getString("type"); + String bussSort = ""; + Object json = new JSONTokener(object.getString("bussSort")).nextValue(); + if(json instanceof JSONArray) { + bussSort = object.getJSONArray("bussSort").get(0).toString(); + }else{ + bussSort = object.getString("bussSort"); + } + if ("5".equals(type)){ - prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项"; + prcName=bussSort+"-"+object.getString("esName")+"-计划立项"; }else if ("2".equals(type)){ - prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期"; + prcName=bussSort+"-"+object.getString("esName")+"-计划延期"; }else if ("1".equals(type)){ - prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并"; + prcName=bussSort+"-"+object.getString("esName")+"-计划合并"; }else if ("3".equals(type)){ - prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消"; + prcName=bussSort+"-"+object.getString("esName")+"-计划取消"; }else { - prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名"; + prcName=bussSort+"-"+object.getString("renameEs")+"-计划更名"; } //截止时间 流程描述 创建人 String user = delegateTask.getVariable("prcCreateUser", String.class); @@ -114,4 +125,12 @@ public class ProcessStep2After implements TaskListener { } } } + public static boolean isJson(String string) { + try { + JSONObject.parseObject(string); + return true; + } catch (Exception e) { + return false; + } + } } From 478165b659f40fd9f316822e1ce8ec73ef00bb58 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Fri, 15 Jul 2022 17:38:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20bug=20#55699=20=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E7=82=B9=E5=87=BB=E5=90=8C=E6=84=8F=E6=B2=A1=E6=95=88?= =?UTF-8?q?=E6=9E=9C=20=E7=9B=B8=E5=90=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessStep1After.java | 31 +++++++++++++------ .../ProcessStep3After.java | 20 +++++++++--- .../ProcessStep4After.java | 20 +++++++++--- .../ProcessStep5After.java | 20 +++++++++--- 4 files changed, 66 insertions(+), 25 deletions(-) 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 d5169344..9d6affca 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 @@ -9,6 +9,8 @@ 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 net.sf.json.JSONArray; +import net.sf.json.util.JSONTokener; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; @@ -55,17 +57,26 @@ public class ProcessStep1After implements TaskListener { String username = delegateTask.getVariable("prcCreateUserName", String.class); String prcName = ""; String type=object.getString("type"); - if ("5".equals(type)){ - prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项"; - }else if ("2".equals(type)){ - prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期"; - }else if ("1".equals(type)){ - prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并"; - }else if ("3".equals(type)){ - prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消"; - }else { - prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名"; + String bussSort = ""; + Object json = new JSONTokener(object.getString("bussSort")).nextValue(); + if(json instanceof JSONArray) { + bussSort = object.getJSONArray("bussSort").get(0).toString(); + }else{ + bussSort = object.getString("bussSort"); } + + if ("5".equals(type)){ + prcName=bussSort+"-"+object.getString("esName")+"-计划立项"; + }else if ("2".equals(type)){ + prcName=bussSort+"-"+object.getString("esName")+"-计划延期"; + }else if ("1".equals(type)){ + prcName=bussSort+"-"+object.getString("esName")+"-计划合并"; + }else if ("3".equals(type)){ + prcName=bussSort+"-"+object.getString("esName")+"-计划取消"; + }else { + prcName=bussSort+"-"+object.getString("renameEs")+"-计划更名"; + } + 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/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java index df00e63a..8bceabf5 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 @@ -9,6 +9,8 @@ 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 net.sf.json.JSONArray; +import net.sf.json.util.JSONTokener; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; @@ -51,16 +53,24 @@ public class ProcessStep3After implements TaskListener { delegateTask.setVariable("count",null); } String type=object.getString("type"); + String bussSort = ""; + Object json = new JSONTokener(object.getString("bussSort")).nextValue(); + if(json instanceof JSONArray) { + bussSort = object.getJSONArray("bussSort").get(0).toString(); + }else{ + bussSort = object.getString("bussSort"); + } + if ("5".equals(type)){ - prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项"; + prcName=bussSort+"-"+object.getString("esName")+"-计划立项"; }else if ("2".equals(type)){ - prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期"; + prcName=bussSort+"-"+object.getString("esName")+"-计划延期"; }else if ("1".equals(type)){ - prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并"; + prcName=bussSort+"-"+object.getString("esName")+"-计划合并"; }else if ("3".equals(type)){ - prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消"; + prcName=bussSort+"-"+object.getString("esName")+"-计划取消"; }else { - prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名"; + prcName=bussSort+"-"+object.getString("renameEs")+"-计划更名"; } //截止时间 流程描述 创建人 String user = delegateTask.getVariable("prcCreateUser",String.class); 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 b0e17545..56c98205 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 @@ -11,6 +11,8 @@ 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 net.sf.json.JSONArray; +import net.sf.json.util.JSONTokener; import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; @@ -146,16 +148,24 @@ public class ProcessStep4After implements TaskListener { delegateTask.setVariable("count",null); } String type=object.getString("type"); + String bussSort = ""; + Object json = new JSONTokener(object.getString("bussSort")).nextValue(); + if(json instanceof JSONArray) { + bussSort = object.getJSONArray("bussSort").get(0).toString(); + }else{ + bussSort = object.getString("bussSort"); + } + if ("5".equals(type)){ - prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项"; + prcName=bussSort+"-"+object.getString("esName")+"-计划立项"; }else if ("2".equals(type)){ - prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期"; + prcName=bussSort+"-"+object.getString("esName")+"-计划延期"; }else if ("1".equals(type)){ - prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并"; + prcName=bussSort+"-"+object.getString("esName")+"-计划合并"; }else if ("3".equals(type)){ - prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消"; + prcName=bussSort+"-"+object.getString("esName")+"-计划取消"; }else { - prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名"; + prcName=bussSort+"-"+object.getString("renameEs")+"-计划更名"; } //截止时间 流程描述 创建人 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 19fee69f..3148feec 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 @@ -9,6 +9,8 @@ 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 net.sf.json.JSONArray; +import net.sf.json.util.JSONTokener; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; @@ -37,16 +39,24 @@ public class ProcessStep5After implements TaskListener { List nextUserList = new ArrayList(); String prcName = ""; String type=object.getString("type"); + String bussSort = ""; + Object json = new JSONTokener(object.getString("bussSort")).nextValue(); + if(json instanceof JSONArray) { + bussSort = object.getJSONArray("bussSort").get(0).toString(); + }else{ + bussSort = object.getString("bussSort"); + } + if ("5".equals(type)){ - prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项"; + prcName=bussSort+"-"+object.getString("esName")+"-计划立项"; }else if ("2".equals(type)){ - prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期"; + prcName=bussSort+"-"+object.getString("esName")+"-计划延期"; }else if ("1".equals(type)){ - prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并"; + prcName=bussSort+"-"+object.getString("esName")+"-计划合并"; }else if ("3".equals(type)){ - prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消"; + prcName=bussSort+"-"+object.getString("esName")+"-计划取消"; }else { - prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名"; + prcName=bussSort+"-"+object.getString("renameEs")+"-计划更名"; } //根据意见选择 企标状态并对企标信息进行修改 bzfgId nextUserList.add(delegateTask.getVariable("topmanagerId",String.class)); From fdbf523fabd1c38d73448d03dd71a97f48961690 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Mon, 18 Jul 2022 10:14:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20bug=20#55926=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=EF=BC=8C=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=86=E5=8F=91=E8=8A=82=E7=82=B9=E7=9A=84=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=BE=E7=A4=BA=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8F=B7-=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0-=E5=90=88?= =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/projectEvaluationNewProcess/Step2After.java | 4 ++-- .../listener/projectEvaluationNewProcess/Step3After.java | 2 +- .../listener/projectEvaluationNewProcess/Step4After.java | 2 +- .../listener/projectEvaluationNewProcess/Step5After.java | 2 +- .../listener/projectEvaluationNewProcess/Step6After.java | 2 +- .../listener/projectEvaluationNewProcess/Step7After.java | 2 +- .../listener/projectEvaluationNewProcess/Step8After.java | 2 +- .../listener/projectEvaluationNewProcess/Step9After.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step2After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step2After.java index ed692c99..0783592c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step2After.java @@ -74,9 +74,9 @@ public class Step2After implements TaskListener { String username = delegateTask.getVariable("prcCreateUserName", String.class); String prcName = ""; if ("0".equals(object.getString("stepFlag"))) { - prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准"; + prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规评估"; }else { - prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准"; + prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规评估"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step3After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step3After.java index 80587a91..2bf3acf4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step3After.java @@ -89,7 +89,7 @@ public class Step3After 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 = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准"; + String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规评估"; 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/projectEvaluationNewProcess/Step4After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4After.java index ac7fc6b0..d58f6a55 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4After.java @@ -111,7 +111,7 @@ public class Step4After 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 = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准"; + String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规评估"; 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/projectEvaluationNewProcess/Step5After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5After.java index bf2e00f7..61eaf7be 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5After.java @@ -50,7 +50,7 @@ public class Step5After 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 = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准"; + String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规评估"; 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/projectEvaluationNewProcess/Step6After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6After.java index 7208717d..51edf247 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6After.java @@ -89,7 +89,7 @@ public class Step6After implements TaskListener { String user = delegateTask.getVariable("prcCreateUser", String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); - String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准"; + String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规评估"; 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/projectEvaluationNewProcess/Step7After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7After.java index 7bdca6c7..04ba4a07 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7After.java @@ -59,7 +59,7 @@ public class Step7After implements TaskListener { //截止时间 流程描述 创建人 String user = delegateTask.getVariable("prcCreateUser", String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); - String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准"; + String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规评估"; 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/projectEvaluationNewProcess/Step8After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8After.java index 9777a1d9..b87ca5c5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8After.java @@ -126,7 +126,7 @@ public class Step8After 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 = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准"; + String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规评估"; 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/projectEvaluationNewProcess/Step9After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9After.java index 370e361b..b7a11db5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9After.java @@ -61,7 +61,7 @@ public class Step9After implements TaskListener { delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); delegateTask.setVariable("stands",object.getString("standNumber")); - String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准"; + String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规评估"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);