add 审批后填充审批意见

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<String, Object> 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);