From ec39ba0ef09003d8762bb318968a5a24f50c6d20 Mon Sep 17 00:00:00 2001 From: yangqicheng Date: Sat, 12 Oct 2024 18:50:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REQ-2752-=E5=A2=9E=E5=8A=A0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=AE=A1=E7=90=86=E5=91=98=E6=95=B0=E9=87=8F=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/feign/manage/ProcessAdminApi.java | 9 +++++++++ .../admin/service/ExtAxProcessAdminService.java | 7 +++++++ .../service/impl/ExtAxProcessAdminServiceImpl.java | 14 ++++++++++++-- .../model/request/admin/ProcessAdminQueryDTO.java | 7 +++++++ .../web/manage/ProcessAdminController.java | 5 +++++ .../starter/api/WorkflowManageService.java | 9 +++++++++ 6 files changed, 49 insertions(+), 2 deletions(-) diff --git a/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/manage/ProcessAdminApi.java b/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/manage/ProcessAdminApi.java index 4401a5720..39d50a9dd 100644 --- a/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/manage/ProcessAdminApi.java +++ b/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/manage/ProcessAdminApi.java @@ -29,6 +29,15 @@ public interface ProcessAdminApi { @InvokeMode(SYNC) CommonResponse> queryProcessAdmins(@RequestBody ProcessAdminQueryDTO dto); + /** + * 查询管理员 + * @param dto 管理员数据 + * @return 管理员id + */ + @PostMapping("/api/process/admin/query/count") + @InvokeMode(SYNC) + CommonResponse queryProcessAdminsCount(@RequestBody ProcessAdminQueryDTO dto); + /** * 添加管理员 * @param dto 管理员数据 diff --git a/workflow-engine-axzo-ext/src/main/java/cn/axzo/workflow/admin/service/ExtAxProcessAdminService.java b/workflow-engine-axzo-ext/src/main/java/cn/axzo/workflow/admin/service/ExtAxProcessAdminService.java index 676efb6f0..dc5456c9f 100644 --- a/workflow-engine-axzo-ext/src/main/java/cn/axzo/workflow/admin/service/ExtAxProcessAdminService.java +++ b/workflow-engine-axzo-ext/src/main/java/cn/axzo/workflow/admin/service/ExtAxProcessAdminService.java @@ -27,6 +27,13 @@ public interface ExtAxProcessAdminService { */ List query(ProcessAdminQueryDTO queryDTO); + /** + * 根据条件查询数量 + * @param queryDTO + * @return + */ + Integer queryCount(ProcessAdminQueryDTO queryDTO); + /** * 根据条件删除管理员配置 * @param processAdmin 删除条件 diff --git a/workflow-engine-axzo-ext/src/main/java/cn/axzo/workflow/admin/service/impl/ExtAxProcessAdminServiceImpl.java b/workflow-engine-axzo-ext/src/main/java/cn/axzo/workflow/admin/service/impl/ExtAxProcessAdminServiceImpl.java index 4bb8a3868..77ea8a750 100644 --- a/workflow-engine-axzo-ext/src/main/java/cn/axzo/workflow/admin/service/impl/ExtAxProcessAdminServiceImpl.java +++ b/workflow-engine-axzo-ext/src/main/java/cn/axzo/workflow/admin/service/impl/ExtAxProcessAdminServiceImpl.java @@ -42,14 +42,24 @@ public class ExtAxProcessAdminServiceImpl implements ExtAxProcessAdminService { if (queryDTO == null) { return Collections.emptyList(); } - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + return extAxProcessAdminMapper.selectList(getQueryWrapper(queryDTO)); + } + + + @Override + public Integer queryCount(ProcessAdminQueryDTO queryDTO) { + return extAxProcessAdminMapper.selectCount(getQueryWrapper(queryDTO)); + } + + private LambdaQueryWrapper getQueryWrapper(ProcessAdminQueryDTO queryDTO) { + return new LambdaQueryWrapper() .in(!CollectionUtils.isEmpty(queryDTO.getProcessAdminIds()), ExtAxProcessAdmin::getId, queryDTO.getProcessAdminIds()) .eq(Objects.nonNull(queryDTO.getWorkspaceId()), ExtAxProcessAdmin::getWorkspaceId, queryDTO.getWorkspaceId()) + .eq(queryDTO.getAdminType() != null, ExtAxProcessAdmin::getAdminType, queryDTO.getAdminType()) .eq(Objects.nonNull(queryDTO.getOrganizationalUnitId()), ExtAxProcessAdmin::getOrganizationalUnitId, queryDTO.getOrganizationalUnitId()) .in(!CollectionUtils.isEmpty(queryDTO.getPersonIds()), ExtAxProcessAdmin::getPersonId, queryDTO.getPersonIds()) .eq(Objects.nonNull(queryDTO.getDataSource()), ExtAxProcessAdmin::getDataSource, queryDTO.getDataSource()) .eq(ExtAxProcessAdmin::getIsDelete, TableIsDeleteEnum.NORMAL.value); - return extAxProcessAdminMapper.selectList(queryWrapper); } @Override diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/admin/ProcessAdminQueryDTO.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/admin/ProcessAdminQueryDTO.java index 1b26e2fda..85a3ebe06 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/admin/ProcessAdminQueryDTO.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/admin/ProcessAdminQueryDTO.java @@ -1,6 +1,7 @@ package cn.axzo.workflow.common.model.request.admin; import cn.axzo.workflow.common.enums.AdminDataSource; +import cn.axzo.workflow.common.enums.AdminTypeEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -49,4 +50,10 @@ public class ProcessAdminQueryDTO { */ @ApiModelProperty(value = "数据来源") private AdminDataSource dataSource; + + /** + * 管理员类型 + */ + @ApiModelProperty(value = "管理员类型") + private AdminTypeEnum adminType; } diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/ProcessAdminController.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/ProcessAdminController.java index c4d6beb33..937124fdf 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/ProcessAdminController.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/ProcessAdminController.java @@ -58,6 +58,11 @@ public class ProcessAdminController implements ProcessAdminApi { return CommonResponse.success(adminVos); } + @Override + public CommonResponse queryProcessAdminsCount(ProcessAdminQueryDTO dto) { + return CommonResponse.success(extAxProcessAdminService.queryCount(dto)); + } + @PostMapping("/create") @Override public CommonResponse createProcessAdmin(@RequestBody ProcessAdminCreateDTO dto) { diff --git a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowManageService.java b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowManageService.java index f2462350e..95c4516f5 100644 --- a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowManageService.java +++ b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowManageService.java @@ -763,6 +763,15 @@ public interface WorkflowManageService { @InvokeMode(SYNC) List queryProcessAdmins(@RequestBody ProcessAdminQueryDTO dto); + /** + * 查询管理员 + * @param dto 管理员数据 + * @return 管理员id + */ + @PostMapping("/api/process/admin/query/count") + @InvokeMode(SYNC) + Integer queryProcessAdminsCount(@RequestBody ProcessAdminQueryDTO dto); + /** * 添加管理员 * @param dto 管理员数据 From 3a2c137503059f7e4c5dec902ed75d48655cb514 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Sat, 12 Oct 2024 18:57:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(REQ-2752)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C=E5=93=8D=E5=BA=94=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/model/response/es/ProcessInstanceDocumentVO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/response/es/ProcessInstanceDocumentVO.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/response/es/ProcessInstanceDocumentVO.java index 32fa5c9cf..8c3755e1e 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/response/es/ProcessInstanceDocumentVO.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/response/es/ProcessInstanceDocumentVO.java @@ -23,7 +23,7 @@ public class ProcessInstanceDocumentVO { /** * 流程实例名称 */ - private String name; + private String processInstanceName; /** * 业务传入业务信息