From 2cf9a38f7063df16cd453a90778ac63ad1f39d73 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 12 Dec 2023 19:36:42 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E5=AE=A1=E6=89=B9=E5=90=8E=E5=A1=AB?= =?UTF-8?q?=E5=85=85=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activiti/listener/MyGlobalEventListener.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java index d5a8eefc..2cb22fb3 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java @@ -59,7 +59,7 @@ public class MyGlobalEventListener implements ActivitiEventListener { this.activityComplete(event); break; default: - //log.info("Event received: " + event.getType()); + log.info("Event received: " + event.getType()); } } @@ -102,6 +102,8 @@ public class MyGlobalEventListener implements ActivitiEventListener { log.info("===================任务创建事件==================="); ActivitiEntityEventImpl activitiEntityEvent = (ActivitiEntityEventImpl) event; TaskEntity delegateTask = (TaskEntity) activitiEntityEvent.getEntity(); + //任务创建时，清除pass + delegateTask.removeVariable("pass"); //流程审批信息 ProcessApprovalRecordService recordService = SpringContextUtil.getBean(ProcessApprovalRecordService.class); @@ -146,7 +148,6 @@ public class MyGlobalEventListener implements ActivitiEventListener { ExecutionEntity execution = delegateTask.getExecution(); //流程审批信息转办 ProcessApprovalRecordService recordService = SpringContextUtil.getBean(ProcessApprovalRecordService.class); - String taskId = delegateTask.getId(); String assignee = delegateTask.getAssignee(); @@ -163,10 +164,13 @@ public class MyGlobalEventListener implements ActivitiEventListener { approvalRecord.setOverTime(between.toString()); Map variables = delegateTask.getVariables(); - if (variables.containsKey("pass") && variables.get("pass").equals("false")){ - approvalRecord.setCommitFlag(CommitFlagEnum.REJECT.getValue()); - }else { - approvalRecord.setCommitFlag(CommitFlagEnum.PASS.getValue()); + if (variables.containsKey("pass")){ + if ((Boolean)variables.get("pass")){ + approvalRecord.setCommitFlag(CommitFlagEnum.PASS.getValue()); + }else { + approvalRecord.setCommitFlag(CommitFlagEnum.REJECT.getValue()); + } + } recordService.updateById(approvalRecord);