From 1d134e0bff658ca743d248bebd0ed2a4a44de140 Mon Sep 17 00:00:00 2001
From: luckyheng <flowable@qq.com>
Date: Thu, 25 Feb 2021 11:01:02 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=B7=A5=E4=BD=9C=E6=B5=81=E7=A8=8B=201.?=
 =?UTF-8?q?=20=E6=A8=A1=E5=9E=8B=E7=AE=A1=E7=90=86=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=202.=20=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/process/model/main.html         |  3 +-
 .../controller/ProDefinedController.java      | 44 +++++++++++--------
 .../controller/ProModelController.java        | 12 +++--
 3 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/pear-entrance/src/main/resources/templates/process/model/main.html b/pear-entrance/src/main/resources/templates/process/model/main.html
index 1afe5331..18e340a4 100644
--- a/pear-entrance/src/main/resources/templates/process/model/main.html
+++ b/pear-entrance/src/main/resources/templates/process/model/main.html
@@ -10,7 +10,7 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">模型名称</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="realName" placeholder="" class="layui-input">
+                    <input type="text" name="modelName" placeholder="" class="layui-input">
                 </div>
                 <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="model-query">
                     <i class="layui-icon layui-icon-search"></i>
@@ -111,6 +111,7 @@
         });
 
         form.on('submit(model-query)', function (data) {
+            console.log(data);
             table.reload('model-table', {where: data.field})
             return false;
         });
diff --git a/pear-modules/pear-process/src/main/java/com/pearadmin/process/controller/ProDefinedController.java b/pear-modules/pear-process/src/main/java/com/pearadmin/process/controller/ProDefinedController.java
index f18680b5..693c488c 100644
--- a/pear-modules/pear-process/src/main/java/com/pearadmin/process/controller/ProDefinedController.java
+++ b/pear-modules/pear-process/src/main/java/com/pearadmin/process/controller/ProDefinedController.java
@@ -8,8 +8,11 @@ import com.pearadmin.common.web.domain.response.module.ResultTable;
 import com.pearadmin.process.domain.ProDefined;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.repository.ProcessDefinition;
+import org.activiti.engine.repository.ProcessDefinitionQuery;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
+
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -22,19 +25,19 @@ import java.util.List;
  * Describe: 流程定义控制器
  * Author: 就眠仪式
  * createTime: 2019/10/23
- * */
+ */
 @RestController
 @RequestMapping(ControllerConstant.API_PROCESS_PREFIX + "defined")
 public class ProDefinedController extends BaseController {
 
     /**
      * 基础路径
-     * */
+     */
     private String modelPath = "process/defined/";
 
     /**
      * 工作流程服务
-     * */
+     */
     @Resource
     private RepositoryService repositoryService;
 
@@ -42,9 +45,9 @@ public class ProDefinedController extends BaseController {
      * Describe: 获取流程定义列表视图
      * Param: modelAndView
      * Return: 流程定义列表视图
-     * */
+     */
     @GetMapping("main")
-    public ModelAndView main(){
+    public ModelAndView main() {
         return jumpPage(modelPath + "main");
     }
 
@@ -52,15 +55,18 @@ public class ProDefinedController extends BaseController {
      * Describe: 获取流程定义列表数据
      * Param: modelAndView
      * Return: 流程定义列表数据
-     * */
+     */
     @GetMapping("data")
-    public ResultTable data(PageDomain pageDomain){
-
-        List<ProcessDefinition> processDefinitions = repositoryService
-                .createProcessDefinitionQuery()
+    public ResultTable data(PageDomain pageDomain, String name) {
+        ProcessDefinitionQuery processDefinitionQuery = repositoryService
+                .createProcessDefinitionQuery();
+        if (StringUtils.hasText(name)) {
+            processDefinitionQuery.processDefinitionNameLike(name);
+        }
+        List<ProcessDefinition> processDefinitions = processDefinitionQuery
                 .orderByProcessDefinitionVersion()
                 .asc()
-                .listPage(pageDomain.start(),pageDomain.end());
+                .listPage(pageDomain.start(), pageDomain.end());
 
         List<ProDefined> data = new ArrayList<>();
 
@@ -76,19 +82,19 @@ public class ProDefinedController extends BaseController {
             data.add(defined);
         });
 
-        long count = repositoryService.createProcessDefinitionQuery().orderByProcessDefinitionVersion().asc().count();
+        long count = processDefinitionQuery.orderByProcessDefinitionVersion().asc().count();
 
-        return pageTable(data,count);
+        return pageTable(data, count);
     }
 
     /**
      * Describe: 根据 Id 删除流程定义
      * Param: deploymentId
      * Return: Result
-     * */
+     */
     @DeleteMapping("remove/{deploymentId}")
-    public Result remove(@PathVariable String deploymentId){
-        repositoryService.deleteDeployment(deploymentId,true);
+    public Result remove(@PathVariable String deploymentId) {
+        repositoryService.deleteDeployment(deploymentId, true);
         return Result.success("删除成功");
     }
 
@@ -97,7 +103,7 @@ public class ProDefinedController extends BaseController {
      * Param: processDefineId
      * Param: resourceName
      * Return: InputStream
-     * */
+     */
     private InputStream getProcessDefineResource(String processDefineId, String resourceName) {
         return repositoryService.getResourceAsStream(processDefineId, resourceName);
     }
@@ -107,10 +113,10 @@ public class ProDefinedController extends BaseController {
      * Param: processDefineId
      * Param: resourceName
      * Return: 流程模型列表视图
-     * */
+     */
     @GetMapping("/resource")
     public void getProcessDefineResource(HttpServletResponse response,
-                                     @RequestParam("definedId") String processDefineId,String resourceName){
+                                         @RequestParam("definedId") String processDefineId, String resourceName) {
         InputStream inputStream = getProcessDefineResource(processDefineId, resourceName);
         byte[] bytes = new byte[1024];
         try {
diff --git a/pear-modules/pear-process/src/main/java/com/pearadmin/process/controller/ProModelController.java b/pear-modules/pear-process/src/main/java/com/pearadmin/process/controller/ProModelController.java
index 86353f9f..1169c8a1 100644
--- a/pear-modules/pear-process/src/main/java/com/pearadmin/process/controller/ProModelController.java
+++ b/pear-modules/pear-process/src/main/java/com/pearadmin/process/controller/ProModelController.java
@@ -16,6 +16,8 @@ import org.activiti.editor.language.json.converter.BpmnJsonConverter;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.repository.Deployment;
 import org.activiti.engine.repository.Model;
+import org.activiti.engine.repository.ModelQuery;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -70,8 +72,12 @@ public class ProModelController extends BaseController {
      * Return: ResultTable
      * */
     @GetMapping("data")
-    public ResultTable list(PageDomain pageDomain){
-        List<Model> list = repositoryService.createModelQuery().listPage(pageDomain.start(),pageDomain.end());
+    public ResultTable list(PageDomain pageDomain,String modelName){
+        ModelQuery modelQuery = repositoryService.createModelQuery();
+        if (StringUtils.hasText(modelName)){
+            modelQuery.modelNameLike(modelName);
+        }
+        List<Model> list = modelQuery.listPage(pageDomain.start(),pageDomain.end());
         List<ProModel> data = new ArrayList<>();
 
         list.forEach(model -> {
@@ -83,7 +89,7 @@ public class ProModelController extends BaseController {
             data.add(proModel);
         });
 
-        long count = repositoryService.createModelQuery().list().size();
+        long count = modelQuery.list().size();
         return pageTable(data,count);
     }
 
-- 
Gitee