From 9a6cc74dd6c75760510d9c18fc3430b9b54293d6 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Tue, 21 Mar 2023 18:05:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0=E7=BC=BA=E9=99=B7?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E7=BC=BA=E9=99=B7=E7=BB=9F=E8=AE=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1024680 --user=宋昌昌 【测试跟踪】缺陷管理-创建缺陷A-测试计划中关联该缺陷A，在缺陷管理中编辑缺陷状态为“删除”，首页仍统计该缺陷 https://www.tapd.cn/55049933/s/1353854
--bug=1024686 --user=宋昌昌 【测试跟踪】项目集成tapd缺陷平台，测试计划关联了缺陷状态是“已验证”的，首页未统计 https://www.tapd.cn/55049933/s/1353921
---
 .../java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml   | 4 ++--
 .../src/main/java/io/metersphere/constants/IssueStatus.java   | 4 +++-
 .../backend/src/main/resources/i18n/messages_en_US.properties | 2 ++
 .../backend/src/main/resources/i18n/messages_zh_CN.properties | 2 ++
 .../backend/src/main/resources/i18n/messages_zh_TW.properties | 2 ++
 5 files changed, 11 insertions(+), 3 deletions(-)

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 412cf0c2a3..2c97c37874 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
@@ -181,8 +181,8 @@
         from test_plan_test_case tptc
                  join test_plan tp on tp.id = tptc.plan_id
                  join test_case_issues tci on tptc.id = tci.resource_id
-                 join issues on tci.issues_id = issues.id
-        where tptc.is_del != 1 and tp.project_id = #{projectId}
+                 join issues i on tci.issues_id = i.id
+        where tptc.is_del != 1 and i.platform_status != 'delete' and tp.project_id = #{projectId}
     </select>
 
     <select id="getIssueCustomFields" resultType="io.metersphere.xpack.track.dto.IssuesDao">
diff --git a/test-track/backend/src/main/java/io/metersphere/constants/IssueStatus.java b/test-track/backend/src/main/java/io/metersphere/constants/IssueStatus.java
index cee2045c8f..5da719d59a 100644
--- a/test-track/backend/src/main/java/io/metersphere/constants/IssueStatus.java
+++ b/test-track/backend/src/main/java/io/metersphere/constants/IssueStatus.java
@@ -12,7 +12,9 @@ public enum IssueStatus {
     status_in_progress("in_progress", "in_progress"),
     status_rejected("rejected", "rejected"),
     status_upcoming("upcoming", "upcoming"),
-    status_reopened("reopened", "reopened");
+    status_reopened("reopened", "reopened"),
+    status_verified("verified", "verified"),
+    status_suspended("suspended", "suspended");
 
     private String name;
     private String i18nKey;
diff --git a/test-track/backend/src/main/resources/i18n/messages_en_US.properties b/test-track/backend/src/main/resources/i18n/messages_en_US.properties
index 5de4f242e1..810daf28a7 100644
--- a/test-track/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/test-track/backend/src/main/resources/i18n/messages_en_US.properties
@@ -74,6 +74,8 @@ in_progress=in_progress
 rejected=rejected
 upcoming=upcoming
 reopened=reopened
+verified=verified
+suspended=suspended
 #project
 project_name_is_null=Project name cannot be null
 project_name_already_exists=The project name already exists
diff --git a/test-track/backend/src/main/resources/i18n/messages_zh_CN.properties b/test-track/backend/src/main/resources/i18n/messages_zh_CN.properties
index f6d662c6e2..3a0c1e09b0 100644
--- a/test-track/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/test-track/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -51,6 +51,8 @@ in_progress=接受/处理
 rejected=已拒绝
 upcoming=待办
 reopened=重新打开
+verified=已验证
+suspended=挂起
 #project
 project_name_is_null=项目名称不能为空
 project_name_already_exists=项目名称已存在
diff --git a/test-track/backend/src/main/resources/i18n/messages_zh_TW.properties b/test-track/backend/src/main/resources/i18n/messages_zh_TW.properties
index b0de3b60a0..c4197559ba 100644
--- a/test-track/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/test-track/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -51,6 +51,8 @@ in_progress=接受/處理
 rejected=已拒絕
 upcoming=待辦
 reopened=重新打開
+verified=已驗證
+suspended=掛起
 #project
 project_name_is_null=項目名稱不能為空
 project_name_already_exists=項目名稱已存在