From 06933114d5e8feaa0c90fc32582fbbdc2e607778 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 20 Oct 2022 11:57:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=8A=A5=E5=91=8A=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7=E7=BB=9F=E8=AE=A1=E7=BC=BA=E5=B0=91=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1018364 --user=陈建星 【测试跟踪】测试计划-报告统计-功能用例统计分析-测试结果-统计缺陷数的饼状图没了 https://www.tapd.cn/55049933/s/1269152
---
 .../base/mapper/ext/ExtIssuesMapper.xml       |  7 +++++-
 .../io/metersphere/service/IssuesService.java | 20 ++++-------------
 .../io/metersphere/utils/DistinctKeyUtil.java | 22 +++++++++++++++++++
 3 files changed, 32 insertions(+), 17 deletions(-)
 create mode 100644 test-track/backend/src/main/java/io/metersphere/utils/DistinctKeyUtil.java

diff --git a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
index a6bf271a2b..ca8d13e58a 100644
--- a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
+++ b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
@@ -117,7 +117,12 @@
         where project_id = #{projectId} and platform = #{platform} and (platform_status != 'delete' or platform_status is null);
     </select>
     <select id="selectForPlanReport" resultType="io.metersphere.plan.dto.PlanReportIssueDTO">
-        select id,status,platform_status,platform from issues where resource_id = #{planId} and ( platform_status != 'delete' or platform_status is null);
+        select i.id, i.status, i.platform_status, i.platform
+        from issues i
+        inner join test_case_issues tci
+            on i.id = tci.issues_id and tci.ref_type = 'PLAN_FUNCTIONAL' and ( i.platform_status != 'delete' or i.platform_status is null)
+        inner join test_plan_test_case tptc
+            on tci.resource_id = tptc.id and tptc.plan_id = #{planId}
     </select>
     <select id="selectIdNotInUuIds" resultType="java.lang.String">
         select id from issues
diff --git a/test-track/backend/src/main/java/io/metersphere/service/IssuesService.java b/test-track/backend/src/main/java/io/metersphere/service/IssuesService.java
index d7e080e4e4..670e31f553 100644
--- a/test-track/backend/src/main/java/io/metersphere/service/IssuesService.java
+++ b/test-track/backend/src/main/java/io/metersphere/service/IssuesService.java
@@ -12,6 +12,7 @@ import io.metersphere.commons.constants.IssuesStatus;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.*;
 import io.metersphere.plan.service.TestPlanTestCaseService;
+import io.metersphere.utils.DistinctKeyUtil;
 import io.metersphere.xpack.track.dto.AttachmentSyncType;
 import io.metersphere.constants.AttachmentType;
 import io.metersphere.constants.SystemCustomField;
@@ -270,7 +271,7 @@ public class IssuesService {
         issueRequest.setRefType(refType);
         List<IssuesDao> issues = extIssuesMapper.getIssuesByCaseId(issueRequest);
         handleCustomFieldStatus(issues);
-        return disconnectIssue(issues);
+        return DistinctKeyUtil.distinctByKey(issues, IssuesDao::getId);
     }
 
     private void handleCustomFieldStatus(List<IssuesDao> issues) {
@@ -816,6 +817,7 @@ public class IssuesService {
 
     public void calculatePlanReport(String planId, TestPlanSimpleReportDTO report) {
         List<PlanReportIssueDTO> planReportIssueDTOS = extIssuesMapper.selectForPlanReport(planId);
+        planReportIssueDTOS = DistinctKeyUtil.distinctByKey(planReportIssueDTOS, PlanReportIssueDTO::getId);
         TestPlanFunctionResultReportDTO functionResult = report.getFunctionResult();
         List<TestCaseReportStatusResultDTO> statusResult = new ArrayList<>();
         Map<String, TestCaseReportStatusResultDTO> statusResultMap = new HashMap<>();
@@ -849,8 +851,7 @@ public class IssuesService {
         buildCustomField(planIssues);
 
         replaceStatus(planIssues, planId);
-
-        return disconnectIssue(planIssues);
+        return DistinctKeyUtil.distinctByKey(planIssues, IssuesDao::getId);
     }
 
     private void replaceStatus(List<IssuesDao> planIssues, String planId) {
@@ -882,19 +883,6 @@ public class IssuesService {
         });
     }
 
-    public List<IssuesDao> disconnectIssue(List<IssuesDao> issues) {
-        Set<String> ids = new HashSet<>(issues.size());
-        Iterator<IssuesDao> iterator = issues.iterator();
-        while (iterator.hasNext()) {
-            IssuesDao next = iterator.next();
-            if (ids.contains(next.getId())) {
-                iterator.remove();
-            }
-            ids.add(next.getId());
-        }
-        return issues;
-    }
-
     public void changeStatus(IssuesRequest request) {
         String issuesId = request.getId();
         String status = request.getStatus();
diff --git a/test-track/backend/src/main/java/io/metersphere/utils/DistinctKeyUtil.java b/test-track/backend/src/main/java/io/metersphere/utils/DistinctKeyUtil.java
new file mode 100644
index 0000000000..76546795ae
--- /dev/null
+++ b/test-track/backend/src/main/java/io/metersphere/utils/DistinctKeyUtil.java
@@ -0,0 +1,22 @@
+package io.metersphere.utils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+public class DistinctKeyUtil {
+
+    /**
+     * 按照某个字段去重
+     * @param keyExtractor
+     * @param <T>
+     * @return
+     */
+    public static <T> List<T> distinctByKey(List<T> list, Function<? super T, ?> keyExtractor) {
+        Map<Object, Boolean> map = new HashMap<>();
+        return list.stream().filter(t -> map.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null)
+                .collect(Collectors.toList());
+    }
+}