From 6b4e21edc306b5d1c011d4625501443e2fd5ba03 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 23 Mar 2022 15:30:49 +0800 Subject: [PATCH] =?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);