|
|
@@ -35,10 +35,10 @@ import javax.annotation.Resource;
|
|
|
import javax.validation.Valid;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
|
|
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
|
|
|
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
|
|
|
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
|
|
|
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
|
|
|
|
|
|
@Tag(name = "管理后台 - 流程实例") // 流程实例,通过流程定义创建的一次“申请”
|
|
|
@@ -77,13 +77,17 @@ public class BpmProcessInstanceController {
|
|
|
convertList(pageResult.getList(), HistoricProcessInstance::getId));
|
|
|
Map<String, ProcessDefinition> processDefinitionMap = processDefinitionService.getProcessDefinitionMap(
|
|
|
convertSet(pageResult.getList(), HistoricProcessInstance::getProcessDefinitionId));
|
|
|
+ List<Task> tasksByProcessInstanceIds = taskService.getTasksByProcessInstanceIds(pageResult.getList().stream().map(HistoricProcessInstance::getId).collect(Collectors.toList()));
|
|
|
+ List<Long> collect = tasksByProcessInstanceIds.stream().map(task -> Long.valueOf(task.getAssignee())).collect(Collectors.toList());
|
|
|
+ List<AdminUserRespDTO> userList = adminUserApi.getUserList(collect);
|
|
|
+ Map<Long, AdminUserRespDTO> userMap = convertMap(userList, AdminUserRespDTO::getId);
|
|
|
Map<String, BpmCategoryDO> categoryMap = categoryService.getCategoryMap(
|
|
|
convertSet(processDefinitionMap.values(), ProcessDefinition::getCategory));
|
|
|
Map<String, BpmProcessDefinitionExtDO> bpmProcessDefinitionExtDOMap = processDefinitionService.getProcessDefinitionExtMap(
|
|
|
convertSet(pageResult.getList(), HistoricProcessInstance::getProcessDefinitionId)
|
|
|
);
|
|
|
return success(BpmProcessInstanceConvert.INSTANCE.buildProcessInstancePage(pageResult,
|
|
|
- processDefinitionMap, categoryMap, taskMap, null, null, bpmProcessDefinitionExtDOMap));
|
|
|
+ processDefinitionMap, categoryMap, taskMap, userMap, null, bpmProcessDefinitionExtDOMap));
|
|
|
}
|
|
|
|
|
|
@GetMapping("/manager-page")
|