From 59cfbab4b3146c52a8d308a7d090aa0251383343 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Wed, 25 Jun 2025 11:26:50 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3647)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=B8=AD=E7=9A=84=E8=8A=82=E7=82=B9=E6=96=87?= =?UTF-8?q?=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/entity/type/TaskEntityEventHandle.java | 1 + .../service/impl/ExtAxProcessLogServiceImpl.java | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/entity/type/TaskEntityEventHandle.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/entity/type/TaskEntityEventHandle.java index a00353dfb..41c30fd3c 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/entity/type/TaskEntityEventHandle.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/entity/type/TaskEntityEventHandle.java @@ -155,6 +155,7 @@ public class TaskEntityEventHandle implements EntityEventHandle { update.setAssigneeTenantId(assignee.getTenantId()); update.setAssigneeName(assignee.getAssignerName()); update.setAssigneeOuId(assignee.getOuId()); + update.setOperationDesc(assignee.getAssignerName()); } boolean needDelete = false; diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/ExtAxProcessLogServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/ExtAxProcessLogServiceImpl.java index 36f24e5c7..7791a9bb7 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/ExtAxProcessLogServiceImpl.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/ExtAxProcessLogServiceImpl.java @@ -16,7 +16,11 @@ import javax.annotation.Resource; import java.util.List; import java.util.Objects; -import static cn.axzo.workflow.common.constant.BpmnConstants.*; +import static cn.axzo.workflow.common.constant.BpmnConstants.DUMMY_ASSIGNEE_ID; +import static cn.axzo.workflow.common.constant.BpmnConstants.HIDDEN_ASSIGNEE_ID; +import static cn.axzo.workflow.common.constant.BpmnConstants.NO_ASSIGNEE; +import static cn.axzo.workflow.common.constant.BpmnConstants.ROBOT_ASSIGNEE_ID; +import static cn.axzo.workflow.core.common.enums.BpmnProcessTaskResultEnum.HANDLING; /** * Api Log 表操服务实现 @@ -51,7 +55,7 @@ public class ExtAxProcessLogServiceImpl implements ExtAxProcessLogService { @Override public void updateAssignee(ExtAxProcessLog queryLog, BpmnTaskDelegateAssigner assignee) { - updateAssignee(queryLog, assignee, assignee.getAssignerName()); + updateAssignee(queryLog, assignee, assignee.getAssignerName() + HANDLING.getDesc()); } @@ -63,7 +67,7 @@ public class ExtAxProcessLogServiceImpl implements ExtAxProcessLogService { return; } ExtAxProcessLog update = new ExtAxProcessLog(); - update.setOperationDesc(StringUtils.hasText(operationDesc) ? operationDesc : assignee.getAssignerName()); + update.setOperationDesc(StringUtils.hasText(operationDesc) ? operationDesc : assignee.getAssignerName() + HANDLING.getDesc()); update.setAssigneeFull(Lists.newArrayList(assignee)); update.setAssigneeId(Long.valueOf(assignee.getPersonId())); update.setAssigneeTenantId(assignee.getTenantId()); @@ -79,7 +83,7 @@ public class ExtAxProcessLogServiceImpl implements ExtAxProcessLogService { @Override public ExtAxProcessLog findByProcessIdAndTaskIdWithDeleted(String processId, String taskId) { - return extAxProcessLogMapper.findByProcessIdAndTaskIdWithDeleted(processId,taskId); + return extAxProcessLogMapper.findByProcessIdAndTaskIdWithDeleted(processId, taskId); } @Override