From 3a29a3c71c203e822b66be3e47bb48c8c3321ff2 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Thu, 22 Sep 2022 15:15:45 +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=E6=8E=A5=E5=8F=A3=E7=94=A8=E4=BE=8B=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7=E6=89=A7=E8=A1=8C=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=97=B6=E5=AF=B9=E5=81=9C=E6=AD=A2=E7=8A=B6=E6=80=81=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BD=92=E7=B1=BB=E9=94=99=E8=AF=AF=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

修复接口用例按照执行状态查询时对停止状态的数据归类错误的问题
---
 .../api/controller/APITestController.java     |  2 +-
 .../base/mapper/ext/ExtApiTestCaseMapper.xml  | 23 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/controller/APITestController.java b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
index a12460dc16..da01d073b2 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
@@ -234,7 +234,7 @@ public class APITestController {
         for (ExecuteResultCountDTO execResult : apiCaseExecResultList) {
             if (StringUtils.isEmpty(execResult.getExecResult())) {
                 unexecuteCount += execResult.getCount();
-            } else if (StringUtils.equalsAnyIgnoreCase(execResult.getExecResult(), "Underway", ExecuteResult.TEST_PLAN_PREPARE.toString())) {
+            } else if (StringUtils.equalsAnyIgnoreCase(execResult.getExecResult(), "Underway", ExecuteResult.STOP.toString(), ExecuteResult.TEST_PLAN_PREPARE.toString())) {
                 unexecuteCount += execResult.getCount();
             } else if (StringUtils.equalsIgnoreCase(execResult.getExecResult(), ExecuteResult.API_SUCCESS.toString())) {
                 executionPassCount += execResult.getCount();
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
index a82761e88a..44fd36bb0a 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@@ -446,19 +446,19 @@
             </foreach>
         </if>
         <if test="request.redirectFilter == 'unexecuteCount' ">
-            and (t1.status IS NULL or t1.status = '' or t1.status = 'Prepare' or t1.status = 'Underway')
+            and (t3.status IS NULL or t3.status = '' or t3.status = 'Prepare' or t3.status = 'Underway' or t3.status = 'stop')
         </if>
         <if test="request.redirectFilter == 'executionPassCount' ">
-            and t1.status = 'success'
+            and t3.status = 'success'
         </if>
         <if test="request.redirectFilter == 'executionFailedCount' ">
-            and t1.status = 'error'
+            and t3.status = 'error'
         </if>
         <if test="request.redirectFilter == 'fakeErrorCount' ">
-            and t1.status = 'errorReportResult'
+            and t3.status = 'errorReportResult'
         </if>
         <if test="request.redirectFilter == 'notSuccessCount' ">
-            and t1.status IN ('error','errorReportResult')
+            and t3.status IN ('error','errorReportResult')
         </if>
         <if test="request.filters != null and request.filters.size() > 0">
             <foreach collection="request.filters.entrySet()" index="key" item="values">
@@ -982,15 +982,16 @@
 
     <select id="selectExecuteResultByProjectId"
             resultType="io.metersphere.api.dto.datacount.response.ExecuteResultCountDTO">
-        SELECT status AS execResult, count(id) AS `count`
-        FROM api_test_case
-        WHERE project_id = #{0}
-          AND (`status` IS NULL OR `status` != 'Trash')
-          AND api_definition_id IN (SELECT id
+        SELECT t3.status AS execResult, count(t1.id) AS `count`
+        FROM api_test_case t1
+        LEFT JOIN api_definition_exec_result t3 ON t1.last_result_id = t3.id
+        WHERE t1.project_id = #{0}
+          AND (t1.`status` IS NULL OR t1.`status` != 'Trash')
+          AND t1.api_definition_id IN (SELECT id
                                     FROM api_definition
                                     WHERE project_id = #{0}
                                       AND latest = 1)
-        GROUP BY `status`
+        GROUP BY t3.`status`
     </select>
     <select id="caseList" resultType="io.metersphere.base.domain.ApiTestCaseWithBLOBs">
         SELECT