Skip to content

feat: Approval exception handler #2271

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
Merged

feat: Approval exception handler #2271

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
8 changes: 7 additions & 1 deletion backend/crm/src/main/java/cn/cordys/crm/approval/constants/ApprovalStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,11 @@ public enum ApprovalStatus {
/** 已驳回 */
UNAPPROVED,
/** 已撤销 */
REVOKED
REVOKED,

// 扩展项
/** 自动通过 */
AUTO_APPROVED,
/** 自动拒绝 */
AUTO_UNAPPROVED
}
110 changes: 100 additions & 10 deletions backend/crm/src/main/java/cn/cordys/crm/approval/service/ApprovalActionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ private void approvedProcess(ApprovalTask currentTask, String currentUserId, Str
appendProcessSignTask(currentTask);

// 多人依次审批类型的待办
List<ApprovalTask> multiSeqApprovalTasks = new ArrayList<>();
ApprovalNodeApprover nodeApprover = getNodeApprover(currentTask.getNodeId());
if (MultiApproverModeEnum.valueOf(nodeApprover.getMultiApproverMode()) == MultiApproverModeEnum.SEQUENTIAL) {
// 依次审批, 如果存在审批中任务则跳过
Expand All @@ -337,8 +338,23 @@ private void approvedProcess(ApprovalTask currentTask, String currentUserId, Str
if (approvingTasks.isEmpty()) {
User nextUser = getMultiSeqNextOne(currentTask.getNodeId(), currentTask.getInstanceId(), currentOrgId);
if (nextUser != null) {
ApprovalTask multiSeqNextTask = buildTask(currentTask.getNodeId(), currentTask.getInstanceId(), nextUser.getId(), ApprovalTaskType.NL.name(), currentUserId, currentTask.getNodeRound());
approvalTaskMapper.insert(multiSeqNextTask);
ApprovalTask nextTask = buildTask(currentTask.getNodeId(), currentTask.getInstanceId(), nextUser.getId(), ApprovalTaskType.NL.name(), currentUserId, currentTask.getNodeRound());
// 如果配置审批人提审人相同跳过
SameSubmitterActionEnum sameAction = SameSubmitterActionEnum.valueOf(nodeApprover.getSameSubmitterAction());
ApprovalInstance instance = approvalInstanceMapper.selectByPrimaryKey(currentTask.getInstanceId());
if (sameAction == SameSubmitterActionEnum.SKIP && Strings.CI.equals(nextUser.getId(), instance.getSubmitterId())) {
nextTask.setAction(ApprovalAction.APPROVE.name());
nextTask.setStatus(ApprovalStatus.AUTO_APPROVED.name());
approvalFlowService.saveAutoRecord(currentTask.getInstanceId(), currentTask.getNodeId(), ApprovalStatus.AUTO_APPROVED, "审批人与提交人为同一人时, 自动同意跳过", nextTask.getId());
// 依次审批下一位自动同意跳过, 发送下下一个位次的待办
User nextPlusUser = getMultiSeqNextPlusOne(currentTask.getNodeId(), currentTask.getInstanceId(), currentOrgId);
if (nextPlusUser != null) {
ApprovalTask nextNextTask = buildTask(currentTask.getNodeId(), currentTask.getInstanceId(), nextPlusUser.getId(), ApprovalTaskType.NL.name(), currentUserId, currentTask.getNodeRound());
multiSeqApprovalTasks.add(nextNextTask);
}
}
multiSeqApprovalTasks.add(nextTask);
approvalTaskMapper.batchInsert(multiSeqApprovalTasks);
}
}
}
Expand Down Expand Up @@ -600,6 +616,29 @@ private User getMultiSeqNextOne(String nodeId, String instanceId, String current
return null;
}

/**
* 获取多人依次审批下下一个审批人
* @param nodeId 节点ID
* @param instanceId 实例ID
* @param currentOrgId 组织ID
* @return 下一个审批人
*/
private User getMultiSeqNextPlusOne(String nodeId, String instanceId, String currentOrgId) {
ApprovalInstance instance = approvalInstanceMapper.selectByPrimaryKey(instanceId);
List<User> approvers = approvalFlowService.getCurrentNodeApproverList(nodeId, instance.getSubmitterId(), currentOrgId);
LambdaQueryWrapper<ApprovalTask> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ApprovalTask::getNodeId, nodeId)
.eq(ApprovalTask::getInstanceId, instanceId)
.eq(ApprovalTask::getType, ApprovalTaskType.NL.name())
.eq(ApprovalTask::getStatus, ApprovalStatus.APPROVED.name());
List<ApprovalTask> approvedTask = approvalTaskMapper.selectListByLambda(queryWrapper);
if (approvedTask.size() < approvers.size()) {
// 依次审批, 返回下下一个审批人
return approvers.get(approvedTask.size() + 1);
}
return null;
}

/**
* 获取多人依次审批当前用户下一个审批人
* @param nodeId 节点ID
Expand Down Expand Up @@ -845,7 +884,7 @@ private void handleNextApprovalNode(ApprovalNodeResponse node, ApprovalInstance
resourceService.updateResourceApprovalStatus(FormKey.ofKey(instance.getType()), instance.getResourceId(), instance.getApprovalStatus());
}
if (ApprovalNodeTypeEnum.valueOf(node.getNodeType()) == ApprovalNodeTypeEnum.APPROVER) {
List<ApprovalTask> approvalTasks = getNodeApproverTasks((ApprovalNodeApproverResponse) node, instance.getId(), currentUserId, ApprovalTaskType.NL.name());
List<ApprovalTask> approvalTasks = getNodeApproverTasks((ApprovalNodeApproverResponse) node, instance.getId(), currentUserId, ApprovalTaskType.NL.name(), instance.getSubmitterId());
List<ApprovalTask> ccTasks = getNodeCcTasks((ApprovalNodeApproverResponse) node, instance.getId(), currentUserId);
List<ApprovalTask> allTasks = ListUtils.union(approvalTasks, ccTasks);
if (CollectionUtils.isNotEmpty(allTasks)) {
Expand Down Expand Up @@ -888,17 +927,68 @@ public String selectBusinessName(FormKey formKey, String resourceId) {
* @param taskType 任务类型
* @return 待办任务集合
*/
public List<ApprovalTask> getNodeApproverTasks(ApprovalNodeApproverResponse approverNode, String instanceId, String userId, String taskType) {
public List<ApprovalTask> getNodeApproverTasks(ApprovalNodeApproverResponse approverNode, String instanceId, String userId, String taskType, String submitter) {
List<ApprovalTask> approvalTasks = new ArrayList<>();
if (approverNode == null) {
return approvalTasks;
}
Integer nextRound = extApprovalInstanceMapper.getNextNodeRound(instanceId, approverNode.getId());
if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(approverNode.getApproverList())) {
approverNode.getApproverList().forEach(approver -> {
ApprovalTask approvalTask = buildTask(approverNode.getId(), instanceId, approver, taskType, userId, nextRound);
approvalTasks.add(approvalTask);
});
if (CollectionUtils.isNotEmpty(approverNode.getApproverList())) {
MultiApproverModeEnum multiMode = MultiApproverModeEnum.valueOf(approverNode.getMultiApproverMode());
SameSubmitterActionEnum sameAction = SameSubmitterActionEnum.valueOf(approverNode.getSameSubmitterAction());
if (sameAction == SameSubmitterActionEnum.SKIP) {
// 如果配置了审批人和提审人相同, 自动跳过 (会签, 依次审批 生成的提审人待办需直接同意, 或签和单人审批已在流程执行的时候处理过)
switch (multiMode) {
case SEQUENTIAL -> {
// 依次审批只需要发送第一个人的待办
String firstApprover = approverNode.getApproverList().get(0);
ApprovalTask firstTask = buildTask(approverNode.getId(), instanceId, firstApprover, taskType, userId, nextRound);
if (Strings.CI.equals(firstApprover, submitter)) {
// 自动跳过该审批人
firstTask.setAction(ApprovalAction.APPROVE.name());
firstTask.setStatus(ApprovalStatus.AUTO_APPROVED.name());
approvalFlowService.saveAutoRecord(instanceId, approverNode.getId(), ApprovalStatus.AUTO_APPROVED, "审批人与提交人为同一人时, 自动同意跳过", firstTask.getId());
// 第一个需要自动同意跳过, 发送第二个人待办
String secondApprover = approverNode.getApproverList().get(1);
if (StringUtils.isNotBlank(secondApprover)) {
ApprovalTask secondTask = buildTask(approverNode.getId(), instanceId, secondApprover, taskType, userId, nextRound);
approvalTasks.add(secondTask);
}
}
approvalTasks.add(firstTask);
}
case ALL -> {
// 如果是会签, 需要发送所有审批人的待办
approverNode.getApproverList().forEach(approver -> {
ApprovalTask approvalTask = buildTask(approverNode.getId(), instanceId, approver, taskType, userId, nextRound);
if (Strings.CI.equals(approver, submitter)) {
// 自动跳过该审批人
approvalTask.setAction(ApprovalAction.APPROVE.name());
approvalTask.setStatus(ApprovalStatus.AUTO_APPROVED.name());
approvalFlowService.saveAutoRecord(instanceId, approverNode.getId(), ApprovalStatus.AUTO_APPROVED, "审批人与提交人为同一人时, 自动同意跳过", approvalTask.getId());
}
approvalTasks.add(approvalTask);
});
}
default -> {

}
}
} else {
// 并未配置自动跳过的逻辑, 正常逻辑
if (multiMode == MultiApproverModeEnum.SEQUENTIAL) {
// 依次审批只需要发送第一个人的待办
String firstApprover = approverNode.getApproverList().getFirst();
ApprovalTask firstTask = buildTask(approverNode.getId(), instanceId, firstApprover, taskType, userId, nextRound);
approvalTasks.add(firstTask);
} else {
// 会签, 或签需要发送所有待办
approverNode.getApproverList().forEach(approver -> {
ApprovalTask approvalTask = buildTask(approverNode.getId(), instanceId, approver, taskType, userId, nextRound);
approvalTasks.add(approvalTask);
});
}
}
}
return approvalTasks;
}
Expand All @@ -909,7 +999,7 @@ public List<ApprovalTask> getNodeCcTasks(ApprovalNodeApproverResponse approverNo
return approvalTasks;
}
Integer nextRound = extApprovalInstanceMapper.getNextNodeRound(instanceId, approverNode.getId());
if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(approverNode.getCcList())) {
if (CollectionUtils.isNotEmpty(approverNode.getCcList())) {
approverNode.getCcList().forEach(cc -> {
ApprovalTask approvalTask = buildTask(approverNode.getId(), instanceId, cc, ApprovalTaskType.CC.name(), userId, nextRound);
approvalTasks.add(approvalTask);
Expand Down
Loading
Loading