【功能修改】 获取模型视图。返回 Simple 模型

This commit is contained in:
jason 2024-10-28 09:46:39 +08:00
parent 4583f161b4
commit 02c654967d
3 changed files with 8 additions and 1 deletions

View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance; package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO; import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@ -22,6 +23,9 @@ public class BpmProcessInstanceBpmnModelViewRespVO {
@Schema(description = "BPMN XML", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "BPMN XML", requiredMode = Schema.RequiredMode.REQUIRED)
private String bpmnXml; private String bpmnXml;
@Schema(description = "SIMPLE 模型")
private BpmSimpleModelNodeVO simpleModel;
// ========== 进度信息 ========== // ========== 进度信息 ==========
@Schema(description = "进行中的活动节点编号集合", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "进行中的活动节点编号集合", requiredMode = Schema.RequiredMode.REQUIRED)

View File

@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.MapUtils; import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.common.util.number.NumberUtils; import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO; import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO;
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceBpmnModelViewRespVO; import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceBpmnModelViewRespVO;
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceRespVO; import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceRespVO;
@ -119,6 +120,7 @@ public interface BpmProcessInstanceConvert {
default BpmProcessInstanceBpmnModelViewRespVO buildProcessInstanceBpmnModelView(HistoricProcessInstance processInstance, default BpmProcessInstanceBpmnModelViewRespVO buildProcessInstanceBpmnModelView(HistoricProcessInstance processInstance,
List<HistoricTaskInstance> taskInstances, List<HistoricTaskInstance> taskInstances,
BpmnModel bpmnModel, BpmnModel bpmnModel,
BpmSimpleModelNodeVO simpleModel,
Set<String> unfinishedTaskActivityIds, Set<String> unfinishedTaskActivityIds,
Set<String> finishedTaskActivityIds, Set<String> finishedTaskActivityIds,
Set<String> finishedSequenceFlowActivityIds, Set<String> finishedSequenceFlowActivityIds,
@ -135,6 +137,7 @@ public interface BpmProcessInstanceConvert {
.setAssigneeUser(buildUser(task.getAssignee(), userMap, deptMap)) .setAssigneeUser(buildUser(task.getAssignee(), userMap, deptMap))
.setOwnerUser(buildUser(task.getOwner(), userMap, deptMap)))); .setOwnerUser(buildUser(task.getOwner(), userMap, deptMap))));
respVO.setBpmnXml(BpmnModelUtils.getBpmnXml(bpmnModel)); respVO.setBpmnXml(BpmnModelUtils.getBpmnXml(bpmnModel));
respVO.setSimpleModel(simpleModel);
// 进度信息 // 进度信息
respVO.setUnfinishedTaskActivityIds(unfinishedTaskActivityIds) respVO.setUnfinishedTaskActivityIds(unfinishedTaskActivityIds)
.setFinishedTaskActivityIds(finishedTaskActivityIds) .setFinishedTaskActivityIds(finishedTaskActivityIds)