From b5019cb22fc9c9ec793884f4425bc3ccd5b224ac Mon Sep 17 00:00:00 2001 From: weicw Date: Sat, 31 Oct 2026 07:39:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B5=81=E7=A8=8B=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=8E=A5=E5=8F=A3=EF=BC=88flowCode=20?= =?UTF-8?q?=E2=86=92=20=E5=90=8D=E7=A7=B0=EF=BC=89=EF=BC=8C=E4=B8=A4?= =?UTF-8?q?=E7=AB=AF=E7=AD=9B=E9=80=89=E6=94=B9=E8=BF=9C=E7=A8=8B=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApprovalDirectoryController.java | 17 ++++++++++++ .../approval/vo/ApprovalFlowOptionVO.java | 27 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 src/main/java/com/gxwebsoft/approval/vo/ApprovalFlowOptionVO.java diff --git a/src/main/java/com/gxwebsoft/approval/controller/ApprovalDirectoryController.java b/src/main/java/com/gxwebsoft/approval/controller/ApprovalDirectoryController.java index 8819b12..4882505 100644 --- a/src/main/java/com/gxwebsoft/approval/controller/ApprovalDirectoryController.java +++ b/src/main/java/com/gxwebsoft/approval/controller/ApprovalDirectoryController.java @@ -1,6 +1,7 @@ package com.gxwebsoft.approval.controller; import com.gxwebsoft.approval.service.ApprovalDirectoryService; +import com.gxwebsoft.approval.vo.ApprovalFlowOptionVO; import com.gxwebsoft.approval.vo.ApprovalOrganizationVO; import com.gxwebsoft.approval.vo.ApprovalUserVO; import com.gxwebsoft.common.core.web.ApiResult; @@ -26,6 +27,8 @@ public class ApprovalDirectoryController extends BaseController { @Resource private ApprovalDirectoryService directoryService; + @Resource + private com.gxwebsoft.approval.document.ApprovalDocumentRegistry documentRegistry; @PreAuthorize("hasAuthority('approval:instance:list')") @ApiOperation("启用组织") @@ -34,6 +37,20 @@ public class ApprovalDirectoryController extends BaseController { return success(directoryService.listOrganizations()); } + /** + * 流程类型选项:取自单据实现注册表,新增单据自动出现,前端不再维护静态映射。 + */ + @PreAuthorize("hasAnyAuthority('approval:instance:list', 'approval:instance:assign', 'approval:price:view')") + @ApiOperation("流程类型选项(flowCode → 流程名称)") + @GetMapping("/flows") + public ApiResult> flows() { + List options = new java.util.ArrayList<>(); + for (com.gxwebsoft.approval.document.ApprovalDocumentType type : documentRegistry.all()) { + options.add(new ApprovalFlowOptionVO(type.flowCode(), type.flowName())); + } + return success(options); + } + @PreAuthorize("hasAnyAuthority('approval:instance:list', 'approval:instance:assign')") @ApiOperation("启用用户搜索") @GetMapping("/users") diff --git a/src/main/java/com/gxwebsoft/approval/vo/ApprovalFlowOptionVO.java b/src/main/java/com/gxwebsoft/approval/vo/ApprovalFlowOptionVO.java new file mode 100644 index 0000000..4e7e3a6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/approval/vo/ApprovalFlowOptionVO.java @@ -0,0 +1,27 @@ +package com.gxwebsoft.approval.vo; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.io.Serializable; + +/** + * 流程类型选项:flowCode → 流程名称,供两端「按流程类型筛选」下拉使用。 + */ +@Data +@ApiModel(description = "审批流程类型选项") +public class ApprovalFlowOptionVO implements Serializable { + private static final long serialVersionUID = 1L; + + private String flowCode; + + private String flowName; + + public ApprovalFlowOptionVO() { + } + + public ApprovalFlowOptionVO(String flowCode, String flowName) { + this.flowCode = flowCode; + this.flowName = flowName; + } +}