From ec248c1b487cef4de08a47d869488c10fa907dcc Mon Sep 17 00:00:00 2001
From: lijiarao <136157943@qq.com>
Date: Sat, 3 Feb 2024 22:30:29 +0800
Subject: [PATCH] =?UTF-8?q?fix=2080442=20=E5=B7=B2=E5=8A=9E=E6=80=A7?=
 =?UTF-8?q?=E8=83=BD=E6=9C=AA=E8=BE=BE=E6=A0=87=EF=BC=8C=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E4=BA=BA1k=E6=95=B0=E6=8D=AE=E9=87=8F=EF=BC=8C=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=8A=E7=82=B9=E5=87=BB=E6=9F=A5=E8=AF=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=97=B6=E5=B7=B2=E8=B6=853s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/mapper/xml/ProcessAllMapper.xml  | 38 ++++++++++++-------
 .../activiti/service/ProcessAllService.java   | 15 +++++++-
 2 files changed, 38 insertions(+), 15 deletions(-)

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 c7d17691..50bc4622 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
@@ -19,23 +19,33 @@
     </select>
 
     <select id="getCompletedList" resultType="com.jero.modules.activiti.entity.ProcessAll">
-        select p.*,
-               group_concat(par.user_id) as handleUserId
-        from (
-                 select pa.*,
-                        max(par.create_time) as receivedTaskTime,
-                        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}
-             ) p
-                 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 pa.*,
+        max(par.create_time) as receivedTaskTime,
+        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}
         <include refid="order"/>
     </select>
 
+<!--    <select id="getCompletedList" resultType="com.jero.modules.activiti.entity.ProcessAll">-->
+<!--        select p.*,-->
+<!--               group_concat(par.user_id) as handleUserId-->
+<!--        from (-->
+<!--                 select pa.*,-->
+<!--                        max(par.create_time) as receivedTaskTime,-->
+<!--                        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}-->
+<!--             ) p-->
+<!--                 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-->
+<!--        <include refid="order"/>-->
+<!--    </select>-->
+
     <select id="getSentList" resultType="com.jero.modules.activiti.entity.ProcessAll">
         select p.*, group_concat(par.user_id) as handleUserId
         from (
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
index 0bfa10de..6fb942c9 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
@@ -107,7 +107,20 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
     public IPage<ProcessAll> getCompletedList(Page<ProcessAll> page, QueryWrapper<ProcessAll> queryWrapper, HttpServletRequest req) {
         String column = req.getParameter("column");
         String order = req.getParameter("order");
-        return processAllMapper.getCompletedList(page,queryWrapper,column,order);
+        IPage<ProcessAll> completedList = processAllMapper.getCompletedList(page, queryWrapper, column, order);
+        List<ProcessAll> records = completedList.getRecords();
+        List<String> collect = records.stream().map(ProcessAll::getProcessInstanceId).collect(Collectors.toList());
+        QueryWrapper<ProcessApprovalRecord> wrapper = new QueryWrapper<>();
+        wrapper.select("process_instance_id","group_concat(user_id) as user_id");
+        wrapper.lambda().in(ProcessApprovalRecord::getProcessInstanceId,collect)
+                .eq(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.INCOMPLETE.getValue())
+                .groupBy(ProcessApprovalRecord::getProcessInstanceId);
+        List<ProcessApprovalRecord> approvalRecordList = approvalRecordService.list(wrapper);
+        Map<String, String> userMap = CollStreamUtil.toMap(approvalRecordList, ProcessApprovalRecord::getProcessInstanceId, ProcessApprovalRecord::getUserId);
+        for (ProcessAll record : records) {
+            record.setHandleUserId(userMap.get(record.getProcessInstanceId()));
+        }
+        return completedList;
     }
 
     public IPage<ProcessAll> getSentList(Page<ProcessAll> page, QueryWrapper<ProcessAll> queryWrapper, HttpServletRequest req) {