From a7f100ddfd51270857e8231dc3f62a6ca009fcbd Mon Sep 17 00:00:00 2001
From: jinqiming <45981669@qq.com>
Date: Thu, 21 Jan 2021 19:52:59 +0800
Subject: [PATCH] 11

---
 .../com/snow/web/controller/flowable/FlowController.java     | 4 ++++
 .../src/main/resources/templates/flow/myStartProcess.html    | 3 +--
 .../com/snow/flowable/service/impl/FlowableServiceImpl.java  | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowController.java b/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowController.java
index 0cc372d..c0930cb 100644
--- a/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowController.java
+++ b/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowController.java
@@ -151,6 +151,10 @@ public class FlowController extends BaseController {
         return prefix +"/myStartProcessDetail";
     }
 
+    /**
+     * 我参与的任务
+     * @return
+     */
     @RequiresPermissions("flow:process:getMyTakePartInProcess")
     @GetMapping("/toMyTakePartInProcess")
     public String getMyTakePartInProcess()
diff --git a/snow-admin/src/main/resources/templates/flow/myStartProcess.html b/snow-admin/src/main/resources/templates/flow/myStartProcess.html
index 2d4fb55..0a4b280 100644
--- a/snow-admin/src/main/resources/templates/flow/myStartProcess.html
+++ b/snow-admin/src/main/resources/templates/flow/myStartProcess.html
@@ -13,7 +13,7 @@
                     <div class="row">
                         <ul>
                             <li>
-                                <label>&nbsp;&nbsp; 流程名称：</label>
+                                <label>流程名称：</label>
                                 <input type="text" name="processDefinitionName"/>
                             </li>
                             <li>
@@ -40,7 +40,6 @@
      <th:block th:include="include :: select2-js" />
      <script th:inline="javascript">
          var detailFlag = [[${@permission.hasPermi('system:flow:myStartProcessDetail')}]];
-
          var processInstanceStatusDatas = [[${@dict.getType('process_instance_status')}]];
          var prefixFlow = ctx + "flow";
          $(function() {
diff --git a/snow-flowable/src/main/java/com/snow/flowable/service/impl/FlowableServiceImpl.java b/snow-flowable/src/main/java/com/snow/flowable/service/impl/FlowableServiceImpl.java
index 4049353..3a75c01 100644
--- a/snow-flowable/src/main/java/com/snow/flowable/service/impl/FlowableServiceImpl.java
+++ b/snow-flowable/src/main/java/com/snow/flowable/service/impl/FlowableServiceImpl.java
@@ -620,6 +620,9 @@ public class FlowableServiceImpl implements FlowableService {
         if(!StringUtils.isEmpty(processInstanceDTO.getStartedUserId())){
             historicProcessInstanceQuery.startedBy(processInstanceDTO.getStartedUserId());
         }
+        if(!StringUtils.isEmpty(processInstanceDTO.getProcessDefinitionName())){
+            historicProcessInstanceQuery.processDefinitionName(processInstanceDTO.getProcessDefinitionName());
+        }
         historicProcessInstanceQuery.includeProcessVariables();
         long count = historicProcessInstanceQuery.
                 orderByProcessInstanceStartTime().
@@ -683,7 +686,7 @@ public class FlowableServiceImpl implements FlowableService {
                 }
         );
         if(!StringUtils.isEmpty(historicTaskInstanceDTO.getBusinessKeyLike())){
-            historicTaskInstanceQuery.processInstanceBusinessKeyLike(historicTaskInstanceDTO.getBusinessKeyLike());
+            historicTaskInstanceQuery.processInstanceBusinessKeyLike("%"+historicTaskInstanceDTO.getBusinessKeyLike()+"%");
         }
         if(!StringUtils.isEmpty(historicTaskInstanceDTO.getBusinessKey())){
             historicTaskInstanceQuery.processInstanceBusinessKey(historicTaskInstanceDTO.getBusinessKey());