From 76584319d4ab734ae83780c113fb410546b60ad6 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Fri, 8 Jul 2022 11:22:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=B5=81=E7=A8=8B=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89key=E8=8E=B7=E5=8F=96=E5=AF=B9=E5=BA=94=E5=B7=B2?=
 =?UTF-8?q?=E5=8A=9E=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/activiti/controller/HistoryController.java      | 6 +++++-
 .../modules/activiti/service/impl/ActivitiServiceImpl.java  | 5 +----
 .../main/resources/mapper/activiti/ProcessActivityDao.xml   | 3 +++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java b/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java
index 5af458bb..c1cfde9b 100644
--- a/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java
+++ b/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java
@@ -122,10 +122,14 @@ public class HistoryController {
             @ApiImplicitParam(name = "startBeginTime", value = "流程启动开始时间", paramType = "query", dataType = "Date"),
             @ApiImplicitParam(name = "startEndTime", value = "流程启动结束时间", paramType = "query", dataType = "Date"),
             @ApiImplicitParam(name = "finishedBeginTime", value = "流程完成开始时间", paramType = "query", dataType = "Date"),
-            @ApiImplicitParam(name = "finishedEndTime", value = "流程完成结束时间", paramType = "query", dataType = "Date")
+            @ApiImplicitParam(name = "finishedEndTime", value = "流程完成结束时间", paramType = "query", dataType = "Date"),
+            @ApiImplicitParam(name = "processDefinitionKey", value = "流程定义KEY", paramType = "query", dataType = "String")
     })
 //    @RequiresPermissions("sys:his:all")
     public Result<ProcessActivityDTO> getMyHandledInstancePage(@ApiIgnore @RequestParam Map<String, Object> params) {
+        if (params.containsKey("processDefinitionKey") && StringUtils.isNotEmpty(params.get("processDefinitionKey").toString())) {
+            params.replace("processDefinitionKey", params.get("processDefinitionKey").toString() + "%");
+        }
         PageData<ProcessActivityDTO> page = activitiService.getMyProcessInstancePage(params);
         setExtraProcessProperties(Optional.ofNullable(page.getList()).orElse(new ArrayList<>()));
         return new Result().ok(page);
diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/service/impl/ActivitiServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/activiti/service/impl/ActivitiServiceImpl.java
index 9c286659..c74cca65 100644
--- a/renren-admin/src/main/java/io/renren/modules/activiti/service/impl/ActivitiServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/activiti/service/impl/ActivitiServiceImpl.java
@@ -15,9 +15,6 @@ import io.renren.modules.activiti.service.ActivitiService;
 import io.renren.modules.security.user.SecurityUser;
 import io.renren.modules.sys.dto.SysUserDTO;
 import io.renren.modules.sys.service.SysUserService;
-import org.activiti.engine.history.HistoricTaskInstance;
-import org.activiti.engine.history.HistoricTaskInstanceQuery;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -61,7 +58,7 @@ public class ActivitiServiceImpl extends BaseServiceImpl<ProcessActivityDao, Pro
             params.put("userId", user.getId());
             list.addAll(baseDao.getMyProcessInstancePage(params));
         }
-        List<ProcessActivityDTO> result=ConvertUtils.sourceToTarget(list, ProcessActivityDTO.class);
+        List<ProcessActivityDTO> result = ConvertUtils.sourceToTarget(list, ProcessActivityDTO.class);
         Page<ProcessActivityDTO> page = new Page(curPage, limit);
         int j = Math.min(curPage * limit, result.size());
         if (result.isEmpty()) {
diff --git a/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml b/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml
index c51e9442..85bf0935 100644
--- a/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml
+++ b/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml
@@ -53,6 +53,9 @@
         <if test="finishedEndTime != null">
             <![CDATA[and ahp.END_TIME_ <= #{finishedEndTime}]]>
         </if>
+        <if test="processDefinitionKey != null">
+            aht.PROC_DEF_ID_ LIKE #{processDefinitionKey}
+        </if>
         ORDER BY
         ahp.START_TIME_ DESC
     </select>