opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-20 18:15:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update 调整获取审批记录

Browse Source
This commit is contained in:
gssong 2023-12-10 12:31:51 +08:00
parent 6f44793219
commit 0774b7f25b
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
View File

@ -31,10 +31,7 @@ import org.dromara.workflow.flowable.cmd.ExecutionChildByExecutionIdCmd;
import org.dromara.workflow.service.IActHiProcinstService; import org.dromara.workflow.service.IActHiProcinstService;
import org.dromara.workflow.service.IActProcessInstanceService; import org.dromara.workflow.service.IActProcessInstanceService;
import org.dromara.workflow.utils.WorkflowUtils; import org.dromara.workflow.utils.WorkflowUtils;
import org.flowable.bpmn.model.BpmnModel; import org.flowable.bpmn.model.*;
import org.flowable.bpmn.model.FlowElement;
import org.flowable.bpmn.model.GraphicInfo;
import org.flowable.bpmn.model.UserTask;
import org.flowable.engine.*; import org.flowable.engine.*;
import org.flowable.engine.history.HistoricActivityInstance; import org.flowable.engine.history.HistoricActivityInstance;
import org.flowable.engine.history.HistoricProcessInstance; import org.flowable.engine.history.HistoricProcessInstance;
@ -294,6 +291,18 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
graphicInfoVo.setNodeName(flowElement.getName()); graphicInfoVo.setNodeName(flowElement.getName());
graphicInfoVos.add(graphicInfoVo); graphicInfoVos.add(graphicInfoVo);
} }
if (flowElement instanceof SubProcess) {
Collection<FlowElement> subFlowElements = ((SubProcess) flowElement).getFlowElements();
for (FlowElement element : subFlowElements) {
if (element instanceof UserTask) {
GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(element.getId());
GraphicInfoVo graphicInfoVo = BeanUtil.toBean(graphicInfo, GraphicInfoVo.class);
graphicInfoVo.setNodeId(element.getId());
graphicInfoVo.setNodeName(element.getName());
graphicInfoVos.add(graphicInfoVo);
}
}
}
} }
//节点图形信息 //节点图形信息
map.put("graphicInfoVos", graphicInfoVos); map.put("graphicInfoVos", graphicInfoVos);