From 9d5be382e52f9ac57199d5ef75cc23f925a4cdb0 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 13 十二月 2024 17:07:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/convert/task/BpmTaskConvert.java | 107 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 68 insertions(+), 39 deletions(-)
diff --git a/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/convert/task/BpmTaskConvert.java b/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/convert/task/BpmTaskConvert.java
index 93025be..5b1e179 100644
--- a/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/convert/task/BpmTaskConvert.java
+++ b/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/convert/task/BpmTaskConvert.java
@@ -1,14 +1,15 @@
package com.iailab.module.bpm.convert.task;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.util.collection.CollectionUtils;
import com.iailab.framework.common.util.number.NumberUtils;
import com.iailab.framework.common.util.object.BeanUtils;
-import com.iailab.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceRespVO;
+import com.iailab.module.bpm.controller.admin.base.user.UserSimpleBaseVO;
import com.iailab.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO;
import com.iailab.module.bpm.dal.dataobject.definition.BpmFormDO;
+import com.iailab.module.bpm.enums.task.BpmTaskStatusEnum;
import com.iailab.module.bpm.framework.flowable.core.util.FlowableUtils;
import com.iailab.module.bpm.service.message.dto.BpmMessageSendWhenTaskCreatedReqDTO;
import com.iailab.module.system.api.dept.dto.DeptRespDTO;
@@ -25,13 +26,14 @@
import java.util.List;
import java.util.Map;
-import static com.iailab.framework.common.util.collection.CollectionUtils.*;
+import static com.iailab.framework.common.util.collection.CollectionUtils.convertList;
import static com.iailab.framework.common.util.collection.MapUtils.findAndThen;
+
/**
* Bpm 任务 Convert
*
- * @author iailab
+ * @author 芋道源码
*/
@Mapper
public interface BpmTaskConvert {
@@ -48,7 +50,7 @@
}
taskVO.setProcessInstance(BeanUtils.toBean(processInstance, BpmTaskRespVO.ProcessInstance.class));
AdminUserRespDTO startUser = userMap.get(NumberUtils.parseLong(processInstance.getStartUserId()));
- taskVO.getProcessInstance().setStartUser(BeanUtils.toBean(startUser, BpmProcessInstanceRespVO.User.class));
+ taskVO.getProcessInstance().setStartUser(BeanUtils.toBean(startUser, UserSimpleBaseVO.class));
});
}
@@ -56,13 +58,13 @@
Map<String, HistoricProcessInstance> processInstanceMap,
Map<Long, AdminUserRespDTO> userMap,
Map<Long, DeptRespDTO> deptMap) {
- List<BpmTaskRespVO> taskVOList = CollectionUtils.convertList(pageResult.getList(), task -> {
+ List<BpmTaskRespVO> taskVOList = convertList(pageResult.getList(), task -> {
BpmTaskRespVO taskVO = BeanUtils.toBean(task, BpmTaskRespVO.class);
taskVO.setStatus(FlowableUtils.getTaskStatus(task)).setReason(FlowableUtils.getTaskReason(task));
// 用户信息
AdminUserRespDTO assignUser = userMap.get(NumberUtils.parseLong(task.getAssignee()));
if (assignUser != null) {
- taskVO.setAssigneeUser(BeanUtils.toBean(assignUser, BpmProcessInstanceRespVO.User.class));
+ taskVO.setAssigneeUser(BeanUtils.toBean(assignUser, UserSimpleBaseVO.class));
findAndThen(deptMap, assignUser.getDeptId(), dept -> taskVO.getAssigneeUser().setDeptName(dept.getName()));
}
// 流程实例
@@ -70,7 +72,7 @@
if (processInstance != null) {
AdminUserRespDTO startUser = userMap.get(NumberUtils.parseLong(processInstance.getStartUserId()));
taskVO.setProcessInstance(BeanUtils.toBean(processInstance, BpmTaskRespVO.ProcessInstance.class));
- taskVO.getProcessInstance().setStartUser(BeanUtils.toBean(startUser, BpmProcessInstanceRespVO.User.class));
+ taskVO.getProcessInstance().setStartUser(BeanUtils.toBean(startUser, UserSimpleBaseVO.class));
}
return taskVO;
});
@@ -78,17 +80,17 @@
}
default List<BpmTaskRespVO> buildTaskListByProcessInstanceId(List<HistoricTaskInstance> taskList,
- HistoricProcessInstance processInstance,
Map<Long, BpmFormDO> formMap,
Map<Long, AdminUserRespDTO> userMap,
Map<Long, DeptRespDTO> deptMap) {
- List<BpmTaskRespVO> taskVOList = CollectionUtils.convertList(taskList, task -> {
+ return convertList(taskList, task -> {
+ // 特殊：已取消的任务，不返回
BpmTaskRespVO taskVO = BeanUtils.toBean(task, BpmTaskRespVO.class);
- taskVO.setStatus(FlowableUtils.getTaskStatus(task)).setReason(FlowableUtils.getTaskReason(task));
- // 流程实例
- AdminUserRespDTO startUser = userMap.get(NumberUtils.parseLong(processInstance.getStartUserId()));
- taskVO.setProcessInstance(BeanUtils.toBean(processInstance, BpmTaskRespVO.ProcessInstance.class));
- taskVO.getProcessInstance().setStartUser(BeanUtils.toBean(startUser, BpmProcessInstanceRespVO.User.class));
+ Integer taskStatus = FlowableUtils.getTaskStatus(task);
+ if (BpmTaskStatusEnum.isCancelStatus(taskStatus)) {
+ return null;
+ }
+ taskVO.setStatus(taskStatus).setReason(FlowableUtils.getTaskReason(task));
// 表单信息
BpmFormDO form = MapUtil.get(formMap, NumberUtils.parseLong(task.getFormKey()), BpmFormDO.class);
if (form != null) {
@@ -96,27 +98,10 @@
.setFormFields(form.getFields()).setFormVariables(FlowableUtils.getTaskFormVariable(task));
}
// 用户信息
- AdminUserRespDTO assignUser = userMap.get(NumberUtils.parseLong(task.getAssignee()));
- if (assignUser != null) {
- taskVO.setAssigneeUser(BeanUtils.toBean(assignUser, BpmProcessInstanceRespVO.User.class));
- findAndThen(deptMap, assignUser.getDeptId(), dept -> taskVO.getAssigneeUser().setDeptName(dept.getName()));
- }
- AdminUserRespDTO ownerUser = userMap.get(NumberUtils.parseLong(task.getOwner()));
- if (ownerUser != null) {
- taskVO.setOwnerUser(BeanUtils.toBean(ownerUser, BpmProcessInstanceRespVO.User.class));
- findAndThen(deptMap, ownerUser.getDeptId(), dept -> taskVO.getOwnerUser().setDeptName(dept.getName()));
- }
+ buildTaskAssignee(taskVO, task.getAssignee(), userMap, deptMap);
+ buildTaskOwner(taskVO, task.getOwner(), userMap, deptMap);
return taskVO;
});
-
- // 拼接父子关系
- Map<String, List<BpmTaskRespVO>> childrenTaskMap = convertMultiMap(
- filterList(taskVOList, r -> StrUtil.isNotEmpty(r.getParentTaskId())),
- BpmTaskRespVO::getParentTaskId);
- for (BpmTaskRespVO taskVO : taskVOList) {
- taskVO.setChildren(childrenTaskMap.get(taskVO.getId()));
- }
- return filterList(taskVOList, r -> StrUtil.isEmpty(r.getParentTaskId()));
}
default List<BpmTaskRespVO> buildTaskListByParentTaskId(List<Task> taskList,
@@ -125,7 +110,7 @@
return convertList(taskList, task -> BeanUtils.toBean(task, BpmTaskRespVO.class, taskVO -> {
AdminUserRespDTO assignUser = userMap.get(NumberUtils.parseLong(task.getAssignee()));
if (assignUser != null) {
- taskVO.setAssigneeUser(BeanUtils.toBean(assignUser, BpmProcessInstanceRespVO.User.class));
+ taskVO.setAssigneeUser(BeanUtils.toBean(assignUser, UserSimpleBaseVO.class));
DeptRespDTO dept = deptMap.get(assignUser.getDeptId());
if (dept != null) {
taskVO.getAssigneeUser().setDeptName(dept.getName());
@@ -133,10 +118,19 @@
}
AdminUserRespDTO ownerUser = userMap.get(NumberUtils.parseLong(task.getOwner()));
if (ownerUser != null) {
- taskVO.setOwnerUser(BeanUtils.toBean(ownerUser, BpmProcessInstanceRespVO.User.class));
+ taskVO.setOwnerUser(BeanUtils.toBean(ownerUser, UserSimpleBaseVO.class));
findAndThen(deptMap, ownerUser.getDeptId(), dept -> taskVO.getOwnerUser().setDeptName(dept.getName()));
}
}));
+ }
+
+ default BpmTaskRespVO buildTodoTask(Task todoTask, List<Task> childrenTasks,
+ Map<Integer, BpmTaskRespVO.OperationButtonSetting> buttonsSetting) {
+ return BeanUtils.toBean(todoTask, BpmTaskRespVO.class)
+ .setStatus(FlowableUtils.getTaskStatus(todoTask)).setReason(FlowableUtils.getTaskReason(todoTask))
+ .setButtonsSetting(buttonsSetting)
+ .setChildren(convertList(childrenTasks, childTask -> BeanUtils.toBean(childTask, BpmTaskRespVO.class)
+ .setStatus(FlowableUtils.getTaskStatus(childTask))));
}
default BpmMessageSendWhenTaskCreatedReqDTO convert(ProcessInstance processInstance, AdminUserRespDTO startUser,
@@ -149,14 +143,50 @@
return reqDTO;
}
+ default void buildTaskOwner(BpmTaskRespVO task, String taskOwner,
+ Map<Long, AdminUserRespDTO> userMap,
+ Map<Long, DeptRespDTO> deptMap) {
+ AdminUserRespDTO ownerUser = userMap.get(NumberUtils.parseLong(taskOwner));
+ if (ownerUser != null) {
+ task.setOwnerUser(BeanUtils.toBean(ownerUser, UserSimpleBaseVO.class));
+ findAndThen(deptMap, ownerUser.getDeptId(), dept -> task.getOwnerUser().setDeptName(dept.getName()));
+ }
+ }
+
+ default void buildTaskChildren(BpmTaskRespVO task, Map<String, List<Task>> childrenTaskMap,
+ Map<Long, AdminUserRespDTO> userMap, Map<Long, DeptRespDTO> deptMap) {
+ List<Task> childTasks = childrenTaskMap.get(task.getId());
+ if (CollUtil.isNotEmpty(childTasks)) {
+ task.setChildren(
+ convertList(childTasks, childTask -> {
+ BpmTaskRespVO childTaskVO = BeanUtils.toBean(childTask, BpmTaskRespVO.class);
+ childTaskVO.setStatus(FlowableUtils.getTaskStatus(childTask));
+ buildTaskOwner(childTaskVO, childTask.getOwner(), userMap, deptMap);
+ buildTaskAssignee(childTaskVO, childTask.getAssignee(), userMap, deptMap);
+ return childTaskVO;
+ })
+ );
+ }
+ }
+
+ default void buildTaskAssignee(BpmTaskRespVO task, String taskAssignee,
+ Map<Long, AdminUserRespDTO> userMap,
+ Map<Long, DeptRespDTO> deptMap) {
+ AdminUserRespDTO assignUser = userMap.get(NumberUtils.parseLong(taskAssignee));
+ if (assignUser != null) {
+ task.setAssigneeUser(BeanUtils.toBean(assignUser, UserSimpleBaseVO.class));
+ findAndThen(deptMap, assignUser.getDeptId(), dept -> task.getAssigneeUser().setDeptName(dept.getName()));
+ }
+ }
+
/**
* 将父任务的属性，拷贝到子任务（加签任务）
- *
+ * <p>
* 为什么不使用 mapstruct 映射？因为 TaskEntityImpl 还有很多其他属性，这里我们只设置我们需要的。
* 使用 mapstruct 会将里面嵌套的各个属性值都设置进去，会出现意想不到的问题。
*
* @param parentTask 父任务
- * @param childTask 加签任务
+ * @param childTask 加签任务
*/
default void copyTo(TaskEntityImpl parentTask, TaskEntityImpl childTask) {
childTask.setName(parentTask.getName());
@@ -165,7 +195,6 @@
childTask.setParentTaskId(parentTask.getId());
childTask.setProcessDefinitionId(parentTask.getProcessDefinitionId());
childTask.setProcessInstanceId(parentTask.getProcessInstanceId());
-// childTask.setExecutionId(parentTask.getExecutionId()); // TODO iailab：新加的，不太确定；尴尬，不加时，子任务不通过会失败（报错）；加了，子任务审批通过会失败（报错）
childTask.setTaskDefinitionKey(parentTask.getTaskDefinitionKey());
childTask.setTaskDefinitionId(parentTask.getTaskDefinitionId());
childTask.setPriority(parentTask.getPriority());
--
Gitblit v1.9.3