From 6cb5dcdc5d9a77baca78d673362a695804ed734b Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 26 Nov 2021 15:11:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=81=97=E7=95=99=E7=BC=BA=E9=99=B7=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=95=B0=E9=87=8F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1006831 --user=lyh 【测试跟踪】首页遗留缺陷统计数量错误
https://www.tapd.cn/55049933/s/1075503
---
 .../io/metersphere/base/mapper/ext/ExtProjectMapper.java   | 2 ++
 .../io/metersphere/base/mapper/ext/ExtProjectMapper.xml    | 7 +++++++
 .../io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml   | 2 +-
 .../main/java/io/metersphere/service/ProjectService.java   | 4 ++++
 .../java/io/metersphere/track/service/TrackService.java    | 7 ++++---
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.java
index 06273e0600..dedcb072c9 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.java
@@ -35,4 +35,6 @@ public interface ExtProjectMapper {
     long getProjectMemberSize(@Param("projectId") String projectId);
 
     List<Project>getProjectByUserId(@Param("userId")String userId);
+
+    int getProjectPlanBugSize(@Param("projectId") String projectId);
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml
index f9b5e6f44a..5ea046fa25 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml
@@ -244,4 +244,11 @@
     <select id="getProjectByUserId" resultType="io.metersphere.base.domain.Project">
         SELECT * from project where project.id in (SELECT user_group.source_id from user_group where user_group.user_id = #{userId})
     </select>
+    <select id="getProjectPlanBugSize" resultType="java.lang.Integer">
+        select count(distinct(tci.issues_id)) from test_plan_test_case tptc
+            join test_case_issues tci on tptc.case_id = tci.test_case_id
+            join issues on tci.issues_id  = issues.id
+            join test_plan on tptc.plan_id = test_plan.id
+        where test_plan.project_id = #{projectId} and (issues.status != 'closed' or issues.status is null);
+    </select>
 </mapper>
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index ae56e0cd9b..70d6bbee88 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -441,7 +441,7 @@
     </select>
     <select id="getTestPlanBug" resultType="int">
         select count(tci.issues_id) from test_plan_test_case tptc join test_case_issues tci on tptc.case_id = tci.test_case_id join issues on tci.issues_id  = issues.id
-        where tptc.plan_id = #{planId} and issues.status != 'closed';
+        where tptc.plan_id = #{planId} and (issues.status != 'closed' or issues.status is null);
     </select>
     <select id="getTestPlanCase" resultType="int">
         select count(s)
diff --git a/backend/src/main/java/io/metersphere/service/ProjectService.java b/backend/src/main/java/io/metersphere/service/ProjectService.java
index 76a03c6e48..e34e96f8b9 100644
--- a/backend/src/main/java/io/metersphere/service/ProjectService.java
+++ b/backend/src/main/java/io/metersphere/service/ProjectService.java
@@ -745,4 +745,8 @@ public class ProjectService {
     public long getProjectMemberSize(String id) {
         return extProjectMapper.getProjectMemberSize(id);
     }
+
+    public int getProjectBugSize(String projectId) {
+        return extProjectMapper.getProjectPlanBugSize(projectId);
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/track/service/TrackService.java b/backend/src/main/java/io/metersphere/track/service/TrackService.java
index f9df6fdcc5..cbb3dc06c6 100644
--- a/backend/src/main/java/io/metersphere/track/service/TrackService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TrackService.java
@@ -9,6 +9,7 @@ import io.metersphere.commons.constants.TestPlanTestCaseStatus;
 import io.metersphere.commons.utils.DateUtils;
 import io.metersphere.commons.utils.MathUtils;
 import io.metersphere.performance.base.ChartsData;
+import io.metersphere.service.ProjectService;
 import io.metersphere.track.dto.TestPlanDTOWithMetric;
 import io.metersphere.track.response.BugStatustics;
 import io.metersphere.track.response.TestPlanBugCount;
@@ -40,6 +41,8 @@ public class TrackService {
     private TestPlanScenarioCaseService testPlanScenarioCaseService;
     @Resource
     private TestPlanLoadCaseService testPlanLoadCaseService;
+    @Resource
+    private ProjectService projectService;
 
     public List<TrackCountResult> countPriority(String projectId) {
         return extTestCaseMapper.countPriority(projectId);
@@ -115,7 +118,6 @@ public class TrackService {
         List<TestPlanBugCount> list = new ArrayList<>();
         BugStatustics bugStatustics = new BugStatustics();
         int index = 1;
-        int totalBugSize = 0;
         int totalCaseSize = 0;
         for (TestPlan plan : plans) {
             int planBugSize = getPlanBugSize(plan.getId());
@@ -137,12 +139,11 @@ public class TrackService {
             double planPassRage = getPlanPassRage(plan.getId());
             testPlanBug.setPassRage(planPassRage + "%");
             list.add(testPlanBug);
-
-            totalBugSize += planBugSize;
             totalCaseSize += planCaseSize;
 
         }
 
+        int totalBugSize = projectService.getProjectBugSize(projectId);
         bugStatustics.setList(list);
         float rage =totalCaseSize == 0 ? 0 : (float) totalBugSize * 100 / totalCaseSize;
         DecimalFormat df = new DecimalFormat("0.0");