wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-2752-增加流程管理员数量查询逻辑

Browse Source
This commit is contained in:
yangqicheng 2024-10-12 18:50:08 +08:00
parent ab54c7af75
commit ec39ba0ef0
6 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/manage/ProcessAdminApi.java
View File

@ -29,6 +29,15 @@ public interface ProcessAdminApi {
@InvokeMode(SYNC)
CommonResponse<List<ProcessAdminVo>> queryProcessAdmins(@RequestBody ProcessAdminQueryDTO dto);
/**
* 查询管理员
* @param dto 管理员数据
* @return 管理员id
*/
@PostMapping("/api/process/admin/query/count")
@InvokeMode(SYNC)
CommonResponse<Integer> queryProcessAdminsCount(@RequestBody ProcessAdminQueryDTO dto);
/**
* 添加管理员
* @param dto 管理员数据

7
workflow-engine-axzo-ext/src/main/java/cn/axzo/workflow/admin/service/ExtAxProcessAdminService.java
View File

@ -27,6 +27,13 @@ public interface ExtAxProcessAdminService {
*/
List<ExtAxProcessAdmin> query(ProcessAdminQueryDTO queryDTO);
/**
* 根据条件查询数量
* @param queryDTO
* @return
*/
Integer queryCount(ProcessAdminQueryDTO queryDTO);
/**
* 根据条件删除管理员配置
* @param processAdmin 删除条件

14
workflow-engine-axzo-ext/src/main/java/cn/axzo/workflow/admin/service/impl/ExtAxProcessAdminServiceImpl.java
View File

@ -42,14 +42,24 @@ public class ExtAxProcessAdminServiceImpl implements ExtAxProcessAdminService {
if (queryDTO == null) {
return Collections.emptyList();
}
LambdaQueryWrapper<ExtAxProcessAdmin> queryWrapper = new LambdaQueryWrapper<ExtAxProcessAdmin>()
return extAxProcessAdminMapper.selectList(getQueryWrapper(queryDTO));
}
@Override
public Integer queryCount(ProcessAdminQueryDTO queryDTO) {
return extAxProcessAdminMapper.selectCount(getQueryWrapper(queryDTO));
}
private LambdaQueryWrapper<ExtAxProcessAdmin> getQueryWrapper(ProcessAdminQueryDTO queryDTO) {
return new LambdaQueryWrapper<ExtAxProcessAdmin>()
.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

7
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/admin/ProcessAdminQueryDTO.java
View File

@ -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;
}

5
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/ProcessAdminController.java
View File

@ -58,6 +58,11 @@ public class ProcessAdminController implements ProcessAdminApi {
return CommonResponse.success(adminVos);
}
@Override
public CommonResponse<Integer> queryProcessAdminsCount(ProcessAdminQueryDTO dto) {
return CommonResponse.success(extAxProcessAdminService.queryCount(dto));
}
@PostMapping("/create")
@Override
public CommonResponse<Long> createProcessAdmin(@RequestBody ProcessAdminCreateDTO dto) {

9
workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowManageService.java
View File

@ -763,6 +763,15 @@ public interface WorkflowManageService {
@InvokeMode(SYNC)
List<ProcessAdminVo> queryProcessAdmins(@RequestBody ProcessAdminQueryDTO dto);
/**
* 查询管理员
* @param dto 管理员数据
* @return 管理员id
*/
@PostMapping("/api/process/admin/query/count")
@InvokeMode(SYNC)
Integer queryProcessAdminsCount(@RequestBody ProcessAdminQueryDTO dto);
/**
* 添加管理员
* @param dto 管理员数据