From bf25d65f53d83676efacef0c272738237c4d91d3 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 7 Dec 2023 15:21:51 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B5=81=E7=A8=8B=E4=B8=AD=E5=BF=83?=
 =?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/WorkCenterController.java      |  2 +-
 .../activiti/mapper/xml/ProcessAllMapper.xml  | 25 +++++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java
index 7d55d9ed..3ee6dc20 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java
@@ -100,7 +100,7 @@ public class WorkCenterController {
         return Result.OK(sentList);
     }
 
-    @ApiOperation(value = "查询全部流程")
+    @ApiOperation(value = "监控流程")
     @GetMapping("/getAllList")
     public Result<?> getAllList(ProcessAll processAll,
                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml
index e9b4390b..fb722407 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml
@@ -26,20 +26,19 @@
                p.project_id,
                p.project_name,
                p.prc_name_en,
-               group_concat(par.user_id) as handleUserId,
-               par.node_id
+               group_concat(par.user_id) as handleUserId
         from (
                  select pa.*,
                         max(par.create_time) as receivedTaskTime,
-                        max(par.end_time)    as completedTaskTime,
-                        par.node_id
+                        max(par.end_time)    as completedTaskTime
                  from process_all pa
                           left join process_approval_record par on pa.process_instance_id = par.process_instance_id
                      ${ew.customSqlSegment}
+                group by pa.id
              ) p
-                 left join process_approval_record par on p.process_instance_id = par.process_instance_id
-        WHERE par.finish_flag = 0
-           or par.id is null
+                 LEFT JOIN (
+                        SELECT user_id,process_instance_id from process_approval_record WHERE finish_flag = 1
+                    ) par ON p.process_instance_id = par.process_instance_id
         group by p.process_instance_id
     </select>
 
@@ -50,9 +49,11 @@
                  from process_all pa
                           left join process_approval_record par on pa.process_instance_id = par.process_instance_id
                      ${ew.customSqlSegment}
+                    group by pa.id
              ) p
-                 left join process_approval_record par on p.process_instance_id = par.process_instance_id
-        WHERE par.finish_flag = 0 or par.id is null
+            LEFT JOIN (
+                SELECT user_id,process_instance_id from process_approval_record WHERE finish_flag = 1
+            ) par ON p.process_instance_id = par.process_instance_id
         group by p.process_instance_id
     </select>
 
@@ -63,9 +64,11 @@
                  from process_all pa
                           left join process_approval_record par on pa.process_instance_id = par.process_instance_id
                      ${ew.customSqlSegment}
+                    group by pa.id
              ) p
-                 left join process_approval_record par on p.process_instance_id = par.process_instance_id
-        WHERE par.finish_flag = 0 or par.id is null
+            LEFT JOIN (
+                SELECT user_id,process_instance_id from process_approval_record WHERE finish_flag = 1
+            ) par ON p.process_instance_id = par.process_instance_id
         group by p.process_instance_id
     </select>
 </mapper>
\ No newline at end of file