From 74da9dfb5fb4085d8847d4c74a97048c6c677514 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 15 一月 2025 10:53:34 +0800
Subject: [PATCH] 完成任务bug(协同办理的才resolveTask)、转办前如果是指定人员删除不掉问题、提取获取运行时任务信息的方法

---
 business/src/main/java/com/ycl/service/impl/ProcessConfigInfoServiceImpl.java |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/business/src/main/java/com/ycl/service/impl/ProcessConfigInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProcessConfigInfoServiceImpl.java
index 5d39aaf..9927f1c 100644
--- a/business/src/main/java/com/ycl/service/impl/ProcessConfigInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProcessConfigInfoServiceImpl.java
@@ -91,23 +91,25 @@
     public Result list(ProcessConfigInfoQuery query) {
         List<FlowProcDefWithConfigDto> dataList = flowDeployMapper.selectDeployListWithConfig(query);
 
-        // 鏍规嵁 processDefId 鍒嗙粍锛屽苟鍙栨瘡缁勪腑 鐗堟湰鍙� 鏈�澶х殑閭d竴涓�
-        Map<String, FlowProcDefWithConfigDto> groupedByProcessDefId = dataList.stream()
-                .collect(Collectors.toMap(
-                        FlowProcDefWithConfigDto::getProcessDefId, // keyMapper: 鎻愬彇 processDefId 浣滀负閿�
-                        Function.identity(),                      // valueMapper: 鐩存帴浣跨敤瀵硅薄浣滀负鍊�
-                        BinaryOperator.maxBy(Comparator.comparingInt(FlowProcDefWithConfigDto::getProcessDefVersion)) // mergeFunction: 姣旇緝 processDefVersion锛屽彇鏈�澶х殑
-                ));
-        List<FlowProcDefWithConfigDto> resultList = new ArrayList<>(groupedByProcessDefId.values());
+//        // 鏍规嵁 processDefId 鍒嗙粍锛屽苟鍙栨瘡缁勪腑 鐗堟湰鍙� 鏈�澶х殑閭d竴涓�
+//        Map<String, FlowProcDefWithConfigDto> groupedByProcessDefId = dataList.stream()
+//                .collect(Collectors.toMap(
+//                        FlowProcDefWithConfigDto::getProcessDefId, // keyMapper: 鎻愬彇 processDefId 浣滀负閿�
+//                        Function.identity(),                      // valueMapper: 鐩存帴浣跨敤瀵硅薄浣滀负鍊�
+//                        BinaryOperator.maxBy(Comparator.comparingInt(FlowProcDefWithConfigDto::getProcessDefVersion)) // mergeFunction: 姣旇緝 processDefVersion锛屽彇鏈�澶х殑
+//                ));
+//        List<FlowProcDefWithConfigDto> resultList = new ArrayList<>(groupedByProcessDefId.values());
 
         // 鍔犺浇鎸傝〃鍗�
-        for (FlowProcDefWithConfigDto procDef : resultList) {
+        for (FlowProcDefWithConfigDto procDef : dataList) {
+            // 鎺掗櫎鏆傚仠鐨�
+
             SysForm sysForm = sysDeployFormService.selectSysDeployFormByDeployId(procDef.getDeploymentId());
             if (Objects.nonNull(sysForm)) {
                 procDef.setFormName(sysForm.getFormName());
                 procDef.setFormId(sysForm.getFormId());
             }
         }
-        return Result.ok().data(resultList);
+        return Result.ok().data(dataList);
     }
 }

--
Gitblit v1.8.0