From 041d8399ba980cde6a8550893f2ac72a9bcdaf02 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期四, 09 五月 2024 21:40:54 +0800
Subject: [PATCH] add 补充说明
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java | 195 ++++++++++++++++++++++++++++--------------------
1 files changed, 115 insertions(+), 80 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
index 0b18e9f..6339302 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
@@ -3,14 +3,16 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.ObjectUtil;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.workflow.common.constant.FlowConstant;
@@ -20,10 +22,7 @@
import org.dromara.workflow.domain.bo.ProcessInstanceBo;
import org.dromara.workflow.domain.bo.ProcessInvalidBo;
import org.dromara.workflow.domain.bo.TaskUrgingBo;
-import org.dromara.workflow.domain.vo.ActHistoryInfoVo;
-import org.dromara.workflow.domain.vo.GraphicInfoVo;
-import org.dromara.workflow.domain.vo.ProcessInstanceVo;
-import org.dromara.workflow.domain.vo.TaskVo;
+import org.dromara.workflow.domain.vo.*;
import org.dromara.workflow.flowable.CustomDefaultProcessDiagramGenerator;
import org.dromara.workflow.flowable.cmd.DeleteExecutionCmd;
import org.dromara.workflow.flowable.cmd.ExecutionChildByExecutionIdCmd;
@@ -31,6 +30,8 @@
import org.dromara.workflow.flowable.strategy.FlowProcessEventHandler;
import org.dromara.workflow.service.IActHiProcinstService;
import org.dromara.workflow.service.IActProcessInstanceService;
+import org.dromara.workflow.service.IWfNodeConfigService;
+import org.dromara.workflow.service.IWfTaskBackNodeService;
import org.dromara.workflow.utils.QueryUtils;
import org.dromara.workflow.utils.WorkflowUtils;
import org.flowable.bpmn.model.*;
@@ -52,13 +53,11 @@
import org.springframework.transaction.annotation.Transactional;
import java.awt.*;
-import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
-
/**
* 娴佺▼瀹炰緥 鏈嶅姟灞傚疄鐜�
@@ -77,6 +76,8 @@
private final IActHiProcinstService actHiProcinstService;
private final ManagementService managementService;
private final FlowEventStrategy flowEventStrategy;
+ private final IWfTaskBackNodeService wfTaskBackNodeService;
+ private final IWfNodeConfigService wfNodeConfigService;
@Value("${flowable.activity-font-name}")
private String activityFontName;
@@ -90,72 +91,96 @@
/**
* 鍒嗛〉鏌ヨ姝ｅ湪杩愯鐨勬祦绋嬪疄渚�
*
- * @param processInstanceBo 鍙傛暟
+ * @param bo 鍙傛暟
*/
@Override
- public TableDataInfo<ProcessInstanceVo> getProcessInstanceRunningByPage(ProcessInstanceBo processInstanceBo) {
+ public TableDataInfo<ProcessInstanceVo> getPageByRunning(ProcessInstanceBo bo, PageQuery pageQuery) {
List<ProcessInstanceVo> list = new ArrayList<>();
ProcessInstanceQuery query = QueryUtils.instanceQuery();
- if (StringUtils.isNotBlank(processInstanceBo.getName())) {
- query.processInstanceNameLikeIgnoreCase("%" + processInstanceBo.getName() + "%");
+ if (StringUtils.isNotBlank(bo.getName())) {
+ query.processInstanceNameLikeIgnoreCase("%" + bo.getName() + "%");
}
- if (StringUtils.isNotBlank(processInstanceBo.getKey())) {
- query.processDefinitionKey(processInstanceBo.getKey());
+ if (StringUtils.isNotBlank(bo.getKey())) {
+ query.processDefinitionKey(bo.getKey());
}
- if (StringUtils.isNotBlank(processInstanceBo.getStartUserId())) {
- query.startedBy(processInstanceBo.getStartUserId());
+ if (StringUtils.isNotBlank(bo.getStartUserId())) {
+ query.startedBy(bo.getStartUserId());
}
- if (StringUtils.isNotBlank(processInstanceBo.getBusinessKey())) {
- query.processInstanceBusinessKey(processInstanceBo.getBusinessKey());
+ if (StringUtils.isNotBlank(bo.getBusinessKey())) {
+ query.processInstanceBusinessKey(bo.getBusinessKey());
}
- if (StringUtils.isNotBlank(processInstanceBo.getCategoryCode())) {
- query.processDefinitionCategory(processInstanceBo.getCategoryCode());
+ if (StringUtils.isNotBlank(bo.getCategoryCode())) {
+ query.processDefinitionCategory(bo.getCategoryCode());
}
query.orderByStartTime().desc();
- List<ProcessInstance> processInstances = query.listPage(processInstanceBo.getPageNum(), processInstanceBo.getPageSize());
+ List<ProcessInstance> processInstances = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
for (ProcessInstance processInstance : processInstances) {
ProcessInstanceVo processInstanceVo = BeanUtil.toBean(processInstance, ProcessInstanceVo.class);
processInstanceVo.setIsSuspended(processInstance.isSuspended());
processInstanceVo.setBusinessStatusName(BusinessStatusEnum.findByStatus(processInstance.getBusinessStatus()));
list.add(processInstanceVo);
}
+ if (CollUtil.isNotEmpty(list)) {
+ List<String> processDefinitionIds = StreamUtils.toList(list, ProcessInstanceVo::getProcessDefinitionId);
+ List<WfNodeConfigVo> wfNodeConfigVoList = wfNodeConfigService.selectByDefIds(processDefinitionIds);
+ for (ProcessInstanceVo processInstanceVo : list) {
+ if (CollUtil.isNotEmpty(wfNodeConfigVoList)) {
+ wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(processInstanceVo.getProcessDefinitionId()) && FlowConstant.TRUE.equals(e.getApplyUserTask())).findFirst().ifPresent(processInstanceVo::setWfNodeConfigVo);
+ }
+ }
+ }
long count = query.count();
- return new TableDataInfo<>(list, count);
+ TableDataInfo<ProcessInstanceVo> build = TableDataInfo.build();
+ build.setRows(list);
+ build.setTotal(count);
+ return build;
}
/**
* 鍒嗛〉鏌ヨ宸茬粨鏉熺殑娴佺▼瀹炰緥
*
- * @param processInstanceBo 鍙傛暟
+ * @param bo 鍙傛暟
*/
@Override
- public TableDataInfo<ProcessInstanceVo> getProcessInstanceFinishByPage(ProcessInstanceBo processInstanceBo) {
+ public TableDataInfo<ProcessInstanceVo> getPageByFinish(ProcessInstanceBo bo, PageQuery pageQuery) {
List<ProcessInstanceVo> list = new ArrayList<>();
HistoricProcessInstanceQuery query = QueryUtils.hisInstanceQuery()
.finished().orderByProcessInstanceEndTime().desc();
- if (StringUtils.isNotEmpty(processInstanceBo.getName())) {
- query.processInstanceNameLikeIgnoreCase("%" + processInstanceBo.getName() + "%");
+ if (StringUtils.isNotEmpty(bo.getName())) {
+ query.processInstanceNameLikeIgnoreCase("%" + bo.getName() + "%");
}
- if (StringUtils.isNotBlank(processInstanceBo.getKey())) {
- query.processDefinitionKey(processInstanceBo.getKey());
+ if (StringUtils.isNotBlank(bo.getKey())) {
+ query.processDefinitionKey(bo.getKey());
}
- if (StringUtils.isNotEmpty(processInstanceBo.getStartUserId())) {
- query.startedBy(processInstanceBo.getStartUserId());
+ if (StringUtils.isNotEmpty(bo.getStartUserId())) {
+ query.startedBy(bo.getStartUserId());
}
- if (StringUtils.isNotBlank(processInstanceBo.getBusinessKey())) {
- query.processInstanceBusinessKey(processInstanceBo.getBusinessKey());
+ if (StringUtils.isNotBlank(bo.getBusinessKey())) {
+ query.processInstanceBusinessKey(bo.getBusinessKey());
}
- if (StringUtils.isNotBlank(processInstanceBo.getCategoryCode())) {
- query.processDefinitionCategory(processInstanceBo.getCategoryCode());
+ if (StringUtils.isNotBlank(bo.getCategoryCode())) {
+ query.processDefinitionCategory(bo.getCategoryCode());
}
- List<HistoricProcessInstance> historicProcessInstances = query.listPage(processInstanceBo.getPageNum(), processInstanceBo.getPageSize());
+ List<HistoricProcessInstance> historicProcessInstances = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
for (HistoricProcessInstance historicProcessInstance : historicProcessInstances) {
ProcessInstanceVo processInstanceVo = BeanUtil.toBean(historicProcessInstance, ProcessInstanceVo.class);
processInstanceVo.setBusinessStatusName(BusinessStatusEnum.findByStatus(historicProcessInstance.getBusinessStatus()));
list.add(processInstanceVo);
}
+ if (CollUtil.isNotEmpty(list)) {
+ List<String> processDefinitionIds = StreamUtils.toList(list, ProcessInstanceVo::getProcessDefinitionId);
+ List<WfNodeConfigVo> wfNodeConfigVoList = wfNodeConfigService.selectByDefIds(processDefinitionIds);
+ for (ProcessInstanceVo processInstanceVo : list) {
+ if (CollUtil.isNotEmpty(wfNodeConfigVoList)) {
+ wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(processInstanceVo.getProcessDefinitionId()) && FlowConstant.TRUE.equals(e.getApplyUserTask())).findFirst().ifPresent(processInstanceVo::setWfNodeConfigVo);
+ }
+ }
+ }
long count = query.count();
- return new TableDataInfo<>(list, count);
+ TableDataInfo<ProcessInstanceVo> build = TableDataInfo.build();
+ build.setRows(list);
+ build.setTotal(count);
+ return build;
}
/**
@@ -165,7 +190,7 @@
*/
@SneakyThrows
@Override
- public String getHistoryProcessImage(String processInstanceId) {
+ public String getHistoryImage(String processInstanceId) {
String processDefinitionId;
// 鑾峰彇褰撳墠鐨勬祦绋嬪疄渚�
ProcessInstance processInstance = QueryUtils.instanceQuery(processInstanceId).singleResult();
@@ -211,7 +236,7 @@
BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinitionId);
CustomDefaultProcessDiagramGenerator diagramGenerator = new CustomDefaultProcessDiagramGenerator();
InputStream inputStream = diagramGenerator.generateDiagram(bpmnModel, "png", highLightedNodeList, highLightedFlows, activityFontName, labelFontName, annotationFontName, null, 1.0, true);
- return Base64.encode(IOUtils.toByteArray(inputStream));
+ return Base64.encode(IoUtil.readBytes(inputStream));
}
/**
@@ -220,7 +245,7 @@
* @param processInstanceId 娴佺▼瀹炰緥id
*/
@Override
- public Map<String, Object> getHistoryProcessList(String processInstanceId) {
+ public Map<String, Object> getHistoryList(String processInstanceId) {
Map<String, Object> map = new HashMap<>();
List<Map<String, Object>> taskList = new ArrayList<>();
HistoricProcessInstance historicProcessInstance = QueryUtils.hisInstanceQuery(processInstanceId).singleResult();
@@ -257,14 +282,9 @@
map.put("taskList", taskList);
List<ActHistoryInfoVo> historyTaskList = getHistoryTaskList(processInstanceId);
map.put("historyList", historyTaskList);
- InputStream inputStream;
- try {
- inputStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(), processDefinition.getResourceName());
- xml.append(IOUtils.toString(inputStream, String.valueOf(StandardCharsets.UTF_8)));
- map.put("xml", xml.toString());
- } catch (IOException e) {
- e.printStackTrace();
- }
+ InputStream inputStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(), processDefinition.getResourceName());
+ xml.append(IoUtil.read(inputStream, StandardCharsets.UTF_8));
+ map.put("xml", xml.toString());
return map;
}
@@ -298,6 +318,12 @@
historyInfoVo.setStartTime(e.getStartTime());
historyInfoVo.setEndTime(null);
historyInfoVo.setRunDuration(null);
+ if (ObjectUtil.isEmpty(e.getAssignee())) {
+ ParticipantVo participantVo = WorkflowUtils.getCurrentTaskParticipant(e.getId());
+ if (ObjectUtil.isNotEmpty(participantVo) && CollUtil.isNotEmpty(participantVo.getCandidate())) {
+ historyInfoVo.setAssignee(StreamUtils.join(participantVo.getCandidate(), Convert::toStr));
+ }
+ }
});
historyInfoVoList.add(historyInfoVo);
}
@@ -336,16 +362,18 @@
if (ObjectUtil.isNotEmpty(historicTaskInstance.getDurationInMillis())) {
actHistoryInfoVo.setRunDuration(getDuration(historicTaskInstance.getDurationInMillis()));
}
- try {
- actHistoryInfoVo.setAssignee(StringUtils.isNotBlank(historicTaskInstance.getAssignee()) ? Long.valueOf(historicTaskInstance.getAssignee()) : null);
- } catch (NumberFormatException ignored) {
- log.warn("褰撳墠浠诲姟銆恵}銆�,鍔炵悊浜鸿浆鎹汉鍛業D銆恵}銆戝紓甯革紒", historicTaskInstance.getName(), historicTaskInstance.getAssignee());
- }
//闄勪欢
if (CollUtil.isNotEmpty(attachmentList)) {
List<Attachment> attachments = attachmentList.stream().filter(e -> e.getTaskId().equals(historicTaskInstance.getId())).collect(Collectors.toList());
if (CollUtil.isNotEmpty(attachments)) {
actHistoryInfoVo.setAttachmentList(attachments);
+ }
+ }
+ //璁剧疆浜哄憳id
+ if (ObjectUtil.isEmpty(historicTaskInstance.getAssignee())) {
+ ParticipantVo participantVo = WorkflowUtils.getCurrentTaskParticipant(historicTaskInstance.getId());
+ if (ObjectUtil.isNotEmpty(participantVo) && CollUtil.isNotEmpty(participantVo.getCandidate())) {
+ actHistoryInfoVo.setAssignee(StreamUtils.join(participantVo.getCandidate(), Convert::toStr));
}
}
actHistoryInfoVoList.add(actHistoryInfoVo);
@@ -363,10 +391,6 @@
Map<String, List<ActHistoryInfoVo>> groupByKey = StreamUtils.groupByKey(actHistoryInfoVoList, ActHistoryInfoVo::getTaskDefinitionKey);
for (Map.Entry<String, List<ActHistoryInfoVo>> entry : groupByKey.entrySet()) {
ActHistoryInfoVo actHistoryInfoVo = BeanUtil.toBean(entry.getValue().get(0), ActHistoryInfoVo.class);
- String nickName = entry.getValue().stream().filter(e -> StringUtils.isNotBlank(e.getNickName()) && e.getEndTime() == null).map(ActHistoryInfoVo::getNickName).toList().stream().distinct().collect(Collectors.joining(StringUtils.SEPARATOR));
- if (StringUtils.isNotBlank(nickName)) {
- actHistoryInfoVo.setNickName(nickName);
- }
actHistoryInfoVoList.stream().filter(e -> e.getTaskDefinitionKey().equals(entry.getKey()) && e.getEndTime() != null).findFirst()
.ifPresent(e -> {
actHistoryInfoVo.setStatus("宸插鐞�");
@@ -449,7 +473,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean deleteRuntimeProcessInst(ProcessInvalidBo processInvalidBo) {
+ public boolean deleteRunInstance(ProcessInvalidBo processInvalidBo) {
try {
List<Task> list = QueryUtils.taskQuery(processInvalidBo.getProcessInstanceId()).list();
List<Task> subTasks = StreamUtils.filter(list, e -> StringUtils.isNotBlank(e.getParentTaskId()));
@@ -463,10 +487,8 @@
for (Task task : StreamUtils.filter(list, e -> StringUtils.isBlank(e.getParentTaskId()))) {
taskService.addComment(task.getId(), task.getProcessInstanceId(), TaskStatusEnum.INVALID.getStatus(), deleteReason);
}
- HistoricProcessInstance historicProcessInstance = QueryUtils.hisInstanceQuery(processInvalidBo.getProcessInstanceId()).singleResult();
- if (ObjectUtil.isNotEmpty(historicProcessInstance) && BusinessStatusEnum.FINISH.getStatus().equals(historicProcessInstance.getBusinessStatus())) {
- throw new ServiceException("璇ュ崟鎹凡瀹屾垚鐢宠锛�");
- }
+ HistoricProcessInstance historicProcessInstance = QueryUtils.hisInstanceQuery(processInvalidBo.getProcessInstanceId()).singleResult();
+ BusinessStatusEnum.checkInvalidStatus(historicProcessInstance.getBusinessStatus());
runtimeService.updateBusinessStatus(processInvalidBo.getProcessInstanceId(), BusinessStatusEnum.INVALID.getStatus());
runtimeService.deleteProcessInstance(processInvalidBo.getProcessInstanceId(), deleteReason);
FlowProcessEventHandler processHandler = flowEventStrategy.getProcessHandler(historicProcessInstance.getProcessDefinitionKey());
@@ -487,7 +509,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean deleteRuntimeProcessAndHisInst(List<String> processInstanceIds) {
+ public boolean deleteRunAndHisInstance(List<String> processInstanceIds) {
try {
// 1.鍒犻櫎杩愯涓祦绋嬪疄渚�
List<Task> list = QueryUtils.taskQuery(processInstanceIds).list();
@@ -501,6 +523,7 @@
if (ObjectUtil.isNotEmpty(historicProcessInstanceList)) {
historyService.bulkDeleteHistoricProcessInstances(processInstanceIds);
}
+ wfTaskBackNodeService.deleteByInstanceIds(processInstanceIds);
return true;
} catch (Exception e) {
e.printStackTrace();
@@ -515,7 +538,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean deleteRuntimeProcessAndHisInstByBusinessKeys(List<String> businessKeys) {
+ public boolean deleteRunAndHisInstanceByBusinessKeys(List<String> businessKeys) {
try {
// 1.鍒犻櫎杩愯涓祦绋嬪疄渚�
List<ActHiProcinst> actHiProcinsts = actHiProcinstService.selectByBusinessKeyIn(businessKeys);
@@ -535,6 +558,7 @@
if (ObjectUtil.isNotEmpty(historicProcessInstanceList)) {
historyService.bulkDeleteHistoricProcessInstances(processInstanceIds);
}
+ wfTaskBackNodeService.deleteByInstanceIds(processInstanceIds);
return true;
} catch (Exception e) {
e.printStackTrace();
@@ -549,9 +573,10 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean deleteFinishProcessAndHisInst(List<String> processInstanceIds) {
+ public boolean deleteFinishAndHisInstance(List<String> processInstanceIds) {
try {
historyService.bulkDeleteHistoricProcessInstances(processInstanceIds);
+ wfTaskBackNodeService.deleteByInstanceIds(processInstanceIds);
return true;
} catch (Exception e) {
e.printStackTrace();
@@ -576,12 +601,10 @@
if (processInstance.isSuspended()) {
throw new ServiceException(FlowConstant.MESSAGE_SUSPENDED);
}
- if (BusinessStatusEnum.CANCEL.getStatus().equals(processInstance.getBusinessStatus())) {
- throw new ServiceException("璇ュ崟鎹凡鎾ら攢锛�");
- }
+ BusinessStatusEnum.checkCancelStatus(processInstance.getBusinessStatus());
List<Task> taskList = QueryUtils.taskQuery(processInstanceId).list();
for (Task task : taskList) {
- taskService.setAssignee(task.getId(), String.valueOf(LoginHelper.getUserId()));
+ taskService.setAssignee(task.getId(), null);
taskService.addComment(task.getId(), processInstanceId, TaskStatusEnum.CANCEL.getStatus(), LoginHelper.getLoginUser().getNickname() + "锛氭挙閿�鐢宠");
}
HistoricTaskInstance historicTaskInstance = QueryUtils.hisTaskInstanceQuery().finished().orderByHistoricTaskInstanceEndTime().asc().list().get(0);
@@ -614,27 +637,27 @@
/**
* 鍒嗛〉鏌ヨ褰撳墠鐧诲綍浜哄崟鎹�
*
- * @param processInstanceBo 鍙傛暟
+ * @param bo 鍙傛暟
*/
@Override
- public TableDataInfo<ProcessInstanceVo> getCurrentSubmitByPage(ProcessInstanceBo processInstanceBo) {
+ public TableDataInfo<ProcessInstanceVo> getPageByCurrent(ProcessInstanceBo bo, PageQuery pageQuery) {
List<ProcessInstanceVo> list = new ArrayList<>();
HistoricProcessInstanceQuery query = QueryUtils.hisInstanceQuery();
- query.startedBy(processInstanceBo.getStartUserId());
- if (StringUtils.isNotBlank(processInstanceBo.getName())) {
- query.processInstanceNameLikeIgnoreCase("%" + processInstanceBo.getName() + "%");
+ query.startedBy(String.valueOf(LoginHelper.getUserId()));
+ if (StringUtils.isNotBlank(bo.getName())) {
+ query.processInstanceNameLikeIgnoreCase("%" + bo.getName() + "%");
}
- if (StringUtils.isNotBlank(processInstanceBo.getKey())) {
- query.processDefinitionKey(processInstanceBo.getKey());
+ if (StringUtils.isNotBlank(bo.getKey())) {
+ query.processDefinitionKey(bo.getKey());
}
- if (StringUtils.isNotBlank(processInstanceBo.getBusinessKey())) {
- query.processInstanceBusinessKey(processInstanceBo.getBusinessKey());
+ if (StringUtils.isNotBlank(bo.getBusinessKey())) {
+ query.processInstanceBusinessKey(bo.getBusinessKey());
}
- if (StringUtils.isNotBlank(processInstanceBo.getCategoryCode())) {
- query.processDefinitionCategory(processInstanceBo.getCategoryCode());
+ if (StringUtils.isNotBlank(bo.getCategoryCode())) {
+ query.processDefinitionCategory(bo.getCategoryCode());
}
query.orderByProcessInstanceStartTime().desc();
- List<HistoricProcessInstance> historicProcessInstanceList = query.listPage(processInstanceBo.getPageNum(), processInstanceBo.getPageSize());
+ List<HistoricProcessInstance> historicProcessInstanceList = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
List<TaskVo> taskVoList = new ArrayList<>();
if (CollUtil.isNotEmpty(historicProcessInstanceList)) {
List<String> processInstanceIds = StreamUtils.toList(historicProcessInstanceList, HistoricProcessInstance::getId);
@@ -652,8 +675,20 @@
}
list.add(processInstanceVo);
}
+ if (CollUtil.isNotEmpty(list)) {
+ List<String> processDefinitionIds = StreamUtils.toList(list, ProcessInstanceVo::getProcessDefinitionId);
+ List<WfNodeConfigVo> wfNodeConfigVoList = wfNodeConfigService.selectByDefIds(processDefinitionIds);
+ for (ProcessInstanceVo processInstanceVo : list) {
+ if (CollUtil.isNotEmpty(wfNodeConfigVoList)) {
+ wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(processInstanceVo.getProcessDefinitionId()) && FlowConstant.TRUE.equals(e.getApplyUserTask())).findFirst().ifPresent(processInstanceVo::setWfNodeConfigVo);
+ }
+ }
+ }
long count = query.count();
- return new TableDataInfo<>(list, count);
+ TableDataInfo<ProcessInstanceVo> build = TableDataInfo.build();
+ build.setRows(list);
+ build.setTotal(count);
+ return build;
}
/**
--
Gitblit v1.9.3