From 0214800c61df4925fd443f6f22a50041a1c86614 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 6 Jan 2022 17:45:23 +0800 Subject: [PATCH 1/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()); From f4bf45b24d3e6d4d9873229901abad4097bff12d Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 6 Jan 2022 17:57:27 +0800 Subject: [PATCH 2/2] feat: There is no way the, --- .../bat/wkflow/business_mq/service/SendDeleteMQService.java | 4 ++-- .../webService/service/impl/WebServiceOAServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDeleteMQService.java b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDeleteMQService.java index 473e56ce..c44ee1d3 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDeleteMQService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDeleteMQService.java @@ -83,7 +83,7 @@ public class SendDeleteMQService { SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); if(todoAppResult.getSign().equals("0") || todoAppResult.getMassage().equals("操作成功")){ - logger.info("--------------------------成功发送 ESP 已办任务----------------------------"); + logger.info("--------------------------成功删除 ESP 已办任务----------------------------"); QueryWrapper wrapper = new QueryWrapper(); wrapper.eq("TODO_ID",todoId); wrapper.eq("MSG_TYPE","3"); @@ -99,7 +99,7 @@ public class SendDeleteMQService { sendTodoSave(object,todoId, sdf, "2",todoAppResult.getMassage()); } }else { - logger.error("ESP 发送待办任务异常 :" + "SIGN: "+todoAppResult.getSign()+",MASSAGE: "+todoAppResult.getMassage()); + logger.error("ESP 发送删除任务异常 :" + "SIGN: "+todoAppResult.getSign()+",MASSAGE: "+todoAppResult.getMassage()); // 重试发送待办 logger.info("重试发送待办"); this.restartSendMq(object,todoId,todoAppResult.getMassage()); diff --git a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java index c8ea05fc..f7ba0e41 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java @@ -83,7 +83,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { @Async public void deleteOAByMandatory(String todoId,String assignee){ CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); - log.info("--------------------------ESP 发送删除待办任务 及 再次发送待办----------------------------"); + log.info("--------------------------ESP 发送单个删除OA待办----------------------------"); if(StringUtils.isNotBlank(todoId) && StringUtils.isNotBlank(assignee)){