From 5cba7463f1894563fd60fa209c477500ffbd51e0 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 31 Dec 2021 15:18:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=81=EF=BC=81=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wkflow/listener/StandardCommentNewProcess/Step3After.java | 1 + .../wkflow/listener/StandardCommentNewProcess/Step4After.java | 3 ++- .../wkflow/listener/StandardCommentNewProcess/Step5After.java | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step3After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step3After.java index 7225b6b7..6d0c609a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step3After.java @@ -75,6 +75,7 @@ public class Step3After implements TaskListener { if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){ BusProcessNew busProcessNewNext = new BusProcessNew(); + object.put("SKS",delegateTask.getAssignee()); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4After.java index 422b8a79..d13a0c7d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4After.java @@ -45,7 +45,8 @@ public class Step4After implements TaskListener { prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-标准法规工程师分线审核"; delegateTask.setVariable("spFlag","0"); }else { - nextUserList.add(delegateTask.getVariable("zrUserId1",String.class)); + delegateTask.setVariable("zrUserId1",object.getString("SKS")); + nextUserList.add(object.getString("SKS")); prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-责任部门对接人汇总并选择审批人"; delegateTask.setVariable("spFlag","1"); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step5After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step5After.java index a2365cbf..4ca8a1ac 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step5After.java @@ -69,7 +69,8 @@ public class Step5After implements TaskListener { delegateTask.setVariable("bzFlag","0"); prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-标准法规工程师汇总"; }else { - nextUserList.add(delegateTask.getVariable("zrUserId1",String.class)); + delegateTask.setVariable("zrUserId1",object.getString("SKS")); + nextUserList.add(object.getString("SKS")); prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-责任部门对接人汇总并选择审批人"; delegateTask.setVariable("bzFlag","1"); } From 82fb2cb733a2e41208b287ac520a201cf1850215 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 31 Dec 2021 16:08:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=94=B9=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/standardRead/ChooseZrAfter.java | 13 ++----------- .../listener/standardRead/DeptApplayAfter.java | 13 ++----------- .../wkflow/listener/standardRead/DeptZrAfter.java | 13 ++----------- .../listener/standardRead/EngineerApplayAfter.java | 13 ++----------- .../wkflow/listener/standardRead/ExpainAfter.java | 13 ++----------- .../wkflow/listener/standardRead/ResolveAfter.java | 14 +++----------- .../listener/standardRead/ZrApplayAfter.java | 13 ++----------- 7 files changed, 15 insertions(+), 77 deletions(-) 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 0012baf1..4315e440 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 @@ -45,17 +45,8 @@ public class ChooseZrAfter implements TaskListener{ String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("applyUserId"); String username = object.getString("applyUserIdName"); - String standName = ""; - if (null == object.getString("standInData")){ - standName = "未知"; - }else { - if(object.getString("standInData").equals("INLAND")){ - standName = "国内"; - }else { - standName = "海外"; - } - } - String prcName = standName+"-标准解读流程"; + + String prcName = delegateTask.getVariable("titles",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/DeptApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java index 49aef066..674899ab 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java @@ -44,17 +44,8 @@ public class DeptApplayAfter implements TaskListener{ List nextUserList = new ArrayList(); - String standName = ""; - if (null == object.getString("standInData")){ - standName = "未知"; - }else { - if(object.getString("standInData").equals("INLAND")){ - standName = "国内"; - }else { - standName = "海外"; - } - } - String prcName = standName+"-标准解读流程"; + + String prcName = delegateTask.getVariable("titles",String.class)+"-标准解读流程"; //部长进行审批（1：通过） if (object.getString("gcApplyFlag").equals("1")) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java index d60624c5..92a2692d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java @@ -59,17 +59,8 @@ public class DeptZrAfter implements TaskListener{ String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("applyUserId"); String username = object.getString("applyUserIdName"); - String standName = ""; - if (null == object.getString("standInData")){ - standName = "未知"; - }else { - if(object.getString("standInData").equals("INLAND")){ - standName = "国内"; - }else { - standName = "海外"; - } - } - String prcName = standName+"-标准解读流程-填写解读分析"; + + String prcName = delegateTask.getVariable("titles",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/EngineerApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java index e3614f93..eaa48683 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java @@ -37,17 +37,8 @@ public class EngineerApplayAfter implements TaskListener{ List nextUserList = new ArrayList(); - String standName = ""; - if (null == object.getString("standInData")){ - standName = "未知"; - }else { - if(object.getString("standInData").equals("INLAND")){ - standName = "国内"; - }else { - standName = "海外"; - } - } - String prcName = standName + "-标准解读流程"; + + String prcName = delegateTask.getVariable("titles",String.class) + "-标准解读流程"; //工程师是否要进行审核 if (object.getString("zrApplyFlag").equals("1")) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java index a45890a6..e5b7a5d5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java @@ -41,17 +41,8 @@ public class ExpainAfter implements TaskListener{ String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("applyUserId"); String username = object.getString("applyUserIdName"); - String standName = ""; - if (null == object.getString("standInData")){ - standName = "未知"; - }else { - if(object.getString("standInData").equals("INLAND")){ - standName = "国内"; - }else { - standName = "海外"; - } - } - String prcName = standName+"-标准解读流程-责任人审核"; + + String prcName = delegateTask.getVariable("titles",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 cfa3a896..920cbf49 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 @@ -64,17 +64,9 @@ public class ResolveAfter implements TaskListener{ String user = object.getString("applyUserId"); String username = object.getString("applyUserIdName"); delegateTask.setVariable("createDate",new Date()); - String standName = ""; - if (null == object.getString("standInData")){ - standName = "未知"; - }else { - if(object.getString("standInData").equals("INLAND")){ - standName = "国内"; - }else { - standName = "海外"; - } - } - String prcName = standName+"-标准解读流程-选择执行人"; + String title=object.getString("itemsNum1")+"-"+object.getString("itemsName1"); + delegateTask.setVariable("titles",title); + String prcName = title+"-标准解读流程-选择执行人"; 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/ZrApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java index 1f070898..046f4df2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java @@ -38,17 +38,8 @@ public class ZrApplayAfter implements TaskListener{ delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - String standName = ""; - if (null == object.getString("standInData")){ - standName = "未知"; - }else { - if(object.getString("standInData").equals("INLAND")){ - standName = "国内"; - }else { - standName = "海外"; - } - } - String prcName = standName+"-标准解读流程"; + + String prcName = delegateTask.getVariable("titles",String.class)+"-标准解读流程"; //责任人是否要进行审核 if(object.getString("resolveFlag").equals("1")){ delegateTask.setVariable("zrFlag",1);