From fe10071aaaccc18cb5687bd6d36dc4a6c65b30bb Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 6 Jan 2022 17:21:22 +0800 Subject: [PATCH 1/2] feat: There is no way the --- .../webService/controller/WebServiceOAController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/controller/WebServiceOAController.java b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/controller/WebServiceOAController.java index 7dad0180..d138b8c0 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/controller/WebServiceOAController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/controller/WebServiceOAController.java @@ -61,7 +61,7 @@ public class WebServiceOAController extends BaseAction { @Autowired private WebServiceOAService webServiceOAService; - @ApiOperation(value = "强制撤回", notes = "强制撤回") + @ApiOperation(value = "强制删除OA待办", notes = "强制删除OA待办") @GetMapping("/deleteOAByMandatory") public void deleteOAByMandatory(String todoId,String assignee) { webServiceOAService.deleteOAByMandatory(todoId,assignee); From 0214800c61df4925fd443f6f22a50041a1c86614 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 6 Jan 2022 17:45:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E9=A9=B3=E5=9B=9Ebug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bat/wkflow/listener/standardRead/DeptApplayAfter.java | 3 +++ .../wkflow/listener/standardRead/EngineerApplayAfter.java | 5 +++-- .../ydw/bat/wkflow/listener/standardRead/ExpainAfter.java | 1 + .../ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java | 5 +++-- 4 files changed, 10 insertions(+), 4 deletions(-) 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 674899ab..96e632d9 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 @@ -123,6 +123,9 @@ public class DeptApplayAfter implements TaskListener{ } else { delegateTask.setVariable("bzFlag", 2); prcName=prcName+"-填写解读分析"; + JSONObject object1=object.getJSONObject("RollBack"); + nextUserList.add(String.valueOf(object1.getString("id"))); + delegateTask.setVariable("zxUserId",object.getJSONObject("RollBack")); } 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 eaa48683..f021bfc6 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 @@ -51,8 +51,9 @@ public class EngineerApplayAfter implements TaskListener{ } else { prcName=prcName+"-填写解读分析"; delegateTask.setVariable("gcFlag", 2); - JSONObject object1=delegateTask.getVariable("zxUserId",JSONObject.class); - nextUserList.add(object1.getString("id")); + JSONObject object1=object.getJSONObject("RollBack"); + nextUserList.add(String.valueOf(object1.getString("id"))); + delegateTask.setVariable("zxUserId",object.getJSONObject("RollBack")); } //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); 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 e5b7a5d5..54e1ce48 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 @@ -73,6 +73,7 @@ public class ExpainAfter implements TaskListener{ for (Object obj:responUserList) { JSONObject object1 = (JSONObject)obj; if (object.getString("AOLIGEI").equals(object1.getString("KEYS"))) { + object.put("RollBack",object1); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); 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 046f4df2..0fe889c7 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 @@ -51,9 +51,10 @@ public class ZrApplayAfter implements TaskListener{ }else { prcName=prcName+"-填写解读分析"; delegateTask.setVariable("zrFlag",2); - log.error("戒毒流程当前工作节点驳回人为："+String.valueOf(delegateTask.getVariable("zxUserId"))); - JSONObject object1=JSONObject.parseObject(String.valueOf(delegateTask.getVariable("zxUserId"))); + log.error("解读流程当前工作节点驳回人为："+String.valueOf(delegateTask.getVariable("zxUserId"))); + JSONObject object1=object.getJSONObject("RollBack"); nextUserList.add(String.valueOf(object1.getString("id"))); + delegateTask.setVariable("zxUserId",object.getJSONObject("RollBack")); } //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());