From cbc2b80fbaf2db2589da822903d14a1195d006b2 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 28 Nov 2023 17:37:28 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E7=9B=91=E5=90=AC=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/mybatis/MybatisInterceptor.java | 2 +- .../listener/MyGlobalEventListener.java | 29 ++++++++----------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/laws-base/laws-base-core/src/main/java/com/jero/config/mybatis/MybatisInterceptor.java b/laws-base/laws-base-core/src/main/java/com/jero/config/mybatis/MybatisInterceptor.java index beefc761..0a078665 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/config/mybatis/MybatisInterceptor.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/config/mybatis/MybatisInterceptor.java @@ -137,7 +137,7 @@ public class MybatisInterceptor implements Interceptor { if (localDelFlag == null || "".equals(localDelFlag)) { // 登录人账号 ReflectionUtils.makeAccessible(field); - ReflectionUtils.setField(field,parameter,"0"); + ReflectionUtils.setField(field,parameter,0); } } } catch (Exception e) { 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 4ded7ede..9eeba5b5 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 @@ -80,21 +80,16 @@ public class MyGlobalEventListener implements ActivitiEventListener { ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); String processInstanceId = execution.getProcessInstanceId(); String processDefinitionId = execution.getProcessDefinitionId(); - - ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine(); - RepositoryService repositoryService = processEngine.getRepositoryService(); - ProcessDefinition processDefinition = repositoryService.getProcessDefinition(processDefinitionId); - - String name = processDefinition.getName(); - String key = processDefinition.getKey(); + ExecutionEntityImpl parent = execution.getParent(); + String name = parent.getProcessDefinitionName(); //新增流程总表信息（剩余的内容在启动流程时填充） ProcessAll processAll = new ProcessAll(); processAll.setProcessInstanceId(processInstanceId); processAll.setPrcType(ProcessTypeEnum.getValueByName(name)); processAll.setPrcStatus(ProcessStatusEnum.INCOMPLETE.getValue()); processAllService.save(processAll); - log.info("taskEntity.getId() = " + execution.getId()); - log.info("taskEntity.getName() = " + execution.getName()); + log.info("id = " + execution.getId()); + log.info("name = " + name); log.info("taskEntity.getActivityName() = " + execution.getActivityName()); log.info("taskEntity.getDeploymentId() = " + execution.getDeploymentId()); log.info("taskEntity.getProcessDefinitionId() = " + execution.getProcessDefinitionId()); @@ -123,8 +118,8 @@ public class MyGlobalEventListener implements ActivitiEventListener { approvalRecord.setCreateTime(createTime); approvalRecord.setNodeId(taskDefinitionKey); recordService.save(approvalRecord); - log.info("taskEntity.getId() = " + delegateTask.getId()); - log.info("taskEntity.getName() = " + delegateTask.getName()); + log.info("id = " + delegateTask.getId()); + log.info("name = " + delegateTask.getName()); log.info("taskEntity.getAssignee() = " + delegateTask.getAssignee()); log.info("taskEntity.getIdentityLinks() = " + delegateTask.getIdentityLinks()); log.info("taskEntity.getVariables() = " + delegateTask.getVariables()); @@ -134,8 +129,8 @@ public class MyGlobalEventListener implements ActivitiEventListener { //log.info("===================任务分配事件==================="); //ActivitiEntityEventImpl activitiEntityEvent = (ActivitiEntityEventImpl) event; //TaskEntity taskEntity = (TaskEntity) activitiEntityEvent.getEntity(); - //log.info("taskEntity.getId() = " + taskEntity.getId()); - //log.info("taskEntity.getName() = " + taskEntity.getName()); + //log.info("id = " + id); + //log.info("name = " + name); //log.info("taskEntity.getAssignee() = " + taskEntity.getAssignee()); //log.info("taskEntity.getIdentityLinks() = " + taskEntity.getIdentityLinks()); //log.info("taskEntity.getVariables() = " + taskEntity.getVariables()); @@ -161,8 +156,8 @@ public class MyGlobalEventListener implements ActivitiEventListener { log.info("流程实例总数：" + execution.getVariable("nrOfInstances")); log.info("当前活动的流程实例总数：" + execution.getVariable("nrOfActiveInstances")); log.info("已经完成实例的数目：" + execution.getVariable("nrOfCompletedInstances")); - log.info("taskEntity.getId() = " + delegateTask.getId()); - log.info("taskEntity.getName() = " + delegateTask.getName()); + log.info("id = " + delegateTask.getId()); + log.info("name = " + delegateTask.getName()); log.info("taskEntity.getAssignee() = " + delegateTask.getAssignee()); log.info("taskEntity.getIdentityLinks() = " + delegateTask.getIdentityLinks()); log.info("taskEntity.getVariables() = " + delegateTask.getVariables()); @@ -188,8 +183,8 @@ public class MyGlobalEventListener implements ActivitiEventListener { wrapper.set(ProcessAll::getEndTime,date); wrapper.set(ProcessAll::getOverTime,between.toString()); processAllService.update(wrapper); - log.info("taskEntity.getId() = " + execution.getId()); - log.info("taskEntity.getName() = " + execution.getName()); + log.info("id = " + execution.getId()); + log.info("name = " + execution.getName()); log.info("taskEntity.getActivityName() = " + execution.getActivityName()); log.info("taskEntity.getDeploymentId() = " + execution.getDeploymentId()); log.info("taskEntity.getProcessDefinitionId() = " + execution.getProcessDefinitionId());