From 5a717601e6cb165b6bd6380a6adb224ea368be81 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 15 Jul 2024 16:05:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=BB=E6=8E=92=E6=9F=A5=E4=BA=BA?=
 =?UTF-8?q?=E5=88=86=E6=89=B9=E4=B8=8B=E5=8F=91=E4=B8=8D=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...essStandardComplianceCheckServiceImpl.java | 28 +++----------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
index 1b918ff8..8cb49a91 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
@@ -54,7 +54,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static com.jero.modules.activiti.common.ActivitiCommon.DISTRIBUTE;
@@ -226,6 +225,8 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
 
 
         }
+        // 保存快照
+        processHandleService.saveToSnapshot(processInfoVO, userId);
         // 审批节点
         actFlowCommonService.completeTask(taskId, curUserId);
     }
@@ -358,29 +359,8 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
             case MAIN_CHECK_USER_DISTRIBUTE:
                 processSccVO.setStandardInfo(scc);
                 // 过滤出未分发的数据
-                detailList = detailList.stream().filter(detail -> StrUtil.isBlank(detail.getProcessInstanceId())).collect(Collectors.toList());
-                // TODO 根据条款号/条款标题/条款内容/车型去重并删除重复的数据
-                // 定义一个比较器，用于根据指定的属性判断两个对象是否相等（即认为它们是重复的）
-                Comparator<ProcessStandardComplianceCheckDetail> comparator = Comparator.comparing(ProcessStandardComplianceCheckDetail::getTermNumber)
-                        .thenComparing(ProcessStandardComplianceCheckDetail::getTermTitle)
-                        .thenComparing(ProcessStandardComplianceCheckDetail::getTermContent)
-                        .thenComparing(ProcessStandardComplianceCheckDetail::getModel);
-
-                Map<ProcessStandardComplianceCheckDetail, Long> counts = detailList.stream()
-                        .filter(Objects::nonNull) // 确保非空处理
-                        .collect(Collectors.groupingBy(Function.identity(), Collectors.counting()));
-                // 筛选出出现超过一次（即重复的）的条目
-                List<ProcessStandardComplianceCheckDetail> duplicates = counts.entrySet().stream()
-                        .filter(entry -> entry.getValue() > 1)
-                        .map(Map.Entry::getKey)
-                        .collect(Collectors.toList());
-
-                // 从重复的条目中提取ID
-                List<String> duplicateIds = duplicates.stream()
-                        .map(ProcessStandardComplianceCheckDetail::getId)
-                        .distinct()
-                        .collect(Collectors.toList());
-
+                detailList = detailList.stream().filter(detail ->
+                        StrUtil.isBlank(detail.getDesignEngineer())).collect(Collectors.toList());
                 processSccVO.setDetailInfoList(detailList);
                 break;
             case MAIN_CHECK_USER_COLLECT: