diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/model/vo/ModelPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/model/vo/ModelPageReqVO.java index 480b3e20..1aa99961 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/model/vo/ModelPageReqVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/model/vo/ModelPageReqVO.java @@ -14,7 +14,13 @@ import lombok.ToString; @ToString(callSuper = true) public class ModelPageReqVO extends PageParam { - @ApiModelProperty(value = "名字", example = "芋道") + @ApiModelProperty(value = "标识", example = "process1641042089407", notes = "精准匹配") + private String key; + + @ApiModelProperty(value = "名字", example = "芋道", notes = "模糊匹配") private String name; + @ApiModelProperty(value = "流程分类", notes = "参见 bpm_model_category 数据字典", example = "1") + private String category; + } diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/model/impl/BpmModelServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/model/impl/BpmModelServiceImpl.java index fbfb3577..508c17a1 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/model/impl/BpmModelServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/model/impl/BpmModelServiceImpl.java @@ -55,9 +55,15 @@ public class BpmModelServiceImpl implements BpmModelService { @Override public PageResult getModelPage(ModelPageReqVO pageVO) { ModelQuery modelQuery = repositoryService.createModelQuery(); + if (StrUtil.isNotBlank(pageVO.getKey())) { + modelQuery.modelKey(pageVO.getKey()); + } if (StrUtil.isNotBlank(pageVO.getName())) { modelQuery.modelNameLike("%" + pageVO.getName() + "%"); // 模糊匹配 } + if (StrUtil.isNotBlank(pageVO.getCategory())) { + modelQuery.modelCategory(pageVO.getCategory()); + } // 执行查询 List models = modelQuery.orderByCreateTime().desc() .listPage(PageUtils.getStart(pageVO), pageVO.getPageSize()); diff --git a/yudao-admin-ui/src/utils/dict.js b/yudao-admin-ui/src/utils/dict.js index 83d99ed0..392a491b 100644 --- a/yudao-admin-ui/src/utils/dict.js +++ b/yudao-admin-ui/src/utils/dict.js @@ -8,6 +8,7 @@ import store from '@/store' export const DICT_TYPE = { USER_TYPE: 'user_type', + // system SYS_COMMON_STATUS: 'sys_common_status', SYS_MENU_TYPE: 'sys_menu_type', SYS_ROLE_TYPE: 'sys_role_type', @@ -24,13 +25,17 @@ export const DICT_TYPE = { SYS_SMS_RECEIVE_STATUS: 'sys_sms_receive_status', SYS_ERROR_CODE_TYPE: 'sys_error_code_type', + // infra INF_REDIS_TIMEOUT_TYPE: 'inf_redis_timeout_type', INF_JOB_STATUS: 'inf_job_status', INF_JOB_LOG_STATUS: 'inf_job_log_status', INF_API_ERROR_LOG_PROCESS_STATUS: 'inf_api_error_log_process_status', + // tool TOOL_CODEGEN_TEMPLATE_TYPE: 'tool_codegen_template_type', + // bpm + BPM_MODEL_CATEGORY: 'bpm_model_category', OA_LEAVE_STATUS: 'flow_status', OA_LEAVE_TYPE: 'oa_leave_type' } diff --git a/yudao-admin-ui/src/views/bpm/model/index.vue b/yudao-admin-ui/src/views/bpm/model/index.vue index f2cba25c..55de377d 100644 --- a/yudao-admin-ui/src/views/bpm/model/index.vue +++ b/yudao-admin-ui/src/views/bpm/model/index.vue @@ -3,10 +3,19 @@ - - + + + + + + + + + 搜索 重置 @@ -24,10 +33,13 @@ - - + + + @@ -59,6 +71,7 @@