From 5b68fdb4e077278f0a8d4e1c4e3af662f4dbd48f Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 1 Jul 2021 17:06:00 +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=E5=85=B3=E8=81=94=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E5=88=97=E8=A1=A8=20=E6=A0=B9=E6=8D=AE=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=AD=9B=E9=80=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtTestPlanLoadCaseMapper.xml  | 14 ++++++++++++++
 .../view/comonents/load/TestCaseLoadRelevance.vue  |  8 +++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

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 3a3fb8f172..5232dcec24 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
@@ -20,6 +20,20 @@
         <if test="request.name != null and request.name != ''">
             and load_test.name like CONCAT('%', #{request.name},'%')
         </if>
+        <if test="request.filters != null and request.filters.size() > 0">
+            <foreach collection="request.filters.entrySet()" index="key" item="values">
+                <if test="values != null and values.size() > 0">
+                    <choose>
+                        <when test="key=='status'">
+                            and load_test.status in
+                            <foreach collection="values" item="value" separator="," open="(" close=")">
+                                #{value}
+                            </foreach>
+                        </when>
+                    </choose>
+                </if>
+            </foreach>
+        </if>
         and load_test.id not in (
         select tplc.load_case_id from test_plan_load_case tplc where tplc.test_plan_id = #{request.testPlanId}
         )
diff --git a/frontend/src/business/components/track/plan/view/comonents/load/TestCaseLoadRelevance.vue b/frontend/src/business/components/track/plan/view/comonents/load/TestCaseLoadRelevance.vue
index 35d5a3430d..56dbca6bcf 100644
--- a/frontend/src/business/components/track/plan/view/comonents/load/TestCaseLoadRelevance.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/load/TestCaseLoadRelevance.vue
@@ -29,6 +29,7 @@
         row-key="id"
         @select-all="handleSelectAll"
         @select="handleSelectionChange"
+        @filter-change="filter"
         height="50vh"
         ref="table">
         <el-table-column
@@ -82,6 +83,7 @@ import MsTableAdvSearchBar from "@/business/components/common/components/search/
 import MsTableHeader from "@/business/components/common/components/MsTableHeader";
 import MsPerformanceTestStatus from "@/business/components/performance/test/PerformanceTestStatus";
 import MsTablePagination from "@/business/components/common/pagination/TablePagination";
+import {_filter} from "@/common/js/tableUtils";
 
 export default {
   name: "TestCaseLoadRelevance",
@@ -143,9 +145,13 @@ export default {
     },
     reviewId() {
       this.condition.reviewId = this.reviewId;
-    }
+    },
   },
   methods: {
+    filter(filters) {
+      _filter(filters, this.condition);
+      this.search();
+    },
     open() {
       this.$refs.baseRelevance.open();
     },