From a4a0c0a3d0902bdccd9350a304c63e8b2948e9c2 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Wed, 26 Jan 2022 11:37:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E4=B8=AD=E5=A4=B1=E8=B4=A5=E7=8A=B6=E6=80=81=E7=9A=84?=
 =?UTF-8?q?=E6=80=A7=E8=83=BD=E7=94=A8=E4=BE=8B=E6=95=B0=E6=8D=AE=E5=86=8D?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=94=A8=E4=BE=8B=E9=A1=B5=E7=AD=BE=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1010003 --user=宋天阳 【测试跟踪】测试计划报告里，性能测试，失败的用例不显示
https://www.tapd.cn/55049933/s/1098689
---
 .../track/service/TestPlanService.java        |  2 +-
 .../report/detail/TestPlanLoadReport.vue      |  6 +++---
 .../report/detail/component/LoadAllResult.vue | 21 ++++++++++++-------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index f5963001c7..115ede53b2 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -1625,7 +1625,7 @@ public class TestPlanService {
                 if (!CollectionUtils.isEmpty(allCases)) {
                     failureCases = allCases.stream()
                             .filter(i -> StringUtils.isNotBlank(i.getStatus())
-                                    && i.getStatus().equals("error"))
+                                    && StringUtils.equalsAnyIgnoreCase(i.getStatus(), "error"))
                             .collect(Collectors.toList());
                 }
                 report.setLoadFailureCases(failureCases);
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanLoadReport.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanLoadReport.vue
index ff73f42633..78b2438c0f 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanLoadReport.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanLoadReport.vue
@@ -8,14 +8,14 @@
         <template v-slot:label>
           <tab-pane-count :title="$t('test_track.report.fail_case')" :count="failureSize"/>
         </template>
-        <load-failure-result class="container" :share-id="shareId" :is-share="isShare" :is-template="isTemplate"
-                             :report="report" :plan-id="planId" @setSize="setFailureSize"/>
+        <load-all-result :is-db="isDb" :share-id="shareId" :is-share="isShare" :is-template="isTemplate" :is-all="false"
+                         :report="report" :plan-id="planId" @setSize="setFailureSize"/>
       </el-tab-pane>
       <el-tab-pane name="third" v-if="allEnable" style="min-height: 550px">
         <template v-slot:label>
           <tab-pane-count :title="$t('test_track.report.all_case')" :count="allSize"/>
         </template>
-        <load-all-result :is-db="isDb" :share-id="shareId" :is-share="isShare" :is-template="isTemplate"
+        <load-all-result :is-db="isDb" :share-id="shareId" :is-share="isShare" :is-template="isTemplate" :is-all="true"
                          :report="report" :plan-id="planId" @setSize="setAllSize"/>
       </el-tab-pane>
     </el-tabs>
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/component/LoadAllResult.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/component/LoadAllResult.vue
index e0983bc189..d0f10a7ae4 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/component/LoadAllResult.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/component/LoadAllResult.vue
@@ -1,12 +1,13 @@
 <template>
   <el-container>
     <ms-aside-container width="500px" :default-hidden-bottom-top="200" :enable-auto-height="true">
-      <load-failure-result :class="{'init-height': !showResponse}" :is-db="isDb" @rowClick="getReport" :is-all="true" :share-id="shareId" :is-share="isShare" :is-template="isTemplate"
-                         :report="report" :plan-id="planId" @setSize="setAllSize"/>
+      <load-failure-result :class="{'init-height': !showResponse}" :is-db="isDb" @rowClick="getReport" :is-all="isAll"
+                           :share-id="shareId" :is-share="isShare" :is-template="isTemplate"
+                           :report="report" :plan-id="planId" @setSize="setAllSize"/>
     </ms-aside-container>
     <ms-main-container>
-        <load-case-report-view :is-plan-report="true" :share-id="shareId" :is-share="isShare" v-show="showResponse"
-                               :plan-report-template="response" :report-id="reportId" ref="loadCaseReportView"/>
+      <load-case-report-view :is-plan-report="true" :share-id="shareId" :is-share="isShare" v-show="showResponse"
+                             :plan-report-template="response" :report-id="reportId" ref="loadCaseReportView"/>
       <div class="empty" v-show="!showResponse">{{ $t('test_track.plan.load_case.content_empty') }}</div>
     </ms-main-container>
   </el-container>
@@ -23,23 +24,29 @@ import LoadCaseReport from "@/business/components/track/plan/view/comonents/load
 import LoadCaseReportView from "@/business/components/track/plan/view/comonents/load/LoadCaseReportView";
 import MsAsideContainer from "@/business/components/common/components/MsAsideContainer";
 import MsMainContainer from "@/business/components/common/components/MsMainContainer";
+
 export default {
   name: "LoadAllResult",
   components: {
     MsMainContainer,
     MsAsideContainer,
-    LoadCaseReportView, LoadCaseReport, LoadFailureResult, StatusTableItem, MethodTableItem, TypeTableItem},
+    LoadCaseReportView, LoadCaseReport, LoadFailureResult, StatusTableItem, MethodTableItem, TypeTableItem
+  },
   props: {
     planId: String,
     report: Object,
     isTemplate: Boolean,
     isShare: Boolean,
     shareId: String,
-    isDb: Boolean
+    isDb: Boolean,
+    isAll: {
+      type: Boolean,
+      default: false
+    }
   },
   data() {
     return {
-      failureTestCases:  [],
+      failureTestCases: [],
       showResponse: false,
       reportId: "",
       response: null