From c44b40c70d98c4d26d55bc4015d8f2642df033b6 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Wed, 8 Nov 2023 16:17:04 +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=E5=AE=9A=E4=B9=89=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E6=89=A7=E8=A1=8C=E7=BB=93=E6=9E=9C=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E8=AF=AF=E6=8A=A5=E7=9A=84=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1032404 --user=王孝刚 【接口测试】case执行结果为误报-api的用例状态为success/失败-未保持一致
https://www.tapd.cn/55049933/s/1434424
---
 .../io/metersphere/api/dto/definition/ApiComputeResult.java | 1 +
 .../metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml  | 6 +++---
 .../service/definition/ApiDefinitionService.java            | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/api-test/backend/src/main/java/io/metersphere/api/dto/definition/ApiComputeResult.java b/api-test/backend/src/main/java/io/metersphere/api/dto/definition/ApiComputeResult.java
index 25deedccc0..442f5fb4df 100644
--- a/api-test/backend/src/main/java/io/metersphere/api/dto/definition/ApiComputeResult.java
+++ b/api-test/backend/src/main/java/io/metersphere/api/dto/definition/ApiComputeResult.java
@@ -12,4 +12,5 @@ public class ApiComputeResult {
     private String passRate;
     private int success;
     private int error;
+    private int fakeError;
 }
diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
index 1335e251e6..437ecd5356 100644
--- a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
+++ b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
@@ -119,9 +119,9 @@
 
     <select id="selectByIdsAndStatusIsNotTrash" resultType="io.metersphere.api.dto.definition.ApiComputeResult">
         SELECT t1.api_definition_id apiDefinitionId,count(t1.id) caseTotal,
-        SUM(case when t2.status ='SUCCESS' then 1 else 0 end) as SUCCESS ,SUM(case when t2.status in
-        ('ERROR','FAKE_ERROR') then 1 else 0
-        end) as ERROR,
+        SUM(case when t2.status ='SUCCESS' then 1 else 0 end) as SUCCESS ,
+        SUM( CASE WHEN t2.STATUS = 'ERROR' THEN 1 ELSE 0 END ) AS ERROR,
+        SUM( CASE WHEN t2.STATUS = 'FAKE_ERROR' THEN 1 ELSE 0 END ) AS fakeError,
         CONCAT(FORMAT(SUM(IF (t2.`status`='SUCCESS',1,0))/COUNT(t1.id)*100,2),'%') passRate
         FROM api_test_case t1
         LEFT JOIN api_definition_exec_result t2 ON t1.last_result_id=t2.id
diff --git a/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionService.java b/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionService.java
index 1934da9161..ae0d419c3b 100644
--- a/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionService.java
+++ b/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionService.java
@@ -211,10 +211,12 @@ public class ApiDefinitionService {
                     res.setCaseTotal(String.valueOf(compRes.getCaseTotal()));
                     res.setCasePassingRate(compRes.getPassRate());
                     // 状态优先级 未执行，未通过，通过
-                    if ((compRes.getError() + compRes.getSuccess()) < compRes.getCaseTotal()) {
+                    if ((compRes.getError() + compRes.getSuccess() + compRes.getFakeError()) < compRes.getCaseTotal()) {
                         res.setCaseStatus(ApiReportStatus.PENDING.name());
                     } else if (compRes.getError() > 0) {
                         res.setCaseStatus(ApiReportStatus.ERROR.name());
+                    } else if (compRes.getFakeError() > 0) {
+                        res.setCaseStatus(ApiReportStatus.FAKE_ERROR.name());
                     } else {
                         res.setCaseStatus(ApiReportStatus.SUCCESS.name());
                     }