From 0e8123cbb23f99fc5361ae8b1f5e2293d523f841 Mon Sep 17 00:00:00 2001
From: zhangdahai112 <dahai.zhang@fit2cloud.com>
Date: Wed, 12 Jan 2022 10:40:04 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E7=BC=96=E8=BE=91=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92-=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/track/service/TestCaseService.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
index 678b699bd6..f93540483c 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -267,7 +267,10 @@ public class TestCaseService {
         testCase.setUpdateTime(System.currentTimeMillis());
         // 更新数据
         TestCaseExample example = new TestCaseExample();
-        example.createCriteria().andIdEqualTo(testCase.getId()).andVersionIdEqualTo(testCase.getVersionId());
+        example.createCriteria().andIdEqualTo(testCase.getId());
+        if (StringUtils.isNotBlank(testCase.getVersionId())) {
+            example.getOredCriteria().get(0).andVersionIdEqualTo(testCase.getVersionId());
+        }
         if (testCaseMapper.updateByExampleSelective(testCase, example) == 0) {
             // 插入新版本的数据
             TestCaseWithBLOBs oldTestCase = testCaseMapper.selectByPrimaryKey(testCase.getId());

From c55350f2eccb45c67d57390e661e088c1ae82a4b Mon Sep 17 00:00:00 2001
From: zhangdahai112 <dahai.zhang@fit2cloud.com>
Date: Wed, 12 Jan 2022 13:41:10 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92-=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=80=A7=E8=83=BD?=
 =?UTF-8?q?=E4=B8=8E=E7=89=88=E6=9C=AC=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/definition/ApiTestCaseRequest.java    |  2 -
 .../mapper/ext/ExtApiDefinitionMapper.xml     | 61 +++++++++++++++-
 .../base/mapper/ext/ExtLoadTestMapper.xml     |  6 ++
 .../base/mapper/ext/ExtTestCaseMapper.xml     |  2 +-
 .../mapper/ext/ExtTestPlanApiCaseMapper.xml   | 70 ++++++++++++++++---
 .../mapper/ext/ExtTestPlanLoadCaseMapper.xml  | 63 ++++++++++++++++-
 .../service/PerformanceTestService.java       | 12 ++--
 .../TestPlanLoadCaseController.java           |  3 +-
 .../TestReviewLoadCaseController.java         |  7 +-
 .../track/dto/TestPlanLoadCaseDTO.java        |  2 +
 .../request/testplan/LoadCaseRequest.java     |  3 +-
 .../service/TestCaseReviewLoadService.java    |  3 +-
 .../service/TestPlanLoadCaseService.java      |  5 +-
 .../scenario/api/RelevanceApiList.vue         |  1 -
 .../comonents/api/TestCaseApiRelevance.vue    | 18 ++++-
 .../comonents/api/TestPlanApiCaseList.vue     | 39 ++++++++++-
 .../comonents/api/TestPlanCaseListHeader.vue  | 11 ++-
 .../comonents/load/TestCaseLoadRelevance.vue  | 31 +++++++-
 .../comonents/load/TestPlanLoadCaseList.vue   | 38 +++++++++-
 .../load/TestPlanLoadCaseListHeader.vue       | 15 +++-
 .../src/common/js/default-table-header.js     |  1 +
 21 files changed, 356 insertions(+), 37 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseRequest.java b/backend/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseRequest.java
index c0d0093334..45b74c64f2 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/ApiTestCaseRequest.java
@@ -33,8 +33,6 @@ public class ApiTestCaseRequest extends BaseQueryRequest {
     private String reviewId;
     private String deleteUserId;
     private long deleteTime;
-    private String refId;
-    private String versionId;
     /**
      * 检查待更新的（近三天有更新的或者状态为error的）
      */
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
index 28a6acbcd0..a9c5ae074a 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
@@ -369,8 +369,35 @@
     </select>
     <select id="listRelevance" resultType="io.metersphere.api.dto.definition.ApiDefinitionResult">
         select
-        <include refid="io.metersphere.base.mapper.ApiDefinitionMapper.Base_Column_List"/>
+        api_definition.version_id versionId,
+        project_version.name versionName,
+        api_definition.id,
+        api_definition.project_id,
+        api_definition.`name`,
+        api_definition.`method`,
+        api_definition.protocol,
+        api_definition.`path`,
+        api_definition.module_path,
+        api_definition.environment_id,
+        api_definition.schedule,
+        api_definition.`status`,
+        api_definition.module_id,
+        api_definition.user_id,
+        api_definition.create_time,
+        api_definition.update_time,
+        api_definition.num,
+        api_definition.tags,
+        api_definition.original_state,
+        api_definition.create_user,
+        api_definition.case_total,
+        api_definition.case_status,
+        api_definition.case_passing_rate,
+        api_definition.delete_time,
+        api_definition.delete_user_id,
+        api_definition.`order`,
+        api_definition.ref_id
         from api_definition
+        left join project_version on api_definition.project_id = project_version.project_id and api_definition.version_id = project_version.id
         <where>
             <if test="request.combine != null">
                 <include refid="combine">
@@ -425,6 +452,12 @@
                                     #{value}
                                 </foreach>
                             </when>
+                            <when test="key=='version_id'">
+                                and api_definition.version_id in
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
                         </choose>
                     </if>
                 </foreach>
@@ -442,6 +475,32 @@
                 )
                 )
             </if>
+            <if test="request.versionId != null">
+                and api_definition.version_id = #{request.versionId}
+            </if>
+            <if test="request.refId != null">
+                and api_definition.ref_id = #{request.refId}
+            </if>
+            <if test="request.versionId == null and request.refId == null and request.id == null">
+                AND (
+                version_id = (SELECT project_version.id
+                FROM api_definition tmp
+                JOIN project_version
+                ON tmp.project_id = project_version.project_id AND tmp.version_id = project_version.id AND latest = TRUE
+                WHERE ref_id = api_definition.ref_id
+                LIMIT 1)
+                OR
+                version_id = (SELECT project_version.id
+                FROM api_definition tmp
+                JOIN project_version ON tmp.project_id = project_version.project_id AND
+                tmp.version_id = project_version.id
+                WHERE ref_id = api_definition.ref_id
+                GROUP BY ref_id
+                HAVING MAX(latest) = 0
+                ORDER BY MAX(project_version.create_time) DESC
+                LIMIT 1)
+                )
+            </if>
         </where>
         <if test="request.orders != null and request.orders.size() > 0">
             order by
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
index a245545775..95a2955c16 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
@@ -132,6 +132,12 @@
                 <foreach collection="request.filters.entrySet()" index="key" item="values">
                     <if test="values != null and values.size() > 0">
                         <choose>
+                            <when test="key == 'id'">
+                                AND load_test.id IN
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
                             <when test="key == 'status'">
                                 AND load_test.status IN
                                 <foreach collection="values" item="value" separator="," open="(" close=")">
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index 11bdad1685..cde60d1719 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -94,7 +94,7 @@
         project_version.id as versionId
         from test_case
         left join test_case_review_test_case as T2 on test_case.id=T2.case_id and T2.review_id =#{request.reviewId}
-        left join project_version on test_case.version_id = project_version.id
+        left join project_version on test_case.version_id = project_version.id and test_casel.project_id = project_version.project_id
         <include refid="notInQueryWhereCondition"/>
         and T2.case_id is null
         <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
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 4418bade0d..f9f8c3b17a 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
@@ -28,22 +28,49 @@
   </select>
   <select id="list" resultType="io.metersphere.api.dto.definition.TestPlanApiCaseDTO">
     select
-    t.id, t.environment_id,(select name from api_test_environment where id = t.environment_id) as environment_name, t.create_time, t.update_time,
-    c.id as case_id, c.project_id, c.name, c.api_definition_id, c.priority, c.description, c.create_user_id,
-    c.update_user_id, c.num, c.tags, t.create_user,
-    a.module_id, a.path, a.protocol, t.status execResult, a.user_id
+    t.id,
+    t.environment_id,
+    (
+    SELECT
+    NAME
+    FROM
+    api_test_environment
+    WHERE
+    id = t.environment_id
+    ) AS environment_name,
+    t.create_time,
+    t.update_time,
+    c.id AS case_id,
+    c.project_id,
+    c.name,
+    c.api_definition_id,
+    c.priority,
+    c.description,
+    c.create_user_id,
+    c.update_user_id,
+    c.num,
+    c.tags,
+    t.create_user,
+    a.module_id,
+    a.path,
+    a.protocol,
+    t.status execResult,
+    a.user_id,
+    a.version_id versionId,
+    project_version.name versionName
     from
     test_plan_api_case t
     inner join
     api_test_case c
     on t.api_case_id = c.id
     <if test="request.planId != null and request.planId!=''">
-        and t.test_plan_id = #{request.planId}
-      </if>
+      and t.test_plan_id = #{request.planId}
+    </if>
     inner join
-      api_definition a
+    api_definition a
     on
-      c.api_definition_id = a.id
+    c.api_definition_id = a.id
+    left join project_version on a.version_id = project_version.id and a.project_id = project_version.project_id
     <if test="request.protocol != null and request.protocol!=''">
       and a.protocol = #{request.protocol}
     </if>
@@ -112,6 +139,32 @@
         </if>
       </foreach>
     </if>
+    <if test="request.versionId != null">
+      and a.version_id = #{request.versionId}
+    </if>
+    <if test="request.refId != null">
+      and a.ref_id = #{request.refId}
+    </if>
+    <if test="request.versionId == null and request.refId == null and request.id == null">
+      AND (
+      a.version_id = (SELECT project_version.id
+      FROM api_definition tmp
+      JOIN project_version
+      ON tmp.project_id = project_version.project_id AND tmp.version_id = project_version.id AND latest = TRUE
+      WHERE ref_id = a.ref_id
+      LIMIT 1)
+      OR
+      a.version_id = (SELECT project_version.id
+      FROM api_definition tmp
+      JOIN project_version ON tmp.project_id = project_version.project_id AND
+      tmp.version_id = project_version.id
+      WHERE ref_id = a.ref_id
+      GROUP BY ref_id
+      HAVING MAX(latest) = 0
+      ORDER BY MAX(project_version.create_time) DESC
+      LIMIT 1)
+      )
+    </if>
     <if test="request.orders != null and request.orders.size() > 0">
       order by
       <foreach collection="request.orders" separator="," item="order">
@@ -128,6 +181,7 @@
         </choose>
       </foreach>
     </if>
+
   </select>
   <select id="selectIds" resultType="java.lang.String">
     select
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..fd81ff960b 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
@@ -25,6 +25,32 @@
         <if test="request.name != null and request.name != ''">
             and (load_test.name like CONCAT('%', #{request.name},'%') OR load_test.num like CONCAT('%', #{request.name},'%'))
         </if>
+        <if test="request.versionId != null">
+            and load_test.version_id = #{request.versionId}
+        </if>
+        <if test="request.refId != null">
+            and load_test.ref_id = #{request.refId}
+        </if>
+        <if test="request.versionId == null and request.refId == null and request.id == null">
+            AND (
+            load_test.version_id = (SELECT project_version.id
+            FROM load_test tmp
+            JOIN project_version
+            ON tmp.project_id = project_version.project_id AND tmp.version_id = project_version.id AND latest = TRUE
+            WHERE ref_id = load_test.ref_id
+            LIMIT 1)
+            OR
+            load_test.version_id = (SELECT project_version.id
+            FROM load_test tmp
+            JOIN project_version ON tmp.project_id = project_version.project_id AND
+            tmp.version_id = project_version.id
+            WHERE ref_id = load_test.ref_id
+            GROUP BY ref_id
+            HAVING MAX(latest) = 0
+            ORDER BY MAX(project_version.create_time) DESC
+            LIMIT 1)
+            )
+        </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">
@@ -35,6 +61,12 @@
                                 #{value}
                             </foreach>
                         </when>
+                        <when test="key=='version_id'">
+                            and load_test.version_id in
+                            <foreach collection="values" item="value" separator="," open="(" close=")">
+                                #{value}
+                            </foreach>
+                        </when>
                     </choose>
                 </if>
             </foreach>
@@ -135,11 +167,14 @@
         tplc.status as caseStatus,
         lt.name as caseName,
         tplc.load_report_id,
-        p.name as projectName
+        p.name as projectName,
+        pv.name versionName,
+        lt.version_id versionId
         from test_plan_load_case tplc
         inner join load_test lt on tplc.load_case_id = lt.id
         left join user u on lt.user_id = u.id
         left join project p on lt.project_id = p.id
+        left join project_version pv on lt.project_id = pv.project_id and lt.version_id = pv.id
         <where>
             tplc.test_plan_id = #{request.testPlanId}
             <if test="request.caseIds != null and request.caseIds.size > 0">
@@ -172,6 +207,32 @@
                 </foreach>
             </if>
         </where>
+        <if test="request.versionId != null">
+            and lt.version_id = #{request.versionId}
+        </if>
+        <if test="request.refId != null">
+            and lt.ref_id = #{request.refId}
+        </if>
+        <if test="request.versionId == null and request.refId == null and request.id == null">
+            AND (
+            lt.version_id = (SELECT project_version.id
+            FROM load_test tmp
+            JOIN project_version
+            ON tmp.project_id = project_version.project_id AND tmp.version_id = project_version.id AND latest = TRUE
+            WHERE ref_id = lt.ref_id
+            LIMIT 1)
+            OR
+            lt.version_id = (SELECT project_version.id
+            FROM load_test tmp
+            JOIN project_version ON tmp.project_id = project_version.project_id AND
+            tmp.version_id = project_version.id
+            WHERE ref_id = lt.ref_id
+            GROUP BY ref_id
+            HAVING MAX(latest) = 0
+            ORDER BY MAX(project_version.create_time) DESC
+            LIMIT 1)
+            )
+        </if>
         <if test="request.orders != null and request.orders.size() > 0">
             order by
             <foreach collection="request.orders" separator="," item="order">
diff --git a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
index 914ddd923e..1e7cd42819 100644
--- a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
+++ b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
@@ -662,14 +662,16 @@ public class PerformanceTestService {
         }
     }
 
-    public List<LoadTest> getLoadTestListByIds(List<String> ids) {
+    public List<LoadTestDTO> getLoadTestListByIds(List<String> ids) {
         if (CollectionUtils.isEmpty(ids)) {
             return new ArrayList<>();
         }
-        LoadTestExample loadTestExample = new LoadTestExample();
-        loadTestExample.createCriteria().andIdIn(ids);
-        List<LoadTest> loadTests = loadTestMapper.selectByExample(loadTestExample);
-        return Optional.ofNullable(loadTests).orElse(new ArrayList<>());
+        QueryTestPlanRequest request = new QueryTestPlanRequest();
+        Map filters = new HashMap();
+        filters.put("id", ids);
+        request.setFilters(filters);
+        List<LoadTestDTO> loadTestDTOS = extLoadTestMapper.list(request);
+        return loadTestDTOS;
     }
 
     private int getNextNum(String projectId) {
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestPlanLoadCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestPlanLoadCaseController.java
index 59a3786528..1b76f151f2 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestPlanLoadCaseController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestPlanLoadCaseController.java
@@ -10,6 +10,7 @@ import io.metersphere.commons.constants.TriggerMode;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
 import io.metersphere.controller.request.ResetOrderRequest;
+import io.metersphere.dto.LoadTestDTO;
 import io.metersphere.log.annotation.MsAuditLog;
 import io.metersphere.performance.request.RunTestPlanRequest;
 import io.metersphere.track.dto.TestPlanLoadCaseDTO;
@@ -31,7 +32,7 @@ public class TestPlanLoadCaseController {
     private TestPlanLoadCaseService testPlanLoadCaseService;
 
     @PostMapping("/relevance/list/{goPage}/{pageSize}")
-    public Pager<List<LoadTest>> relevanceList(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody LoadCaseRequest request) {
+    public Pager<List<LoadTestDTO>> relevanceList(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody LoadCaseRequest request) {
         return testPlanLoadCaseService.relevanceList(request, goPage, pageSize);
     }
 
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestReviewLoadCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestReviewLoadCaseController.java
index 1a0cf089ce..acb0189569 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestReviewLoadCaseController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestReviewLoadCaseController.java
@@ -1,17 +1,18 @@
 package io.metersphere.track.controller;
+
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import io.metersphere.base.domain.LoadTest;
 import io.metersphere.base.domain.TestCaseReviewLoad;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
+import io.metersphere.dto.LoadTestDTO;
 import io.metersphere.dto.TestReviewLoadCaseDTO;
 import io.metersphere.performance.request.RunTestPlanRequest;
 import io.metersphere.track.request.testplan.LoadCaseReportRequest;
-import io.metersphere.track.request.testplan.LoadCaseRequest;
 import io.metersphere.track.request.testreview.TestReviewRequest;
 import io.metersphere.track.service.TestCaseReviewLoadService;
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
 import java.util.List;
 
@@ -22,7 +23,7 @@ public class TestReviewLoadCaseController {
     private TestCaseReviewLoadService testCaseReviewLoadService;
 
     @PostMapping("/relevance/list/{goPage}/{pageSize}")
-    public Pager<List<LoadTest>> relevanceList(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody TestReviewRequest request) {
+    public Pager<List<LoadTestDTO>> relevanceList(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody TestReviewRequest request) {
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
         return PageUtils.setPageInfo(page, testCaseReviewLoadService.relevanceList(request));
     }
diff --git a/backend/src/main/java/io/metersphere/track/dto/TestPlanLoadCaseDTO.java b/backend/src/main/java/io/metersphere/track/dto/TestPlanLoadCaseDTO.java
index e942f86ed7..675fdb4703 100644
--- a/backend/src/main/java/io/metersphere/track/dto/TestPlanLoadCaseDTO.java
+++ b/backend/src/main/java/io/metersphere/track/dto/TestPlanLoadCaseDTO.java
@@ -25,6 +25,8 @@ public class TestPlanLoadCaseDTO extends TestPlanLoadCaseWithBLOBs {
     private String name;
     private ResponseDTO response;
     private String reportId;
+    private String versionId;
+    private String versionName;
 
     @Getter
     @Setter
diff --git a/backend/src/main/java/io/metersphere/track/request/testplan/LoadCaseRequest.java b/backend/src/main/java/io/metersphere/track/request/testplan/LoadCaseRequest.java
index 1337ab83ac..1f076f7b86 100644
--- a/backend/src/main/java/io/metersphere/track/request/testplan/LoadCaseRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testplan/LoadCaseRequest.java
@@ -19,7 +19,8 @@ public class LoadCaseRequest extends TestPlanLoadCase {
     private Map<String, List<String>> filters;
     private List<OrderRequest> orders;
     private Map<String, Object> combine;
-
+    private String versionId;
+    private String refId;
     // 测试计划是否允许重复
     private boolean repeatCase;
 }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewLoadService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewLoadService.java
index afec6802c3..de2933c0ce 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewLoadService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewLoadService.java
@@ -6,6 +6,7 @@ import io.metersphere.base.mapper.ext.ExtTestCaseReviewLoadMapper;
 import io.metersphere.base.mapper.ext.ExtTestPlanLoadCaseMapper;
 import io.metersphere.commons.constants.TestPlanStatus;
 import io.metersphere.controller.request.OrderRequest;
+import io.metersphere.dto.LoadTestDTO;
 import io.metersphere.dto.TestReviewLoadCaseDTO;
 import io.metersphere.performance.request.RunTestPlanRequest;
 import io.metersphere.performance.service.PerformanceTestService;
@@ -46,7 +47,7 @@ public class TestCaseReviewLoadService {
     @Resource
     private LoadTestMapper loadTestMapper;
 
-    public List<LoadTest> relevanceList(TestReviewRequest request) {
+    public List<LoadTestDTO> relevanceList(TestReviewRequest request) {
         List<String> ids = extTestCaseReviewLoadMapper.selectIdsNotInPlan(request.getProjectId(), request.getTestCaseReviewId());
         if (CollectionUtils.isEmpty(ids)) {
             return new ArrayList<>();
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..ece83bc1a1 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java
@@ -19,6 +19,7 @@ import io.metersphere.commons.utils.*;
 import io.metersphere.constants.RunModeConstants;
 import io.metersphere.controller.request.OrderRequest;
 import io.metersphere.controller.request.ResetOrderRequest;
+import io.metersphere.dto.LoadTestDTO;
 import io.metersphere.log.vo.OperatingLogDetails;
 import io.metersphere.performance.request.RunTestPlanRequest;
 import io.metersphere.performance.service.PerformanceTestService;
@@ -69,7 +70,7 @@ public class TestPlanLoadCaseService {
     @Lazy
     private TestPlanService testPlanService;
 
-    public Pager<List<LoadTest>> relevanceList(LoadCaseRequest request, int goPage, int pageSize) {
+    public Pager<List<LoadTestDTO>> relevanceList(LoadCaseRequest request, int goPage, int pageSize) {
         List<OrderRequest> orders = ServiceUtils.getDefaultSortOrder(request.getOrders());
         orders.forEach(i -> i.setPrefix("load_test"));
         request.setOrders(orders);
@@ -78,7 +79,7 @@ public class TestPlanLoadCaseService {
         }
         List<String> ids = extTestPlanLoadCaseMapper.selectIdsNotInPlan(request);
         if (CollectionUtils.isEmpty(ids)) {
-            return PageUtils.setPageInfo(PageHelper.startPage(goPage, pageSize, true), new ArrayList<>());
+            return PageUtils.setPageInfo(PageHelper.startPage(goPage, pageSize, true), new ArrayList <>());
         }
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
         return PageUtils.setPageInfo(page, performanceTestService.getLoadTestListByIds(ids));
diff --git a/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue b/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
index 1db2190285..dcd58fc850 100644
--- a/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
@@ -120,7 +120,6 @@ export default {
       this.$emit('isApiListEnableChange', data);
     },
     initTable(projectId) {
-      this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
       this.condition.moduleIds = this.selectNodeIds;
       if (this.trashEnable) {
         this.condition.filters = {status: ["Trash"]};
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestCaseApiRelevance.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestCaseApiRelevance.vue
index 6d6628320d..f627a6e93c 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestCaseApiRelevance.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestCaseApiRelevance.vue
@@ -25,6 +25,7 @@
       :project-id="projectId"
       :is-test-plan="true"
       :plan-id="planId"
+      :versionFilters="versionFilters"
       @isApiListEnableChange="isApiListEnableChange"
       ref="apiList"/>
 
@@ -49,6 +50,7 @@
   import MsApiModule from "../../../../../api/definition/components/module/ApiModule";
   import RelevanceApiList from "../../../../../api/automation/scenario/api/RelevanceApiList";
   import RelevanceCaseList from "../../../../../api/automation/scenario/api/RelevanceCaseList";
+  import {getCurrentProjectID, hasLicense} from "@/common/js/utils";
 
   export default {
     name: "TestCaseApiRelevance",
@@ -69,7 +71,8 @@
         isApiListEnable: true,
         condition: {},
         currentRow: {},
-        projectId: ""
+        projectId: "",
+        versionFilters: [],
       };
     },
     props: {
@@ -82,6 +85,9 @@
         this.condition.planId = this.planId;
       },
     },
+    mounted() {
+      this.getVersionOptions();
+    },
     methods: {
       open() {
         this.init();
@@ -182,6 +188,16 @@
           this.$refs.baseRelevance.close();
         });
       },
+      getVersionOptions() {
+        if (hasLicense()) {
+          this.$get('/project/version/get-project-versions/' + getCurrentProjectID(), response => {
+            this.versionOptions = response.data;
+            this.versionFilters = response.data.map(u => {
+              return {text: u.name, value: u.id};
+            });
+          });
+        }
+      },
     }
   }
 </script>
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
index d860e40bc0..eee1ffcd21 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
@@ -6,6 +6,7 @@
           :project-id="getProjectId()"
           :condition="condition"
           :plan-id="planId"
+          @changeVersion="changeVersion"
           @refresh="initTable"
           @relevanceCase="$emit('relevanceCase')"
           @setEnvironment="setEnvironment"
@@ -39,6 +40,18 @@
           <ms-table-column :field="item" :fields-width="fieldsWidth" prop="name" sortable min-width="120"
                            :label="$t('test_track.case.name')"/>
 
+         <ms-table-column
+           prop="versionId"
+           :field="item"
+           :filters="versionFilters"
+           :fields-width="fieldsWidth"
+           :label="$t('commons.version')"
+           min-width="120px">
+         <template v-slot:default="scope">
+            <span>{{ scope.row.versionName }}</span>
+          </template>
+        </ms-table-column>
+
           <ms-table-column
             :field="item"
             :fields-width="fieldsWidth"
@@ -166,7 +179,7 @@ import MsContainer from "../../../../../common/components/MsContainer";
 import MsBottomContainer from "../../../../../api/definition/components/BottomContainer";
 import BatchEdit from "@/business/components/track/case/components/BatchEdit";
 import {API_METHOD_COLOUR, CASE_PRIORITY, RESULT_MAP} from "../../../../../api/definition/model/JsonData";
-import {getCurrentProjectID, strMapToObj} from "@/common/js/utils";
+import {getCurrentProjectID, hasLicense, strMapToObj} from "@/common/js/utils";
 import ApiListContainer from "../../../../../api/definition/components/list/ApiListContainer";
 import PriorityTableItem from "../../../../common/tableItems/planview/PriorityTableItem";
 import {getUUID} from "../../../../../../../common/js/utils";
@@ -212,6 +225,9 @@ export default {
     MsBottomContainer,
     MsTaskCenter
   },
+  mounted(){
+    this.getVersionOptions();
+  },
   data() {
     return {
       type: TEST_PLAN_API_CASE,
@@ -275,7 +291,8 @@ export default {
       rowLoading: "",
       userFilters: [],
       projectIds: [],
-      projectList: []
+      projectList: [],
+      versionFilters: [],
     };
   },
   props: {
@@ -627,6 +644,24 @@ export default {
         }
       });
     },
+    changeVersion(currentVersion) {
+      if (currentVersion == "") {
+        this.condition.versionId = null;
+      } else {
+        this.condition.versionId = currentVersion;
+      }
+      this.initTable();
+    },
+    getVersionOptions() {
+      if (hasLicense()) {
+        this.$get('/project/version/get-project-versions/' + getCurrentProjectID(), response => {
+          this.versionOptions= response.data;
+          this.versionFilters = response.data.map(u => {
+            return {text: u.name, value: u.id};
+          });
+        });
+      }
+    },
   },
 };
 </script>
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanCaseListHeader.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanCaseListHeader.vue
index 82c1b76e46..88256c098c 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanCaseListHeader.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanCaseListHeader.vue
@@ -11,6 +11,7 @@
       <ms-table-button v-permission="['PROJECT_TRACK_PLAN:READ+RELEVANCE_OR_CANCEL']" icon="el-icon-connection"
                        :content="$t('test_track.plan_view.relevance_test_case')"
                        @click="$emit('relevanceCase')"/>
+      <version-select v-xpack :project-id="projectId" @changeVersion="changeVersion"/>
     </template>
 
   </ms-table-header>
@@ -20,10 +21,12 @@
 import MsTableHeader from "../../../../../common/components/MsTableHeader";
 import MsTableButton from "../../../../../common/components/MsTableButton";
 import MsEnvironmentSelect from "../../../../../api/definition/components/case/MsEnvironmentSelect";
+const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
+const VersionSelect = requireComponent.keys().length > 0 ? requireComponent("./version/VersionSelect.vue") : {};
 
 export default {
   name: "TestPlanCaseListHeader",
-  components: {MsEnvironmentSelect, MsTableButton, MsTableHeader},
+  components: {MsEnvironmentSelect, MsTableButton, MsTableHeader, 'VersionSelect': VersionSelect.default},
   props: ['condition', 'projectId', 'isReadOnly', 'planId'],
   methods: {
     setEnvironment(data) {
@@ -35,6 +38,9 @@ export default {
           this.$emit('setEnvironment', data);
         });
       }
+    },
+    changeVersion(currentVersion) {
+      this.$emit('changeVersion', currentVersion);
     }
   }
 };
@@ -46,4 +52,7 @@ export default {
   margin-right: 10px;
 }
 
+.version-select {
+  padding-left: 10px;
+}
 </style>
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 73936a6ed5..f5adbf675a 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
@@ -42,6 +42,18 @@
           :label="$t('commons.name')"
           show-overflow-tooltip>
         </el-table-column>
+
+        <el-table-column
+          prop="versionId"
+          :column-key="'versionId'"
+          :filters="versionFilters"
+          :label="$t('commons.version')"
+          min-width="120px">
+          <template v-slot:default="scope">
+            <span>{{ scope.row.versionName }}</span>
+          </template>
+        </el-table-column>
+
         <el-table-column
           prop="status"
           column-key="status"
@@ -88,6 +100,7 @@ import MsPerformanceTestStatus from "@/business/components/performance/test/Perf
 import MsTablePagination from "@/business/components/common/pagination/TablePagination";
 import {_filter} from "@/common/js/tableUtils";
 import {TEST_PLAN_RELEVANCE_LOAD_CASE} from "@/business/components/common/components/search/search-components";
+import {hasLicense, getCurrentProjectID} from "@/common/js/utils";
 
 export default {
   name: "TestCaseLoadRelevance",
@@ -126,7 +139,8 @@ export default {
         {text: 'Reporting', value: 'Reporting'},
         {text: 'Completed', value: 'Completed'},
         {text: 'Error', value: 'Error'}
-      ]
+      ],
+      versionFilters: []
     };
   },
   props: {
@@ -145,6 +159,9 @@ export default {
       this.condition.reviewId = this.reviewId;
     },
   },
+  mounted(){
+    this.getVersionOptions();
+  },
   methods: {
     filter(filters) {
       _filter(filters, this.condition);
@@ -275,7 +292,17 @@ export default {
       }
       this.treeNodes = [];
       this.selectNodeIds = [];
-    }
+    },
+    getVersionOptions() {
+      if (hasLicense()) {
+        this.$get('/project/version/get-project-versions/' + getCurrentProjectID(), response => {
+          this.versionOptions = response.data;
+          this.versionFilters = response.data.map(u => {
+            return {text: u.name, value: u.id};
+          });
+        });
+      }
+    },
   }
 }
 </script>
diff --git a/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
index c1af28f312..70c019a8d9 100644
--- a/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
@@ -5,6 +5,8 @@
         <test-plan-load-case-list-header
             :condition="condition"
             :plan-id="planId"
+            :isShowVersion="true"
+            @changeVersion="changeVersion"
             @refresh="initTable"
             @relevanceCase="$emit('relevanceCase')"/>
       </template>
@@ -43,6 +45,16 @@
             min-width="120"
             sortable>
           </ms-table-column>
+          <ms-table-column
+            prop="versionId"
+            :filters="versionFilters"
+            :fields-width="fieldsWidth"
+            :label="$t('commons.version')"
+            min-width="120px">
+           <template v-slot:default="scope">
+            <span>{{ scope.row.versionName }}</span>
+           </template>
+          </ms-table-column>
           <ms-table-column
             :field="item"
             :fields-width="fieldsWidth"
@@ -129,7 +141,7 @@ import {
   buildBatchParam, getCustomTableHeader, getCustomTableWidth
 } from "@/common/js/tableUtils";
 import {TEST_PLAN_LOAD_CASE} from "@/common/js/constants";
-import {getCurrentProjectID, getCurrentUser, getCurrentUserId} from "@/common/js/utils";
+import {getCurrentProjectID, getCurrentUser, getCurrentUserId, hasLicense} from "@/common/js/utils";
 import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
 import MsPlanRunMode from "../../../common/PlanRunMode";
 import MsTable from "@/business/components/common/components/table/MsTable";
@@ -211,7 +223,8 @@ export default {
       ],
       reportId: '',
       loading: false,
-      statusScheduler: null
+      statusScheduler: null,
+      versionFilters: []
     }
   },
   props: {
@@ -242,6 +255,9 @@ export default {
       this.initTable();
     }
   },
+  mounted() {
+    this.getVersionOptions();
+  },
   methods: {
     orderBySelectRows(rows){
       let selectIds = Array.from(rows).map(row => row.id);
@@ -450,6 +466,24 @@ export default {
         clearInterval(this.refreshScheduler);
       }
     },
+    changeVersion(currentVersion) {
+      if (currentVersion == "") {
+        this.condition.versionId = null;
+      } else {
+        this.condition.versionId = currentVersion;
+      }
+      this.initTable();
+    },
+    getVersionOptions() {
+      if (hasLicense()) {
+        this.$get('/project/version/get-project-versions/' + getCurrentProjectID(), response => {
+          this.versionOptions= response.data;
+          this.versionFilters = response.data.map(u => {
+            return {text: u.name, value: u.id};
+          });
+        });
+      }
+    },
   },
   beforeDestroy() {
     this.cancelRefresh();
diff --git a/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseListHeader.vue b/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseListHeader.vue
index 72a64bd79c..e5db5d75a0 100644
--- a/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseListHeader.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseListHeader.vue
@@ -1,5 +1,7 @@
 <template>
   <ms-table-header
+    :isShowVersion="isShowVersion"
+    @changeVersion="changeVersion"
     :condition="condition"
     @search="$emit('refresh')"
     :show-create="false"
@@ -19,11 +21,20 @@
 <script>
 import MsTableButton from "@/business/components/common/components/MsTableButton";
 import MsTableHeader from "@/business/components/common/components/MsTableHeader";
+const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
+const VersionSelect = requireComponent.keys().length > 0 ? requireComponent("./version/VersionSelect.vue") : {};
 
 export default {
   name: "TestPlanLoadCaseListHeader",
-  components: {MsTableButton, MsTableHeader},
-  props: ['condition'],
+  components: {
+    MsTableButton, MsTableHeader, 'VersionSelect': VersionSelect.default,
+  },
+  props: ['condition', 'isShowVersion'],
+  methods: {
+    changeVersion(currentVersion) {
+      this.$emit("changeVersion", currentVersion)
+    }
+  }
 };
 </script>
 
diff --git a/frontend/src/common/js/default-table-header.js b/frontend/src/common/js/default-table-header.js
index 61da9b83de..32fd89b5ce 100644
--- a/frontend/src/common/js/default-table-header.js
+++ b/frontend/src/common/js/default-table-header.js
@@ -161,6 +161,7 @@ export let CUSTOM_TABLE_HEADER = {
   TEST_PLAN_LOAD_CASE: [
     {id: 'num', key: '1', label: 'commons.id'},
     {id: 'caseName', key: '2', label: 'commons.name'},
+    {id: 'versionId', key: '9', label: 'project.version.name', xpack: true},
     {id: 'projectName', key: '3', label: 'load_test.project_name'},
     {id: 'userName', key: '4', label: 'load_test.user_name'},
     {id: 'createTime', key: '5', label: 'commons.create_time'},

From 7c618c4560914bdf03b9cb3e4ca7d91b823cc224 Mon Sep 17 00:00:00 2001
From: zhangdahai112 <dahai.zhang@fit2cloud.com>
Date: Wed, 12 Jan 2022 14:41:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA?=
 =?UTF-8?q?-=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E7=89=88=E6=9C=AC=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           | 6 ++++++
 .../track/plan/view/comonents/load/TestPlanLoadCaseList.vue | 1 +
 2 files changed, 7 insertions(+)

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 fd81ff960b..18b6fd8748 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
@@ -202,6 +202,12 @@
                                     #{value}
                                 </foreach>
                             </when>
+                            <when test="key=='version_id'">
+                                and lt.version_id in
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
                         </choose>
                     </if>
                 </foreach>
diff --git a/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
index 70c019a8d9..e4b375a463 100644
--- a/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
@@ -47,6 +47,7 @@
           </ms-table-column>
           <ms-table-column
             prop="versionId"
+            :field="item"
             :filters="versionFilters"
             :fields-width="fieldsWidth"
             :label="$t('commons.version')"