From 82bee649d6b5b3ecfef5b4b6762ad811d9911b3f Mon Sep 17 00:00:00 2001 From: lijiarao Date: Sun, 8 Oct 2023 10:55:50 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A8=A1=E6=9D=BF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ActivitiModelerController.java | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiModelerController.java b/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiModelerController.java index d109fbdc..9b97f374 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiModelerController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiModelerController.java @@ -87,7 +87,7 @@ public class ActivitiModelerController { @ApiImplicitParam(name = "category_id", value = "类型id") @SuppressWarnings("deprecation") @GetMapping("/create") - public void newModel(HttpServletRequest request, HttpServletResponse response, String category_id) + public void newModel(HttpServletRequest request, HttpServletResponse response) throws IOException { // 初始化一个空模型 Model model = repositoryService.newModel(); @@ -126,19 +126,18 @@ public class ActivitiModelerController { @ApiOperation(value = "模板列表") @ApiImplicitParams({ @ApiImplicitParam(name = "name", value = "名称"), - @ApiImplicitParam(name = "category_id", value = "类型id") }) + @ApiImplicitParam(name = "category", value = "类型") }) @GetMapping("/modelList") - public Result> modelList(String name, String category_id) { - //String sql = "select distinct RES.* from ACT_RE_MODEL RES WHERE RES.TENANT_ID_ = '子系统1' and RES.NAME_<>'' and RES.CATEGORY_=#{category} order by RES.CREATE_TIME_ desc"; - String sql = "select distinct RES.* from ACT_RE_MODEL RES WHERE RES.NAME_<>'' order by RES.CREATE_TIME_ desc"; - NativeModelQuery nativeModelQuery = repositoryService.createNativeModelQuery(); - //if (StringUtils.isNull(category_id)) { - // sql = sql.replace("and RES.CATEGORY_=#{category}", ""); - //}else { - // nativeModelQuery.parameter("category", category_id); - //} - nativeModelQuery.sql(sql); - List list = nativeModelQuery.list(); + public Result> modelList(String name, String category) { + ModelQuery modelQuery = repositoryService.createModelQuery(); + if (StringUtils.isNotBlank(category)) { + modelQuery.modelCategoryLike("%"+category+"%"); + } + if (StringUtils.isNotBlank(name)) { + modelQuery.modelNameLike("%" + name + "%"); + } + + List list = modelQuery.orderByCreateTime().desc().list(); return Result.OK(list); }