From 478165b659f40fd9f316822e1ce8ec73ef00bb58 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Fri, 15 Jul 2022 17:38:07 +0800 Subject: [PATCH] =?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));