wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-4468) - 调整审批人冗余信息结构

Browse Source
This commit is contained in:
wangli 2025-07-01 15:00:22 +08:00
parent 6d31ebf2ab
commit 9e4ba9220e
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/dto/OrgSnapshotInfo.java
View File

@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.List;
/**
* 组织架构中的项目快照信息
@ -58,8 +59,8 @@ public class OrgSnapshotInfo implements Serializable {
private String topNodeId;
/**
* 别名
* 岗位快照信息集合
*/
private String alias;
private List<JobInfo> jobInfos;
}

5
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/dto/OrgStructureSnapshotInfo.java
View File

@ -53,9 +53,4 @@ public class OrgStructureSnapshotInfo implements Serializable {
*/
private OrgSnapshotInfo entInfo;
/**
* 岗位快照信息集合
*/
private List<JobInfo> jobInfos;
}

14
workflow-engine-server/src/main/java/cn/axzo/workflow/server/engine/ext/listener/TaskEntityEventHandle.java
View File

@ -1,6 +1,5 @@
package cn.axzo.workflow.server.engine.ext.listener;
import cn.axzo.basics.common.util.NumberUtil;
import cn.axzo.foundation.page.PageResp;
import cn.axzo.orggateway.api.cooperateship.CooperateShipHierarchicalQueryApi;
import cn.axzo.orggateway.api.cooperateship.req.ListCooperateShipAncestorReq;
@ -17,7 +16,6 @@ import cn.axzo.workflow.common.model.dto.JobInfo;
import cn.axzo.workflow.common.model.dto.OrgSnapshotInfo;
import cn.axzo.workflow.common.model.dto.OrgStructureSnapshotInfo;
import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner;
import cn.axzo.workflow.core.common.utils.BpmnCollectionUtils;
import cn.axzo.workflow.core.common.utils.BpmnMetaParserHelper;
import cn.axzo.workflow.core.engine.listener.entity.EntityEventHandle;
import cn.axzo.workflow.core.repository.entity.ExtAxProcessLog;
@ -42,7 +40,6 @@ import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@ -185,7 +182,10 @@ public class TaskEntityEventHandle implements EntityEventHandle<TaskEntity> {
.ouName(firstNodeUser.getCooperateShip().getOrganizationalUnitName())
.ouId(String.valueOf(firstNodeUser.getCooperateShip().getOrganizationalUnitId()))
.topNodeId(String.valueOf(firstNodeUser.getTopNodeId()))
.alias("")
.jobInfos(nodeUsers.stream().map(i -> JobInfo.builder()
.jobCode(i.getJob().getCode())
.jobName(i.getJob().getName())
.build()).collect(Collectors.toList()))
.build() : null)
.entInfo(Objects.nonNull(firstNodeUser.getEntCooperateShip()) ? OrgSnapshotInfo.builder()
.workspaceName(firstNodeUser.getEntCooperateShip().getWorkspaceName())
@ -195,12 +195,8 @@ public class TaskEntityEventHandle implements EntityEventHandle<TaskEntity> {
.ouName(firstNodeUser.getEntCooperateShip().getOrganizationalUnitName())
.ouId(String.valueOf(firstNodeUser.getEntCooperateShip().getOrganizationalUnitId()))
.topNodeId(String.valueOf(firstNodeUser.getTopNodeId()))
.alias("")
.jobInfos(Lists.newArrayList())
.build() : null)
.jobInfos(nodeUsers.stream().map(i -> JobInfo.builder()
.jobCode(i.getJob().getCode())
.jobName(i.getJob().getName())
.build()).collect(Collectors.toList()))
.build();
FlowElement flowElement = ProcessDefinitionUtil.getBpmnModel(taskEntity.getProcessDefinitionId()).getFlowElement(taskEntity.getTaskDefinitionKey());