From 651b2e140ba842126c4177df1b909b2b764ecdb8 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期日, 31 三月 2024 15:34:27 +0800
Subject: [PATCH] add 添加表单配置
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java | 73 +++++++++++++++++++++++-------------
1 files changed, 46 insertions(+), 27 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
index 44d6932..871db16 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
@@ -30,6 +30,7 @@
import org.dromara.workflow.mapper.ActHiTaskinstMapper;
import org.dromara.workflow.mapper.ActTaskMapper;
import org.dromara.workflow.service.IActTaskService;
+import org.dromara.workflow.service.IWfNodeConfigService;
import org.dromara.workflow.service.IWfTaskBackNodeService;
import org.dromara.workflow.utils.ModelUtils;
import org.dromara.workflow.utils.QueryUtils;
@@ -76,6 +77,7 @@
private final ActTaskMapper actTaskMapper;
private final IWfTaskBackNodeService iWfTaskBackNodeService;
private final ActHiTaskinstMapper actHiTaskinstMapper;
+ private final IWfNodeConfigService iWfNodeConfigService;
/**
* 鍚姩浠诲姟
@@ -273,13 +275,17 @@
List<TaskVo> taskList = page.getRecords();
if (CollUtil.isNotEmpty(taskList)) {
+ List<String> processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId);
+ List<WfNodeConfigVo> wfNodeConfigVoList = iWfNodeConfigService.selectByDefIds(processDefinitionIds);
for (TaskVo task : taskList) {
task.setBusinessStatusName(BusinessStatusEnum.findByStatus(task.getBusinessStatus()));
task.setParticipantVo(WorkflowUtils.getCurrentTaskParticipant(task.getId()));
task.setMultiInstance(WorkflowUtils.isMultiInstance(task.getProcessDefinitionId(), task.getTaskDefinitionKey()) != null);
+ if (CollUtil.isNotEmpty(wfNodeConfigVoList)) {
+ wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(task.getProcessDefinitionId()) && e.getNodeId().equals(task.getTaskDefinitionKey())).findFirst().ifPresent(task::setWfNodeConfigVo);
+ }
}
- List<String> processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId);
- WorkflowUtils.setWfFormDefinitionVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID);
+ WorkflowUtils.setWfDefinitionConfigVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID);
}
return TableDataInfo.build(page);
}
@@ -322,25 +328,29 @@
processInstanceList = QueryUtils.instanceQuery(processInstanceIds).list();
}
List<TaskVo> list = new ArrayList<>();
- for (Task task : taskList) {
- TaskVo taskVo = BeanUtil.toBean(task, TaskVo.class);
- if (CollUtil.isNotEmpty(processInstanceList)) {
- processInstanceList.stream().filter(e -> e.getId().equals(task.getProcessInstanceId())).findFirst().ifPresent(e -> {
- taskVo.setBusinessStatus(e.getBusinessStatus());
- taskVo.setBusinessStatusName(BusinessStatusEnum.findByStatus(taskVo.getBusinessStatus()));
- taskVo.setProcessDefinitionKey(e.getProcessDefinitionKey());
- taskVo.setProcessDefinitionName(e.getProcessDefinitionName());
- taskVo.setBusinessKey(e.getBusinessKey());
- });
+ if (CollUtil.isNotEmpty(taskList)) {
+ List<String> processDefinitionIds = StreamUtils.toList(taskList, Task::getProcessDefinitionId);
+ List<WfNodeConfigVo> wfNodeConfigVoList = iWfNodeConfigService.selectByDefIds(processDefinitionIds);
+ for (Task task : taskList) {
+ TaskVo taskVo = BeanUtil.toBean(task, TaskVo.class);
+ if (CollUtil.isNotEmpty(processInstanceList)) {
+ processInstanceList.stream().filter(e -> e.getId().equals(task.getProcessInstanceId())).findFirst().ifPresent(e -> {
+ taskVo.setBusinessStatus(e.getBusinessStatus());
+ taskVo.setBusinessStatusName(BusinessStatusEnum.findByStatus(taskVo.getBusinessStatus()));
+ taskVo.setProcessDefinitionKey(e.getProcessDefinitionKey());
+ taskVo.setProcessDefinitionName(e.getProcessDefinitionName());
+ taskVo.setBusinessKey(e.getBusinessKey());
+ });
+ }
+ taskVo.setAssignee(StringUtils.isNotBlank(task.getAssignee()) ? Long.valueOf(task.getAssignee()) : null);
+ taskVo.setParticipantVo(WorkflowUtils.getCurrentTaskParticipant(task.getId()));
+ taskVo.setMultiInstance(WorkflowUtils.isMultiInstance(task.getProcessDefinitionId(), task.getTaskDefinitionKey()) != null);
+ if (CollUtil.isNotEmpty(wfNodeConfigVoList)) {
+ wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(task.getProcessDefinitionId()) && e.getNodeId().equals(task.getTaskDefinitionKey())).findFirst().ifPresent(taskVo::setWfNodeConfigVo);
+ }
+ list.add(taskVo);
}
- taskVo.setAssignee(StringUtils.isNotBlank(task.getAssignee()) ? Long.valueOf(task.getAssignee()) : null);
- taskVo.setParticipantVo(WorkflowUtils.getCurrentTaskParticipant(task.getId()));
- taskVo.setMultiInstance(WorkflowUtils.isMultiInstance(task.getProcessDefinitionId(), task.getTaskDefinitionKey()) != null);
- list.add(taskVo);
- }
- if (CollUtil.isNotEmpty(list)) {
- List<String> processDefinitionIds = StreamUtils.toList(list, TaskVo::getProcessDefinitionId);
- WorkflowUtils.setWfFormDefinitionVo(list, processDefinitionIds, PROCESS_DEFINITION_ID);
+ WorkflowUtils.setWfDefinitionConfigVo(list, processDefinitionIds, PROCESS_DEFINITION_ID);
}
long count = query.count();
TableDataInfo<TaskVo> build = TableDataInfo.build();
@@ -366,11 +376,15 @@
List<TaskVo> taskList = page.getRecords();
if (CollUtil.isNotEmpty(taskList)) {
+ List<String> processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId);
+ List<WfNodeConfigVo> wfNodeConfigVoList = iWfNodeConfigService.selectByDefIds(processDefinitionIds);
for (TaskVo task : taskList) {
task.setBusinessStatusName(BusinessStatusEnum.findByStatus(task.getBusinessStatus()));
+ if (CollUtil.isNotEmpty(wfNodeConfigVoList)) {
+ wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(task.getProcessDefinitionId()) && e.getNodeId().equals(task.getTaskDefinitionKey())).findFirst().ifPresent(task::setWfNodeConfigVo);
+ }
}
- List<String> processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId);
- WorkflowUtils.setWfFormDefinitionVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID);
+ WorkflowUtils.setWfDefinitionConfigVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID);
}
return TableDataInfo.build(page);
}
@@ -397,12 +411,17 @@
Page<TaskVo> page = actTaskMapper.getTaskCopyByPage(pageQuery.build(), queryWrapper);
List<TaskVo> taskList = page.getRecords();
- for (TaskVo task : taskList) {
- task.setBusinessStatusName(BusinessStatusEnum.findByStatus(task.getBusinessStatus()));
- }
if (CollUtil.isNotEmpty(taskList)) {
List<String> processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId);
- WorkflowUtils.setWfFormDefinitionVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID);
+ List<WfNodeConfigVo> wfNodeConfigVoList = iWfNodeConfigService.selectByDefIds(processDefinitionIds);
+ for (TaskVo task : taskList) {
+ task.setBusinessStatusName(BusinessStatusEnum.findByStatus(task.getBusinessStatus()));
+ if (CollUtil.isNotEmpty(wfNodeConfigVoList)) {
+ wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(task.getProcessDefinitionId()) && e.getNodeId().equals(task.getTaskDefinitionKey())).findFirst().ifPresent(task::setWfNodeConfigVo);
+ }
+ }
+ WorkflowUtils.setWfDefinitionConfigVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID);
+
}
return TableDataInfo.build(page);
}
@@ -426,7 +445,7 @@
}
if (CollUtil.isNotEmpty(taskList)) {
List<String> processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId);
- WorkflowUtils.setWfFormDefinitionVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID);
+ WorkflowUtils.setWfDefinitionConfigVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID);
}
return TableDataInfo.build(page);
}
--
Gitblit v1.9.3