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 5ff67595..d5a8eefc 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 @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.entity.ProcessApprovalRecord; +import com.jero.modules.activiti.enums.CommitFlagEnum; import com.jero.modules.activiti.enums.FinishFlagEnum; import com.jero.modules.activiti.enums.ProcessStatusEnum; import com.jero.modules.activiti.enums.ProcessTypeEnum; @@ -28,6 +29,7 @@ import org.activiti.engine.repository.ProcessDefinition; import org.springframework.stereotype.Component; import java.util.Date; +import java.util.Map; /** * @author liJiaRao @@ -159,7 +161,14 @@ public class MyGlobalEventListener implements ActivitiEventListener { approvalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue()); approvalRecord.setEndTime(date); approvalRecord.setOverTime(between.toString()); - approvalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue()); + + Map variables = delegateTask.getVariables(); + if (variables.containsKey("pass") && variables.get("pass").equals("false")){ + approvalRecord.setCommitFlag(CommitFlagEnum.REJECT.getValue()); + }else { + approvalRecord.setCommitFlag(CommitFlagEnum.PASS.getValue()); + } + recordService.updateById(approvalRecord); log.info("流程实例总数:" + execution.getVariable("nrOfInstances")); log.info("当前活动的流程实例总数:" + execution.getVariable("nrOfActiveInstances")); @@ -168,7 +177,7 @@ public class MyGlobalEventListener implements ActivitiEventListener { log.info("name = " + delegateTask.getName()); log.info("taskEntity.getAssignee() = " + delegateTask.getAssignee()); log.info("taskEntity.getIdentityLinks() = " + delegateTask.getIdentityLinks()); - log.info("taskEntity.getVariables() = " + delegateTask.getVariables()); + log.info("taskEntity.getVariables() = " + variables); } private void activityComplete(ActivitiEvent event){