Skip to content

feat: Add approval node multi mode #2274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fit2-zhao merged 1 commit into from
May 18, 2026
+28 −2
Merged

feat: Add approval node multi mode #2274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions backend/crm/src/main/java/cn/cordys/crm/approval/dto/ApprovalRecordNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package cn.cordys.crm.approval.dto;

import cn.cordys.crm.approval.constants.MultiApproverModeEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
Expand All @@ -26,6 +27,9 @@ public class ApprovalRecordNode {
@Schema(description = "审批任务")
private List<ApprovalTaskNode> taskNodes;

@Schema(description = "多人审批方式", allowableValues = {"ALL: 会签", "ANY: 或签", "SEQUENTIAL: 依次审批"})
private MultiApproverModeEnum multiApproverMode;

@Schema(description = "是否退回节点")
private boolean isReturnNode;

Expand Down
26 changes: 24 additions & 2 deletions backend/crm/src/main/java/cn/cordys/crm/approval/service/ApprovalInstanceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@
import cn.cordys.common.util.BeanUtils;
import cn.cordys.common.util.CommonBeanFactory;
import cn.cordys.common.util.Translator;
import cn.cordys.crm.approval.constants.ApprovalAction;
import cn.cordys.crm.approval.constants.ApprovalAddSignType;
import cn.cordys.crm.approval.constants.ApprovalStatus;
import cn.cordys.crm.approval.constants.ApprovalTaskType;
import cn.cordys.crm.approval.constants.MultiApproverModeEnum;
import cn.cordys.crm.approval.domain.*;
import cn.cordys.crm.approval.dto.ApprovalCcNode;
import cn.cordys.crm.approval.dto.ApprovalInstanceDetail;
import cn.cordys.crm.approval.dto.ApprovalRecordNode;
import cn.cordys.crm.approval.dto.ApprovalTaskNode;
import cn.cordys.crm.approval.mapper.ExtApprovalInstanceMapper;
import cn.cordys.crm.system.domain.Attachment;
import cn.cordys.crm.system.dto.UserSimple;
import cn.cordys.crm.system.service.AttachmentService;
Expand Down Expand Up @@ -52,6 +51,8 @@ public class ApprovalInstanceService {
private AttachmentService attachmentService;
@Resource
private UserExtendService userExtendService;
@Resource
private BaseMapper<ApprovalNodeApprover> approvalNodeApproverMapper;

/**
* 获取资源最新审批实例详情
Expand Down Expand Up @@ -203,9 +204,30 @@ private List<ApprovalRecordNode> buildApprovalRecordNodeList(List<ApprovalTask>
}
});

Map<String, ApprovalNodeApprover> approverNodeMap = getApproverNodeMapByIds(sortHisNodes);
nodes.forEach(node -> {
ApprovalNodeApprover approverNode = approverNodeMap.get(node.getNodeId());
if (approverNode != null) {
node.setMultiApproverMode(MultiApproverModeEnum.valueOf(approverNode.getMultiApproverMode()));
}

});
return nodes;
}

/**
* 获取所有审批节点集合
* @param nodeIds 节点ID集合
* @return 审批节点集合
*/
private Map<String, ApprovalNodeApprover> getApproverNodeMapByIds(List<String> nodeIds) {
if (CollectionUtils.isEmpty(nodeIds)) {
return Map.of();
}
List<ApprovalNodeApprover> approvalNodeApprovers = approvalNodeApproverMapper.selectByIds(nodeIds);
return approvalNodeApprovers.stream().collect(Collectors.toMap(ApprovalNodeApprover::getId, n -> n));
}

private List<ApprovalTask> flatSignTask(ApprovalTask currentTask, Map<String, List<ApprovalAddSignTask>> addSignTaskMap, Map<String, ApprovalTask> signTaskMap) {
if (!signTaskMap.containsKey(currentTask.getId())) {
// 不存在加签链
Expand Down
Loading