From 5f60e3116bc4998e9c9a1b858fe9b414b75c7a7b Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Wed, 12 Jan 2022 15:36:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E6=8A=A5=E5=91=8A=E7=9C=8B=E4=B8=8D=E5=88=B0=E6=80=A7?=
 =?UTF-8?q?=E8=83=BD=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复测试计划执行报告看不到性能测试用例的问题
---
 .../mapper/ext/ExtTestPlanLoadCaseMapper.java |  8 ++--
 .../mapper/ext/ExtTestPlanLoadCaseMapper.xml  | 13 +++---
 .../service/TestPlanLoadCaseService.java      |  4 +-
 .../track/service/TestPlanService.java        | 36 +++++++--------
 .../detail/component/LoadFailureResult.vue    | 44 +++++++++++--------
 5 files changed, 55 insertions(+), 50 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.java
index 6e54df5e65..086e59a6b2 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.java
@@ -11,6 +11,7 @@ import java.util.List;
 public interface ExtTestPlanLoadCaseMapper {
 
     List<String> selectIdsNotInPlan(@Param("request") LoadCaseRequest request);
+
     List<TestPlanLoadCaseDTO> selectTestPlanLoadCaseList(@Param("request") LoadCaseRequest request);
 
     List<TestPlanLoadCaseDTO> selectByIdIn(@Param("request") LoadCaseRequest request);
@@ -26,15 +27,16 @@ public interface ExtTestPlanLoadCaseMapper {
     List<PlanReportCaseDTO> selectForPlanReport(String planId);
 
     List<TestPlanLoadCaseDTO> getCases(@Param("planId") String planId, @Param("status") String status);
-    List<TestPlanLoadCaseDTO> getCasesByIds(@Param("ids") Collection<String> ids, @Param("planId") String planId, @Param("status") String status);
+
+    List<TestPlanLoadCaseDTO> getCasesByIds(@Param("ids") Collection<String> ids, @Param("reportIds") Collection<String> reportIds);
 
     List<String> selectPlanIds();
 
     List<String> getIdsOrderByUpdateTime(@Param("planId") String planId);
 
-    Long getPreOrder(@Param("planId")String planId, @Param("baseOrder") Long baseOrder);
+    Long getPreOrder(@Param("planId") String planId, @Param("baseOrder") Long baseOrder);
 
-    Long getLastOrder(@Param("planId")String planId, @Param("baseOrder") Long baseOrder);
+    Long getLastOrder(@Param("planId") String planId, @Param("baseOrder") Long baseOrder);
 
     List<String> selectIdByLoadCaseReportIdAndStatusIsRun(String reportId);
 
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 d4de7883d7..4e21eff534 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
@@ -278,17 +278,18 @@
 
     <select id="getCasesByIds" resultType="io.metersphere.track.dto.TestPlanLoadCaseDTO">
         select tplc.id, lt.id as caseId, lt.name, lt.num, lt.project_id,
-        tplc.status ,tplc.create_user, tplc.load_report_id
+        ltr.status ,tplc.create_user, tplc.load_report_id,ltr.id AS reportId
         from test_plan_load_case tplc
         inner join load_test lt on tplc.load_case_id = lt.id
-        <if test="status != null">
-            and tplc.status = 'error'
-        </if>
-        where tplc.test_plan_id = #{planId}
-        and lt.id IN
+        inner join load_test_report ltr ON ltr.test_id = lt.id
+        where tplc.id IN
         <foreach collection="ids" item="id" separator="," open="(" close=")">
             #{id}
         </foreach>
+        and ltr.id IN
+        <foreach collection="reportIds" item="id" separator="," open="(" close=")">
+            #{id}
+        </foreach>
     </select>
 
     <select id="selectPlanIds" resultType="java.lang.String">
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java
index ddce937440..2879d6a4e0 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java
@@ -407,8 +407,8 @@ public class TestPlanLoadCaseService {
         return buildCases(cases);
     }
 
-    public List<TestPlanLoadCaseDTO> getAllCases(Collection<String> ids, String planId, String status) {
-        List<TestPlanLoadCaseDTO> cases = extTestPlanLoadCaseMapper.getCasesByIds(ids, planId, status);
+    public List<TestPlanLoadCaseDTO> getAllCases(Collection<String> ids, Collection<String> reportIds) {
+        List<TestPlanLoadCaseDTO> cases = extTestPlanLoadCaseMapper.getCasesByIds(ids, reportIds);
         return buildCases(cases);
     }
 
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 916c41d6a0..abc8dca0d7 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -1071,16 +1071,16 @@ public class TestPlanService {
 
 
         //执行接口案例任务
-        Map<String,String> apiCaseReportMap = this.executeApiTestCase(triggerMode, planReportId,userId, new ArrayList<>(reportInfoDTO.getApiTestCaseDataMap().keySet()), runModeConfig);
+        Map<String, String> apiCaseReportMap = this.executeApiTestCase(triggerMode, planReportId, userId, new ArrayList<>(reportInfoDTO.getApiTestCaseDataMap().keySet()), runModeConfig);
         //执行场景执行任务
-        Map<String,String> scenarioReportMap = this.executeScenarioCase(planReportId, testPlanID, projectID, runModeConfig, triggerMode, userId, reportInfoDTO.getPlanScenarioIdMap());
+        Map<String, String> scenarioReportMap = this.executeScenarioCase(planReportId, testPlanID, projectID, runModeConfig, triggerMode, userId, reportInfoDTO.getPlanScenarioIdMap());
         //执行性能测试任务
-        Map<String,String> loadCaseReportMap = this.executeLoadCaseTask(runModeConfig, triggerMode, reportInfoDTO.getPerformanceIdMap());
-        testPlanReportService.createTestPlanReportContentReportIds(planReportId, apiCaseReportMap,scenarioReportMap,loadCaseReportMap);
+        Map<String, String> loadCaseReportMap = this.executeLoadCaseTask(runModeConfig, triggerMode, reportInfoDTO.getPerformanceIdMap());
+        testPlanReportService.createTestPlanReportContentReportIds(planReportId, apiCaseReportMap, scenarioReportMap, loadCaseReportMap);
         return planReportId;
     }
 
-    private Map<String,String> executeApiTestCase(String triggerMode, String planReportId, String userId, List<String> planCaseIds, RunModeConfigDTO runModeConfig) {
+    private Map<String, String> executeApiTestCase(String triggerMode, String planReportId, String userId, List<String> planCaseIds, RunModeConfigDTO runModeConfig) {
         BatchRunDefinitionRequest request = new BatchRunDefinitionRequest();
         request.setTriggerMode(triggerMode);
         request.setPlanIds(planCaseIds);
@@ -1091,7 +1091,7 @@ public class TestPlanService {
         return this.parseMsExecREsponseDTOToTestIdReportMap(dtoList);
     }
 
-    private Map<String,String>  executeScenarioCase(String planReportId, String testPlanID, String projectID, RunModeConfigDTO runModeConfig, String triggerMode, String userId, Map<String, String> planScenarioIdMap) {
+    private Map<String, String> executeScenarioCase(String planReportId, String testPlanID, String projectID, RunModeConfigDTO runModeConfig, String triggerMode, String userId, Map<String, String> planScenarioIdMap) {
         if (!planScenarioIdMap.isEmpty()) {
             SchedulePlanScenarioExecuteRequest scenarioRequest = new SchedulePlanScenarioExecuteRequest();
             String senarionReportID = UUID.randomUUID().toString();
@@ -1116,19 +1116,19 @@ public class TestPlanService {
             scenarioRequest.setTestPlanID(testPlanID);
             scenarioRequest.setTestPlanReportId(planReportId);
             scenarioRequest.setConfig(runModeConfig);
-            List<MsExecResponseDTO> dtoList =  this.scenarioRunModeConfig(scenarioRequest);
+            List<MsExecResponseDTO> dtoList = this.scenarioRunModeConfig(scenarioRequest);
             return this.parseMsExecREsponseDTOToTestIdReportMap(dtoList);
-        }else {
+        } else {
             return new HashMap<>();
         }
     }
 
     private Map<String, String> parseMsExecREsponseDTOToTestIdReportMap(List<MsExecResponseDTO> dtoList) {
-        Map<String,String> returnMap = new HashMap<>();
-        if(CollectionUtils.isNotEmpty(dtoList)){
-            dtoList.forEach( item -> {
-                if(StringUtils.isNotEmpty(item.getTestId()) && StringUtils.isNotEmpty(item.getReportId())){
-                    returnMap.put(item.getTestId(),item.getReportId());
+        Map<String, String> returnMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(dtoList)) {
+            dtoList.forEach(item -> {
+                if (StringUtils.isNotEmpty(item.getTestId()) && StringUtils.isNotEmpty(item.getReportId())) {
+                    returnMap.put(item.getTestId(), item.getReportId());
                 }
             });
         }
@@ -1676,18 +1676,14 @@ public class TestPlanService {
         }
     }
 
-    public void buildLoadReport(TestPlanSimpleReportDTO report, JSONObject config, Map<String, String> loadCaseReportMap, String planId, boolean saveResponse) {
+    public void buildLoadReport(TestPlanSimpleReportDTO report, JSONObject config, Map<String, String> loadCaseReportMap, boolean saveResponse) {
         if (MapUtils.isEmpty(loadCaseReportMap)) {
             return;
         }
         if (checkReportConfig(config, "load")) {
             List<TestPlanLoadCaseDTO> allCases = null;
             if (checkReportConfig(config, "load", "all")) {
-                allCases = testPlanLoadCaseService.getAllCases(loadCaseReportMap.keySet(), planId, null);
-                for (TestPlanLoadCaseDTO dto : allCases) {
-                    String reportId = loadCaseReportMap.get(dto.getId());
-                    dto.setReportId(reportId);
-                }
+                allCases = testPlanLoadCaseService.getAllCases(loadCaseReportMap.keySet(), loadCaseReportMap.values());
                 if (saveResponse) {
                     buildLoadResponse(allCases);
                 }
@@ -1718,7 +1714,7 @@ public class TestPlanService {
             TestPlanSimpleReportDTO report = getReport(testPlanReport.getTestPlanId(), testPlanExecuteReportDTO);
             buildFunctionalReport(report, config, testPlanReport.getTestPlanId());
             buildApiReport(report, config, testPlanExecuteReportDTO);
-            buildLoadReport(report, config, testPlanExecuteReportDTO.getTestPlanLoadCaseIdAndReportIdMap(), testPlanReport.getTestPlanId(), false);
+            buildLoadReport(report, config, testPlanExecuteReportDTO.getTestPlanLoadCaseIdAndReportIdMap(), false);
             return report;
         } else {
             return null;
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 9ea85cd2af..5d151b7758 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
@@ -1,34 +1,34 @@
 <template>
   <el-card>
-   <el-scrollbar>
+    <el-scrollbar>
       <el-table
-        row-key="id"
-        @row-click="rowClick"
-        :highlight-current-row="true"
-        :data="loadTestCases">
+          row-key="id"
+          @row-click="rowClick"
+          :highlight-current-row="true"
+          :data="loadTestCases">
         <el-table-column
-          prop="num"
-          :label="$t('commons.id')"
-          show-overflow-tooltip>
+            prop="num"
+            :label="$t('commons.id')"
+            show-overflow-tooltip>
           <template v-slot:default="{row}">
-            {{row.isCustomNum ? row.customNum : row.num }}
+            {{ row.isCustomNum ? row.customNum : row.num }}
           </template>
         </el-table-column>
         <el-table-column
-          prop="name"
-          :label="$t('commons.name')"
-          show-overflow-tooltip>
+            prop="name"
+            :label="$t('commons.name')"
+            show-overflow-tooltip>
         </el-table-column>
 
         <el-table-column
-          prop="userName"
-          :label="$t('commons.create_user')">
+            prop="userName"
+            :label="$t('commons.create_user')">
         </el-table-column>
 
         <el-table-column
-          prop="status"
-          column-key="status"
-          :label="$t('test_track.plan_view.execute_result')">
+            prop="status"
+            column-key="status"
+            :label="$t('test_track.plan_view.execute_result')">
           <template v-slot:default="{row}">
             <el-tag size="mini" type="danger" v-if="row.status === 'error'">
               {{ row.status }}
@@ -39,7 +39,12 @@
             <el-tag size="mini" v-else-if="row.status === 'run'">
               {{ row.status }}
             </el-tag>
-            <span v-else>-</span>
+            <el-tag size="mini" v-else-if="row.status === 'Completed'">
+              {{ row.status }}
+            </el-tag>
+            <el-tag size="mini" v-else>
+              {{ row.status }}
+            </el-tag>
           </template>
         </el-table-column>
 
@@ -58,6 +63,7 @@ import {
   getSharePlanLoadAllCase,
   getSharePlanLoadFailureCase
 } from "@/network/test-plan";
+
 export default {
   name: "LoadFailureResult",
   components: {StatusTableItem, MethodTableItem, TypeTableItem},
@@ -72,7 +78,7 @@ export default {
   },
   data() {
     return {
-      loadTestCases:  []
+      loadTestCases: []
     }
   },
   mounted() {