mirror of
https://gitee.com/hhyykk/ipms-sjy.git
synced 2025-02-03 04:04:58 +08:00
【功能修改】 获取模型视图。返回 Simple 模型
This commit is contained in:
parent
4583f161b4
commit
02c654967d
@ -1,5 +1,6 @@
|
||||
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 io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
@ -22,6 +23,9 @@ public class BpmProcessInstanceBpmnModelViewRespVO {
|
||||
@Schema(description = "BPMN XML", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private String bpmnXml;
|
||||
|
||||
@Schema(description = "SIMPLE 模型")
|
||||
private BpmSimpleModelNodeVO simpleModel;
|
||||
|
||||
// ========== 进度信息 ==========
|
||||
|
||||
@Schema(description = "进行中的活动节点编号集合", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
|
@ -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.number.NumberUtils;
|
||||
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.task.vo.instance.BpmProcessInstanceBpmnModelViewRespVO;
|
||||
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceRespVO;
|
||||
@ -119,6 +120,7 @@ public interface BpmProcessInstanceConvert {
|
||||
default BpmProcessInstanceBpmnModelViewRespVO buildProcessInstanceBpmnModelView(HistoricProcessInstance processInstance,
|
||||
List<HistoricTaskInstance> taskInstances,
|
||||
BpmnModel bpmnModel,
|
||||
BpmSimpleModelNodeVO simpleModel,
|
||||
Set<String> unfinishedTaskActivityIds,
|
||||
Set<String> finishedTaskActivityIds,
|
||||
Set<String> finishedSequenceFlowActivityIds,
|
||||
@ -135,6 +137,7 @@ public interface BpmProcessInstanceConvert {
|
||||
.setAssigneeUser(buildUser(task.getAssignee(), userMap, deptMap))
|
||||
.setOwnerUser(buildUser(task.getOwner(), userMap, deptMap))));
|
||||
respVO.setBpmnXml(BpmnModelUtils.getBpmnXml(bpmnModel));
|
||||
respVO.setSimpleModel(simpleModel);
|
||||
// 进度信息
|
||||
respVO.setUnfinishedTaskActivityIds(unfinishedTaskActivityIds)
|
||||
.setFinishedTaskActivityIds(finishedTaskActivityIds)
|
||||
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user