From d03a2b058a4347f08be62c1af6108784a83cb54d Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Mon, 21 Mar 2022 19:33:07 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=89=A7=E8=A1=8C=E5=85=B6=E4=BD=99=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=9A=84=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E7=9A=84?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1011498 --user=宋天阳 【测试跟踪】-测试计划 点击执行时 ，性能测试没有执行
https://www.tapd.cn/55049933/s/1122643
---
 .../metersphere/base/mapper/ext/ExtTestPlanApiCaseMapper.xml   | 2 +-
 .../metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.xml  | 2 +-
 .../base/mapper/ext/ExtTestPlanScenarioCaseMapper.xml          | 1 +
 .../io/metersphere/track/service/TestPlanReportService.java    | 1 -
 .../comonents/report/detail/component/LoadFailureResult.vue    | 3 +++
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanApiCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanApiCaseMapper.xml
index e6898aee4e..8c3c109957 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanApiCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanApiCaseMapper.xml
@@ -306,7 +306,7 @@
          and t.status = #{status}
        </if>
       and (c.status != 'Trash' or c.status is null)
-      where t.test_plan_id = #{planId};
+      where t.test_plan_id = #{planId} ORDER BY t.order DESC
     </select>
 
   <select id="getFailureListByIds" resultType="io.metersphere.api.dto.automation.TestPlanFailureApiDTO">
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.xml
index 301f1ad0c7..b491e17d7c 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.xml
@@ -297,7 +297,7 @@
            <if test="status != null">
                and tplc.status = 'error'
            </if>
-        where tplc.test_plan_id = #{planId}
+        where tplc.test_plan_id = #{planId} ORDER BY tplc.order DESC
     </select>
 
     <select id="getCasesByIds" resultType="io.metersphere.track.dto.TestPlanLoadCaseDTO">
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanScenarioCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanScenarioCaseMapper.xml
index bde64902a9..71acbf9a9b 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanScenarioCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanScenarioCaseMapper.xml
@@ -255,6 +255,7 @@
         and t.last_result in ('Fail','Error')
     </if>
       where t.test_plan_id = #{planId}
+        ORDER BY t.order DESC
     </select>
 
     <select id="getFailureListByIds" resultType="io.metersphere.api.dto.automation.TestPlanFailureScenarioDTO">
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
index 50da12c6e2..e348dfd143 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
@@ -225,7 +225,6 @@ public class TestPlanReportService {
         }
         LoadCaseRequest loadCaseRequest = new LoadCaseRequest();
         loadCaseRequest.setTestPlanId(planId);
-        loadCaseRequest.setProjectId(projectID);
         List<TestPlanLoadCaseDTO> testPlanLoadCaseDTOList = extTestPlanLoadCaseMapper.selectTestPlanLoadCaseList(loadCaseRequest);
         for (TestPlanLoadCaseDTO dto : testPlanLoadCaseDTOList) {
             performanceIdMap.put(dto.getId(), dto.getLoadCaseId());
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/component/LoadFailureResult.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/component/LoadFailureResult.vue
index 439eed365c..c189f9d6b9 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/component/LoadFailureResult.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/component/LoadFailureResult.vue
@@ -42,6 +42,9 @@
             <el-tag size="mini" v-else-if="row.status === 'Completed'">
               {{ row.status }}
             </el-tag>
+            <el-tag size="mini"  v-else-if="!row.status || row.status === '' ">
+              Prepare
+            </el-tag>
             <el-tag size="mini" v-else>
               {{ row.status }}
             </el-tag>