From 2e404294dddb6c87ce368898e0b9867b352bebe5 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Mon, 25 Jul 2022 23:06:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=9A=E8=BF=87=E7=94=A8=E4=BE=8B=E8=A6=86?=
 =?UTF-8?q?=E7=9B=96=E8=B7=B3=E8=BD=AC=E6=97=B6=E6=8E=A5=E5=8F=A3=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=B8=AD=E6=B2=A1=E6=9C=89=E8=BF=87=E6=BB=A4=E6=8E=89?=
 =?UTF-8?q?=E5=9B=9E=E6=94=B6=E7=AB=99=E4=B8=AD=E7=94=A8=E4=BE=8B=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1015150 --user=宋天阳
【接口测试】首页-接口、场景用例数量统计，已覆盖/未覆盖数量跳转后没有显示对应的接口
https://www.tapd.cn/55049933/s/1211159
---
 .../mapper/ext/ExtApiDefinitionMapper.xml     | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
index 23e2570a06..0abf25a781 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
@@ -802,7 +802,8 @@
 
             <if test="request.apiCoverage == 'uncoverage'">
                 and
-                api_definition.id not in (SELECT api_definition_id FROM api_test_case)
+                api_definition.id not in (SELECT api_definition_id FROM api_test_case WHERE `status` is null or `status`
+                != 'Trash')
                 <if test=" request.coverageIds != null and request.coverageIds.size() > 0">
                     and
                     api_definition.id not in
@@ -815,7 +816,8 @@
             <if test="request.apiCoverage == 'coverage' ">
                 and
                 (
-                api_definition.id in (SELECT api_definition_id FROM api_test_case)
+                api_definition.id in (SELECT api_definition_id FROM api_test_case WHERE `status` is null or `status` !=
+                'Trash')
                 <if test=" request.coverageIds != null and request.coverageIds.size() > 0">
                     or
                     api_definition.id in
@@ -828,11 +830,11 @@
             </if>
             <if test="request.apiCaseCoverage == 'uncoverage' ">
                 and api_definition.id not in
-                (SELECT api_definition_id FROM api_test_case)
+                (SELECT api_definition_id FROM api_test_case WHERE `status` is null or `status` != 'Trash')
             </if>
             <if test="request.apiCaseCoverage == 'coverage' ">
                 and api_definition.id in
-                (SELECT api_definition_id FROM api_test_case)
+                (SELECT api_definition_id FROM api_test_case WHERE `status` is null or `status` != 'Trash')
             </if>
             <if test="request.scenarioCoverage == 'uncoverage' ">
                 <if test=" request.coverageIds != null and request.coverageIds.size() > 0">
@@ -916,7 +918,8 @@
             <include refid="filter"/>
             <if test="request.apiCoverage == 'uncoverage' ">
                 and
-                api_definition.id not in (SELECT api_definition_id FROM api_test_case)
+                api_definition.id not in (SELECT api_definition_id FROM api_test_case WHERE `status` is null or `status`
+                != 'Trash')
                 <if test=" request.coverageIds != null and request.coverageIds.size() > 0">
                     and
                     api_definition.id not in
@@ -929,7 +932,8 @@
             <if test="request.apiCoverage == 'coverage' ">
                 and
                 (
-                api_definition.id in (SELECT api_definition_id FROM api_test_case)
+                api_definition.id in (SELECT api_definition_id FROM api_test_case WHERE `status` is null or `status` !=
+                'Trash')
                 <if test=" request.coverageIds != null and request.coverageIds.size() > 0">
                     or
                     api_definition.id in
@@ -942,11 +946,11 @@
             </if>
             <if test="request.apiCaseCoverage == 'uncoverage' ">
                 and api_definition.id not in
-                (SELECT api_definition_id FROM api_test_case)
+                (SELECT api_definition_id FROM api_test_case WHERE `status` is null or `status` != 'Trash')
             </if>
             <if test="request.apiCaseCoverage == 'coverage' ">
                 and api_definition.id in
-                (SELECT api_definition_id FROM api_test_case)
+                (SELECT api_definition_id FROM api_test_case WHERE `status` is null or `status` != 'Trash')
             </if>
             <if test="request.scenarioCoverage == 'uncoverage' ">
                 <if test=" request.coverageIds != null and request.coverageIds.size() > 0">