|
|
|
|
@ -30,9 +30,12 @@ import org.dromara.warm.flow.core.entity.*;
|
|
|
|
|
import org.dromara.warm.flow.core.enums.NodeType;
|
|
|
|
|
import org.dromara.warm.flow.core.enums.SkipType;
|
|
|
|
|
import org.dromara.warm.flow.core.service.*;
|
|
|
|
|
import org.dromara.warm.flow.core.utils.ExpressionUtil;
|
|
|
|
|
import org.dromara.warm.flow.core.utils.MapUtil;
|
|
|
|
|
import org.dromara.warm.flow.orm.entity.*;
|
|
|
|
|
import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper;
|
|
|
|
|
import org.dromara.warm.flow.orm.mapper.FlowInstanceMapper;
|
|
|
|
|
import org.dromara.warm.flow.orm.mapper.FlowNodeMapper;
|
|
|
|
|
import org.dromara.warm.flow.orm.mapper.FlowTaskMapper;
|
|
|
|
|
import org.dromara.workflow.api.domain.RemoteStartProcessReturn;
|
|
|
|
|
import org.dromara.workflow.common.ConditionalOnEnable;
|
|
|
|
|
@ -46,6 +49,7 @@ import org.dromara.workflow.handler.WorkflowPermissionHandler;
|
|
|
|
|
import org.dromara.workflow.mapper.FlwCategoryMapper;
|
|
|
|
|
import org.dromara.workflow.mapper.FlwTaskMapper;
|
|
|
|
|
import org.dromara.workflow.service.IFlwCommonService;
|
|
|
|
|
import org.dromara.workflow.service.IFlwTaskAssigneeService;
|
|
|
|
|
import org.dromara.workflow.service.IFlwTaskService;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
@ -79,6 +83,8 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
|
|
|
|
|
private final FlowProcessEventHandler flowProcessEventHandler;
|
|
|
|
|
private final FlwTaskMapper flwTaskMapper;
|
|
|
|
|
private final FlwCategoryMapper flwCategoryMapper;
|
|
|
|
|
private final FlowNodeMapper flowNodeMapper;
|
|
|
|
|
private final IFlwTaskAssigneeService flwTaskAssigneeService;
|
|
|
|
|
private final IFlwCommonService flwCommonService;
|
|
|
|
|
|
|
|
|
|
@DubboReference
|
|
|
|
|
@ -107,6 +113,8 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
|
|
|
|
|
if (ObjectUtil.isNotNull(flowInstance)) {
|
|
|
|
|
BusinessStatusEnum.checkStartStatus(flowInstance.getFlowStatus());
|
|
|
|
|
List<Task> taskList = taskService.list(new FlowTask().setInstanceId(flowInstance.getId()));
|
|
|
|
|
taskService.mergeVariable(flowInstance, variables);
|
|
|
|
|
insService.updateById(flowInstance);
|
|
|
|
|
RemoteStartProcessReturn dto = new RemoteStartProcessReturn();
|
|
|
|
|
dto.setProcessInstanceId(taskList.get(0).getInstanceId());
|
|
|
|
|
dto.setTaskId(taskList.get(0).getId());
|
|
|
|
|
@ -159,6 +167,11 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
|
|
|
|
|
if (BusinessStatusEnum.isDraftOrCancelOrBack(ins.getFlowStatus())) {
|
|
|
|
|
flowProcessEventHandler.processHandler(definition.getFlowCode(), ins.getBusinessId(), ins.getFlowStatus(), null, true);
|
|
|
|
|
}
|
|
|
|
|
// 设置弹窗处理人
|
|
|
|
|
Map<String, Object> assigneeMap = setPopAssigneeMap(completeTaskBo.getAssigneeMap(), ins.getVariableMap());
|
|
|
|
|
if (CollUtil.isNotEmpty(assigneeMap)) {
|
|
|
|
|
completeTaskBo.getVariables().putAll(assigneeMap);
|
|
|
|
|
}
|
|
|
|
|
// 构建流程参数，包括变量、跳转类型、消息、处理人、权限等信息
|
|
|
|
|
FlowParams flowParams = new FlowParams();
|
|
|
|
|
flowParams.variable(completeTaskBo.getVariables());
|
|
|
|
|
@ -172,6 +185,8 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
|
|
|
|
|
this.setHandler(instance, flowTask, flowCopyList);
|
|
|
|
|
// 消息通知
|
|
|
|
|
flwCommonService.sendMessage(definition.getFlowName(), ins.getId(), messageType, notice);
|
|
|
|
|
//设置下一环节处理人
|
|
|
|
|
setNextHandler(ins.getId());
|
|
|
|
|
return true;
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
log.error(e.getMessage(), e);
|
|
|
|
|
@ -179,6 +194,60 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 设置下一环节处理人
|
|
|
|
|
*
|
|
|
|
|
* @param instanceId 实例ID
|
|
|
|
|
*/
|
|
|
|
|
private void setNextHandler(Long instanceId) {
|
|
|
|
|
Instance inst = insService.getById(instanceId);
|
|
|
|
|
List<FlowTask> flowTaskList = selectByInstId(instanceId);
|
|
|
|
|
Map<String, Object> variableMap = inst.getVariableMap();
|
|
|
|
|
for (FlowTask task : flowTaskList) {
|
|
|
|
|
if (variableMap != null && variableMap.containsKey(task.getNodeCode())) {
|
|
|
|
|
String userIds = variableMap.get(task.getNodeCode()).toString();
|
|
|
|
|
// 批量删除现有任务的办理人记录
|
|
|
|
|
flwCommonService.getFlowUserService().deleteByTaskIds(List.of(task.getId()));
|
|
|
|
|
// 批量新增任务办理人记录
|
|
|
|
|
Set<User> users = flwCommonService.buildFlowUser(List.of(userIds.split(StringUtils.SEPARATOR)), task.getId());
|
|
|
|
|
flwCommonService.getFlowUserService().saveBatch(new ArrayList<>(users));
|
|
|
|
|
variableMap.remove(task.getNodeCode());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
taskService.mergeVariable(inst, variableMap);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 设置弹窗处理人
|
|
|
|
|
*
|
|
|
|
|
* @param assigneeMap 处理人
|
|
|
|
|
* @param variablesMap 变量
|
|
|
|
|
*/
|
|
|
|
|
private Map<String, Object> setPopAssigneeMap(Map<String, Object> assigneeMap, Map<String, Object> variablesMap) {
|
|
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
|
|
if (CollUtil.isEmpty(assigneeMap)) {
|
|
|
|
|
return map;
|
|
|
|
|
}
|
|
|
|
|
for (Map.Entry<String, Object> entry : assigneeMap.entrySet()) {
|
|
|
|
|
if (variablesMap.containsKey(entry.getKey())) {
|
|
|
|
|
String userIds = variablesMap.get(entry.getKey()).toString();
|
|
|
|
|
if (StringUtils.isNotBlank(userIds)) {
|
|
|
|
|
Set<String> hashSet = new HashSet<>();
|
|
|
|
|
//弹窗传入的选人
|
|
|
|
|
List<String> popUserIds = Arrays.asList(entry.getValue().toString().split(StringUtils.SEPARATOR));
|
|
|
|
|
//已有的选人
|
|
|
|
|
List<String> variableUserIds = Arrays.asList(userIds.split(StringUtils.SEPARATOR));
|
|
|
|
|
hashSet.addAll(popUserIds);
|
|
|
|
|
hashSet.addAll(variableUserIds);
|
|
|
|
|
map.put(entry.getKey(), String.join(StringUtils.SEPARATOR, hashSet));
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
map.put(entry.getKey(), entry.getValue());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return map;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 设置办理人
|
|
|
|
|
*
|
|
|
|
|
@ -491,14 +560,52 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
|
|
|
|
|
flowTaskVo.setFlowCode(definition.getFlowCode());
|
|
|
|
|
flowTaskVo.setFlowName(definition.getFlowName());
|
|
|
|
|
flowTaskVo.setBusinessId(instance.getBusinessId());
|
|
|
|
|
List<Node> nodeList = nodeService.getByNodeCodes(Collections.singletonList(flowTaskVo.getNodeCode()), instance.getDefinitionId());
|
|
|
|
|
if (CollUtil.isNotEmpty(nodeList)) {
|
|
|
|
|
Node node = nodeList.get(0);
|
|
|
|
|
flowTaskVo.setNodeRatio(node.getNodeRatio());
|
|
|
|
|
//设置按钮权限
|
|
|
|
|
FlowNode flowNode = getByNodeCode(flowTaskVo.getNodeCode(), instance.getDefinitionId());
|
|
|
|
|
if (ObjectUtil.isNull(flowNode)) {
|
|
|
|
|
throw new NullPointerException("当前【" + flowTaskVo.getNodeCode() + "】节点编码不存在");
|
|
|
|
|
}
|
|
|
|
|
flowTaskVo.setButtonList(flowTaskVo.getButtonList(flowNode.getExt()));
|
|
|
|
|
flowTaskVo.setNodeRatio(flowNode.getNodeRatio());
|
|
|
|
|
flowTaskVo.setApplyNode(flowNode.getNodeCode().equals(flwCommonService.applyNodeCode(task.getDefinitionId())));
|
|
|
|
|
return flowTaskVo;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 获取下一节点信息
|
|
|
|
|
*
|
|
|
|
|
* @param bo 参数
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public List<FlowNode> getNextNodeList(FlowNextNodeBo bo) {
|
|
|
|
|
String taskId = bo.getTaskId();
|
|
|
|
|
Map<String, Object> variables = bo.getVariables();
|
|
|
|
|
Task task = taskService.getById(taskId);
|
|
|
|
|
Instance instance = insService.getById(task.getInstanceId());
|
|
|
|
|
Definition definition = defService.getById(task.getDefinitionId());
|
|
|
|
|
Map<String, Object> mergeVariable = MapUtil.mergeAll(instance.getVariableMap(), variables);
|
|
|
|
|
//获取下一节点列表
|
|
|
|
|
List<Node> nextNodeList = nodeService.getNextNodeList(task.getDefinitionId(), task.getNodeCode(), null, SkipType.PASS.getKey(), mergeVariable);
|
|
|
|
|
List<FlowNode> nextFlowNodes = BeanUtil.copyToList(nextNodeList, FlowNode.class);
|
|
|
|
|
if (CollUtil.isNotEmpty(nextNodeList)) {
|
|
|
|
|
//构建以下节点数据
|
|
|
|
|
List<Task> buildNextTaskList = StreamUtils.toList(nextNodeList, node -> taskService.addTask(node, instance, definition, null));
|
|
|
|
|
//办理人变量替换
|
|
|
|
|
ExpressionUtil.evalVariable(buildNextTaskList, mergeVariable);
|
|
|
|
|
for (FlowNode flowNode : nextFlowNodes) {
|
|
|
|
|
buildNextTaskList.stream().filter(t -> t.getNodeCode().equals(flowNode.getNodeCode())).findFirst().ifPresent(t -> {
|
|
|
|
|
if (CollUtil.isNotEmpty(t.getPermissionList())) {
|
|
|
|
|
List<RemoteUserVo> users = flwTaskAssigneeService.fetchUsersByStorageId(String.join(StringUtils.SEPARATOR, t.getPermissionList()));
|
|
|
|
|
if (CollUtil.isNotEmpty(users)) {
|
|
|
|
|
flowNode.setPermissionFlag(StreamUtils.join(users, e -> String.valueOf(e.getUserId())));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return nextFlowNodes;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 按照任务id查询任务
|
|
|
|
|
*
|
|
|
|
|
@ -581,10 +688,11 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Long taskId = bo.getTaskId();
|
|
|
|
|
FlowTaskVo flowTaskVo = selectById(taskId);
|
|
|
|
|
Task task = taskService.getById(taskId);
|
|
|
|
|
FlowNode flowNode = getByNodeCode(task.getNodeCode(), task.getDefinitionId());
|
|
|
|
|
if ("addSignature".equals(taskOperation) || "reductionSignature".equals(taskOperation)) {
|
|
|
|
|
if (flowTaskVo.getNodeRatio().compareTo(BigDecimal.ZERO) == 0) {
|
|
|
|
|
throw new ServiceException(flowTaskVo.getNodeName() + "不是会签节点！");
|
|
|
|
|
if (flowNode.getNodeRatio().compareTo(BigDecimal.ZERO) == 0) {
|
|
|
|
|
throw new ServiceException(task.getNodeName() + "不是会签节点！");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// 设置任务状态并执行对应的任务操作
|
|
|
|
|
@ -689,4 +797,17 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
|
|
|
|
|
return remoteUserService.selectListByIds(StreamUtils.toList(userList, e -> Long.valueOf(e.getProcessedBy())));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 按照节点编码查询节点
|
|
|
|
|
*
|
|
|
|
|
* @param nodeCode 节点编码
|
|
|
|
|
* @param definitionId 流程定义id
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public FlowNode getByNodeCode(String nodeCode, Long definitionId) {
|
|
|
|
|
return flowNodeMapper.selectOne(new LambdaQueryWrapper<FlowNode>()
|
|
|
|
|
.eq(FlowNode::getNodeCode, nodeCode)
|
|
|
|
|
.eq(FlowNode::getDefinitionId, definitionId));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
疯狂的狮子Li
11 months ago