Skip to content

feat: Batch approval #2281

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: Batch approval #2281

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
12 changes: 6 additions & 6 deletions backend/crm/src/main/java/cn/cordys/crm/approval/controller/ApprovalActionController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ public void reject(@Validated @RequestBody ApprovalActionRequest request) {
approvalActionService.reject(request, SessionUtils.getUserId(), OrganizationContext.getOrganizationId());
}

@PostMapping("/batch-approve")
@Operation(summary = "批量同意")
public void batchApprove(@Validated @RequestBody ApprovalActionBatchRequest request) {
approvalActionService.batchApprove(request, SessionUtils.getUserId(), OrganizationContext.getOrganizationId());
}

@PostMapping("/batch-reject")
@Operation(summary = "批量驳回")
public void batchReject(@Validated @RequestBody ApprovalActionBatchRequest request) {
approvalActionService.batchReject(request, SessionUtils.getUserId(), OrganizationContext.getOrganizationId());
}

@PostMapping("/batch-approve")
@Operation(summary = "批量同意")
public void batchApprove(@Validated @RequestBody ApprovalActionBatchRequest request) {
approvalActionService.batchApprove(request, SessionUtils.getUserId(), OrganizationContext.getOrganizationId());
}
}
6 changes: 6 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
Expand Up @@ -18,9 +18,15 @@ public class ApprovalRecordNode {
@Schema(description = "节点ID")
private String nodeId;

@Schema(description = "节点名称")
private String nodeName;

@Schema(description = "节点轮次")
private Integer nodeRound;

@Schema(description = "序号")
private Integer sort;

@Schema(description = "审批状态")
private String approvalStatus;

Expand Down
12 changes: 5 additions & 7 deletions backend/crm/src/main/java/cn/cordys/crm/approval/dto/request/ApprovalActionBatchRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package cn.cordys.crm.approval.dto.request;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
import lombok.Data;

Expand All @@ -9,16 +10,13 @@
@Data
public class ApprovalActionBatchRequest {

@NotEmpty
@NotEmpty(message = "当前任务节点ID集合不能为空")
@Schema(description = "ids", requiredMode = Schema.RequiredMode.REQUIRED)
private List<String> ids;

@Schema(description = "驳回原因")
private String rejectReason;
@Schema(description = "意见, 评论")
private String comment;

@Schema(description = "驳回附件集合")
@Schema(description = "附件ID集合")
private List<String> attachmentIds;

@Schema(description="操作模块:首页/具体模块详情页")
private String module;
}
22 changes: 13 additions & 9 deletions backend/crm/src/main/java/cn/cordys/crm/approval/dto/request/ApprovalActionRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,38 @@

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.List;

@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class ApprovalActionRequest {

@NotBlank(message = "当前task任务ID不能为空")
@Schema(description = "task任务id")
@NotBlank(message = "当前任务节点ID不能为空")
@Schema(description = "当前任务节点ID")
private String id;

@NotBlank(message = "当前node节点id不能为空")
@Schema(description = "node节点id")
@NotBlank(message = "当前节点ID不能为空")
@Schema(description = "节点ID")
private String nodeId;

@NotBlank(message = "审批实例ID不能为空")
@Schema(description = "审批实例ID")
private String instanceId;

@NotBlank(message = "审批人ID不能为空")
@Schema(description = "审批人ID")
private String approverId;

@Schema(description = "意见")
@Schema(description = "意见, 评论")
private String comment;

@Schema(description = "意见的附件集合")
@Schema(description = "附件ID集合")
private List<String> attachmentIds;

@Schema(description="操作模块:首页/具体模块详情页")
private String module;
}
Loading
Loading