From 78b0651f0ccaa43e334a3e3e4cfe655ffca0c9f4 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 22 Mar 2022 09:28:20 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feat:=20=E6=B3=A8=E6=8E=89=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TodoTaskController.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index 964f8ad7..ca93f1ad 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -2223,18 +2223,18 @@ public class TodoTaskController extends BaseAction { } } }else{ - String end = this.isEnd(busProcessName.getPrcId()); - if(end.equals("0")){ - ResponseMessage> listUser = lawsUserInfoService.getManagerByOrgIdNew("企业标准管理工程师"); - if(listUser.getData()!=null){ -// List qbgcs = new ArrayList<>(); - for (OrgEO orgEO : listUser.getData()) { - assignee+=orgEO.getRoleName()+"-"+orgEO.getUserName(); - } -// String str= StringUtils.join(qbgcs, ","); -// assignee+=str; - } - } +// String end = this.isEnd(busProcessName.getPrcId()); +// if(end.equals("0")){ +// ResponseMessage> listUser = lawsUserInfoService.getManagerByOrgIdNew("企业标准管理工程师"); +// if(listUser.getData()!=null){ +//// List qbgcs = new ArrayList<>(); +// for (OrgEO orgEO : listUser.getData()) { +// assignee+=orgEO.getRoleName()+"-"+orgEO.getUserName(); +// } +//// String str= StringUtils.join(qbgcs, ","); +//// assignee+=str; +// } +// } } } } From 2345efa42877e2f57a66b189f36568a93f37ab84 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 22 Mar 2022 10:51:43 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=BC=BA=E8=A1=8C=E8=A7=A3=E5=86=B3=20?= =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E4=B8=A2=E4=BA=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wkflow/listener/standardRead/ResolveAfter.java | 1 + .../wkflow/listener/standardRead/ZrApplayAfter.java | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) 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 c6acc07a..0c1b625b 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 @@ -62,6 +62,7 @@ public class ResolveAfter implements TaskListener{ //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("applyUserId"); + delegateTask.setVariable("userId",user); String username = object.getString("applyUserIdName"); delegateTask.setVariable("createDate",new Date()); String title=object.getString("itemsNum1")+"-"+object.getString("itemsName1"); 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 f07c02f1..f7e02fb7 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 @@ -44,10 +44,14 @@ public class ZrApplayAfter implements TaskListener{ if(object.getString("resolveFlag").equals("1")){ delegateTask.setVariable("zrFlag",1); prcName=prcName+"-工程师审核"; - if(StringUtils.isNotBlank(object.getString("applyUserId"))){ - delegateTask.setVariable("engineerUserId",object.getString("applyUserId")); - nextUserList.add(object.getString("applyUserId")); - } +// if(StringUtils.isNotBlank(object.getString("applyUserId"))){ +// delegateTask.setVariable("engineerUserId",object.getString("applyUserId")); +// nextUserList.add(object.getString("applyUserId")); +// } +// if(StringUtils.isNotBlank(object.getString("applyUserId"))){ + delegateTask.setVariable("engineerUserId",delegateTask.getVariable("userId",String.class)); + nextUserList.add(delegateTask.getVariable("userId",String.class)); +// } }else { prcName=prcName+"-填写解读分析"; delegateTask.setVariable("zrFlag",2); From db0670a3195ad980e8610058f0e8ee5883c24886 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 22 Mar 2022 17:45:03 +0800 Subject: [PATCH 3/7] =?UTF-8?q?feat:=20=E6=B3=A8=E6=8E=89=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TodoTaskController.java | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index ca93f1ad..cf2a1dd3 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -1983,18 +1983,18 @@ public class TodoTaskController extends BaseAction { // } // } // } - String end = this.isEnd(busProcessName.getPrcId()); - if(end.equals("0")){ - ResponseMessage> listUser = lawsUserInfoService.getManagerByOrgIdNew("企业标准管理工程师"); - if(listUser.getData()!=null){ -// List qbgcs = new ArrayList<>(); - for (OrgEO orgEO : listUser.getData()) { - assignee+=orgEO.getRoleName()+"-"+orgEO.getUserName(); - } -// String str= StringUtils.join(qbgcs, ","); -// assignee+=str; - } - } +// String end = this.isEnd(busProcessName.getPrcId()); +// if(end.equals("0")){ +// ResponseMessage> listUser = lawsUserInfoService.getManagerByOrgIdNew("企业标准管理工程师"); +// if(listUser.getData()!=null){ +//// List qbgcs = new ArrayList<>(); +// for (OrgEO orgEO : listUser.getData()) { +// assignee+=orgEO.getRoleName()+"-"+orgEO.getUserName(); +// } +//// String str= StringUtils.join(qbgcs, ","); +//// assignee+=str; +// } +// } } // //获取新的流程名称· // QueryWrapper queryWrapper1=new QueryWrapper<>(); @@ -2105,19 +2105,19 @@ public class TodoTaskController extends BaseAction { } } else{ - String end = this.isEnd(busProcessName.getPrcId()); - if(end.equals("0")){ -// ResponseMessage> listUser = lawsUserInfoService.getManagerByOrgIdNew("企业标准管理工程师"); - ResponseMessage> listUser=new ResponseMessage<>(); - if(false){ - List qbgcs = new ArrayList<>(); - for (OrgEO orgEO : listUser.getData()) { - assignee+=orgEO.getRoleName()+"-"+orgEO.getUserName(); - } - String str= StringUtils.join(qbgcs, ","); - assignee+=str; - } - } +// String end = this.isEnd(busProcessName.getPrcId()); +// if(end.equals("0")){ +//// ResponseMessage> listUser = lawsUserInfoService.getManagerByOrgIdNew("企业标准管理工程师"); +// ResponseMessage> listUser=new ResponseMessage<>(); +// if(false){ +// List qbgcs = new ArrayList<>(); +// for (OrgEO orgEO : listUser.getData()) { +// assignee+=orgEO.getRoleName()+"-"+orgEO.getUserName(); +// } +// String str= StringUtils.join(qbgcs, ","); +// assignee+=str; +// } +// } } // //获取新的流程名称· // QueryWrapper queryWrapper1=new QueryWrapper<>(); From 6b4e21edc306b5d1c011d4625501443e2fd5ba03 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 23 Mar 2022 15:30:49 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=96=B0=E5=8A=A0=E7=9A=84=20=E9=92=88?= =?UTF-8?q?=E5=AF=B9=20=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=92=A4?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TodoTaskController.java | 16 ++++++++++++++++ .../SRPManagerApproveAfter.java | 1 + 2 files changed, 17 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index cf2a1dd3..69d9c10a 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -2326,6 +2326,22 @@ public class TodoTaskController extends BaseAction { @ApiOperation(value = "强制撤回", notes = "强制撤回") @GetMapping("/forceRecall") public Wrapper forceRecall(String prcId) { + QueryWrapper wrapper=new QueryWrapper<>(); + wrapper.eq("PRC_ID",prcId); + List busProcessNames=iBusProcessNameService.list(wrapper); + if (!busProcessNames.isEmpty()){ + BusProcessName busProcessName=busProcessNames.get(0); + if ("3".equals(busProcessName.getPrcType())){ + QueryWrapper wrapper1=new QueryWrapper<>(); + wrapper1.eq("P_ID",prcId).eq("TASK_INFO","起草"); + List list=iBusProcessNewService.list(wrapper1); + if (!list.isEmpty()){ + JSONObject object=JSONObject.parseObject(list.get(0).getMesg()); + lawsUserInfoService.deletePublicIdea(object.getString("uniques")); + } + } + } + runtimeService.deleteProcessInstance(prcId, "用户强制撤回"); if(StringUtils.isNotBlank(prcId)){ webServiceOAService.deleteOAByPid(prcId); 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 2c0c3cf4..30bf5e03 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 @@ -117,6 +117,7 @@ public class SRPManagerApproveAfter implements TaskListener{ queryWrapper1.eq("TASK_ID",delegateTask.getId()); BusProcessNew one1 = busBean.getOne(queryWrapper1); if(one1!=null){ + one1.setTaskInfo(delegateTask.getName()); one1.setCommitFlag(commitFlag); one1.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(one1); From dfeda0118e6f95dc0198235c5ec1563a075a8ac9 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 25 Mar 2022 16:59:21 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=BA=9F=E6=AD=A2?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E6=97=A5=E6=9C=9F=20=E4=BD=86=E6=98=AF?= =?UTF-8?q?=E4=BC=9A=20=E6=B8=85=E7=A9=BA=E6=8E=89=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=9A=84=E8=B5=B7=E8=8D=89=E9=83=A8=E9=97=A8=E5=92=8C=E8=B5=B7?= =?UTF-8?q?=E8=8D=89=E4=BA=BA=20=E8=BF=99=E6=98=AF=E5=AF=B9=E7=9A=84?= =?UTF-8?q?=E4=B9=88=EF=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/aboliish/ProcessStep1After.java | 13 +++++++++++++ .../listener/aboliish/ProcessStep2After.java | 13 +++++++++++++ .../listener/aboliish/ProcessStep3After.java | 13 +++++++++++++ .../listener/aboliish/ProcessStep4After.java | 13 +++++++++++++ .../listener/aboliish/ProcessStep5After.java | 13 +++++++++++++ .../listener/aboliish/ProcessStep6After.java | 10 +++++++--- .../listener/aboliish/ProcessstartAfter.java | 15 +++++++++++++++ 7 files changed, 87 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1After.java index 263b4359..41a88bc7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1After.java @@ -70,6 +70,19 @@ public class ProcessStep1After implements TaskListener { } // 存储当前节点意见 + if (null != object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if (!list.isEmpty()) { + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskInfo(delegateTask.getName()); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } if (nextUserList != null && !nextUserList.isEmpty()) { for (String nextUser : nextUserList) { BusProcessNew busProcessNewNext = new BusProcessNew(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java index 5daa9034..bee630e9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java @@ -83,6 +83,19 @@ public class ProcessStep2After implements TaskListener { } // 存储当前节点意见 + if (null != object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if (!list.isEmpty()) { + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskInfo(delegateTask.getName()); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } if (nextUserList != null && !nextUserList.isEmpty()) { for (String nextUser : nextUserList) { BusProcessNew busProcessNewNext = new BusProcessNew(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java index 7b63a2e7..7980f97c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java @@ -60,6 +60,19 @@ public class ProcessStep3After implements TaskListener { } // 存储当前节点意见 + if (null != object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if (!list.isEmpty()) { + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskInfo(delegateTask.getName()); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } if (nextUserList != null && !nextUserList.isEmpty()) { for (String nextUser : nextUserList) { BusProcessNew busProcessNewNext = new BusProcessNew(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java index 79ccb83c..0beba0a6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java @@ -66,6 +66,19 @@ public class ProcessStep4After implements TaskListener { } // 存储当前节点意见 + if (null != object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if (!list.isEmpty()) { + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskInfo(delegateTask.getName()); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } if (nextUserList != null && !nextUserList.isEmpty()) { for (String nextUser : nextUserList) { BusProcessNew busProcessNewNext = new BusProcessNew(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java index ab2f34bd..88ea53d4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java @@ -66,6 +66,19 @@ public class ProcessStep5After implements TaskListener { } // 存储当前节点意见 + if (null != object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if (!list.isEmpty()) { + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskInfo(delegateTask.getName()); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } if (nextUserList != null && !nextUserList.isEmpty()) { for (String nextUser : nextUserList) { BusProcessNew busProcessNewNext = new BusProcessNew(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java index 3b8ae018..9dd3a149 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java @@ -17,9 +17,7 @@ import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; public class ProcessStep6After implements TaskListener { @@ -49,6 +47,12 @@ public class ProcessStep6After implements TaskListener { SarBussionessStand sarBussionessStand = new SarBussionessStand(); sarBussionessStand.setTextStatusBuss(object.getString("standtextStatus")); sarBussionessStand.setId(object.getString("standId")); + Map map=new HashMap<>(); + SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd"); + map.put("fzrqbuss",dateFormat.format(new Date())); + sarBussionessStand.setAttrInfoCaseMap(map); + String as="{'FZRQBUSS':'"+dateFormat.format(new Date())+"'}"; + sarBussionessStand.setSarStandAttrEOStr(as); lawsUserInfoService.updateSarBussionessStand(sarBussionessStand); } }else { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessstartAfter.java index a3b39684..1b700180 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessstartAfter.java @@ -69,6 +69,21 @@ public class ProcessstartAfter implements TaskListener { one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } + // 存储当前节点意见 + if (null != object.getString("commentText")) { + BusProcessNew busProcessNews = new BusProcessNew(); + busProcessNews.setMsgType("clause"); + busProcessNews.setPId(delegateTask.getProcessInstanceId()); + busProcessNews.setMesg(object.toJSONString()); + busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNews.setFinishFlag("0"); + busProcessNews.setTaskInfo(delegateTask.getName()); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setUserId("start"); + busProcessNews.setPrcName(prcName); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.save(busProcessNews); + } // 存储当前节点意见 if (nextUserList != null && !nextUserList.isEmpty()) { From ecce0ec1c924058074361b7fe56bc3db327bea48 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sat, 26 Mar 2022 16:27:01 +0800 Subject: [PATCH 6/7] feat: bug #52125 --- .../bussLibrary/BussLibraryC6After.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC6After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC6After.java index 57b743fc..6e9fa663 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC6After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC6After.java @@ -33,7 +33,7 @@ public class BussLibraryC6After implements TaskListener{ queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); -// JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + JSONObject objectNew = JSONObject.parseObject(datas.getFormValsJson()); // delegateTask.setVariable("objectJson",object); QueryWrapper queryWrapper1 = new QueryWrapper(); @@ -57,13 +57,13 @@ public class BussLibraryC6After implements TaskListener{ //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); + String user = objectNew.getString("prcCreateUser"); + String username = objectNew.getString("prcCreateUserName"); // object.getString("standName") String standName = ""; String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ - prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; + if(StringUtils.isNotBlank(objectNew.getString("standName")) && StringUtils.isNotBlank(objectNew.getString("standSort"))){ + prcName = objectNew.getString("standSort")+"-"+objectNew.getString("standName") + "-企标制修订"; }else { prcName = "企标制修订"; } @@ -84,10 +84,9 @@ public class BussLibraryC6After implements TaskListener{ busProcessNew.setId(one.getId()); busProcessNew.setMsgType("clause"); busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setMesg(objectNew.toJSONString()); busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setCommitText(object.getString("commentText")); + busProcessNew.setCommitText(objectNew.getString("commentText")); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(busProcessNew); @@ -97,8 +96,7 @@ public class BussLibraryC6After implements TaskListener{ BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(object.toJSONString()); - busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setMesg(objectNew.toJSONString()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setUserId(nextUser); @@ -106,8 +104,8 @@ public class BussLibraryC6After implements TaskListener{ busBean.save(busProcessNewNext); } // 评分存储 - if(StringUtils.isBlank(object.getString("fsRejectStatus")) || object.getString("fsRejectStatus").equalsIgnoreCase("2")) { - BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee()); + if(StringUtils.isBlank(objectNew.getString("fsRejectStatus")) || objectNew.getString("fsRejectStatus").equalsIgnoreCase("2")) { + BussUtils.evalSave(delegateTask, objectNew, prcName, delegateTask.getAssignee()); } } } From 792c1e1fe20ad32c764240c25bf3c7b72ad3aefe Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 27 Mar 2022 20:39:21 +0800 Subject: [PATCH 7/7] feat: bug #52117 --- .../listener/bussLibrary/BussLibrary4After.java | 2 -- .../bussLibrary/BussLibraryC3After.java | 17 ++++++++--------- .../wkflow/listener/bussLibrary/BussUtils.java | 1 + 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java index fcbf541f..ee4801a4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java @@ -82,9 +82,7 @@ public class BussLibrary4After implements TaskListener{ busProcessNew.setMsgType("clause"); busProcessNew.setPId(delegateTask.getProcessInstanceId()); busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNew.setUserId(object.getString("hzUserId")); busProcessNew.setPrcName(prcName); busBean.save(busProcessNew); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3After.java index ceda5ba2..baedbd45 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3After.java @@ -33,7 +33,7 @@ public class BussLibraryC3After implements TaskListener{ queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); -// JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + JSONObject objectNew = JSONObject.parseObject(datas.getFormValsJson()); // delegateTask.setVariable("objectJson",object); QueryWrapper queryWrapper1 = new QueryWrapper(); @@ -57,13 +57,13 @@ public class BussLibraryC3After implements TaskListener{ //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); + String user = objectNew.getString("prcCreateUser"); + String username = objectNew.getString("prcCreateUserName"); // object.getString("standName") String standName = ""; String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ - prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; + if(StringUtils.isNotBlank(objectNew.getString("standName")) && StringUtils.isNotBlank(objectNew.getString("standSort"))){ + prcName = objectNew.getString("standSort")+"-"+objectNew.getString("standName") + "-企标制修订"; }else { prcName = "企标制修订"; } @@ -80,14 +80,15 @@ public class BussLibraryC3After implements TaskListener{ } // 存储当前节点意见 + BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setId(one.getId()); busProcessNew.setMsgType("clause"); busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setMesg(objectNew.toJSONString()); busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setCommitText(object.getString("commentText")); + busProcessNew.setCommitText(objectNew.getString("commentText")); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(busProcessNew); @@ -98,9 +99,7 @@ public class BussLibraryC3After implements TaskListener{ busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); - busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setUserId(nextUser); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java index b8ef5126..234ba155 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java @@ -129,6 +129,7 @@ public class BussUtils { queryWrapper1.eq("TASK_ID", delegateTask.getId()); BusProcessNew one1 = busBean.getOne(queryWrapper1); if (one1 != null) { + one1.setTaskInfo(delegateTask.getName()); one1.setCommitFlag(commitFlag); one1.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(one1);