From a498986752dbcac6fddc82330b268bb8497de73d Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Sun, 29 Sep 2024 18:52:11 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95=E9=9B=86=E8=84=91?=
 =?UTF-8?q?=E5=9B=BE=E5=85=B3=E8=81=94=E7=94=A8=E4=BE=8B=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/request/TestPlanCaseMinderRequest.java |  3 +++
 .../ExtTestPlanFunctionalCaseMapper.java       |  2 +-
 .../mapper/ExtTestPlanFunctionalCaseMapper.xml | 18 +++++++++++++-----
 .../TestPlanFunctionalCaseMinderService.java   |  6 +++---
 .../TestPlanCaseControllerTests.java           |  1 +
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/request/TestPlanCaseMinderRequest.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/request/TestPlanCaseMinderRequest.java
index e93e86e040..0c82c007dd 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/request/TestPlanCaseMinderRequest.java
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/request/TestPlanCaseMinderRequest.java
@@ -19,4 +19,7 @@ public class TestPlanCaseMinderRequest extends BasePlanCaseBatchRequest {
 
     @Schema(description = "脑图选中的项目id集合")
     private List<String> minderProjectIds;
+
+    @Schema(description = "脑图选中的测试集id集合")
+    private List<String> minderCollectionIds;
 }
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanFunctionalCaseMapper.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanFunctionalCaseMapper.java
index 191a780b2d..a2690de29f 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanFunctionalCaseMapper.java
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanFunctionalCaseMapper.java
@@ -77,7 +77,7 @@ public interface ExtTestPlanFunctionalCaseMapper {
 
     List<TestPlanResourceExecResultDTO> selectDistinctExecResultByTestPlanIds(@Param("testPlanIds") List<String> testPlanIds);
 
-    Collection<String> selectIdsByProjectIds(@Param("request") TestPlanCaseMinderRequest request);
+    Collection<String> selectIdsByProjectIdsOrCollectionIds(@Param("request") TestPlanCaseMinderRequest request);
 
     List<FunctionalCaseModule> selectProjectByModuleIds(@Param("moduleIds") List<String> moduleIds);
 
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanFunctionalCaseMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanFunctionalCaseMapper.xml
index 2d03309a08..a7e262d2c0 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanFunctionalCaseMapper.xml
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanFunctionalCaseMapper.xml
@@ -672,7 +672,7 @@
 
     </select>
 
-    <select id="selectIdsByProjectIds" resultType="java.lang.String">
+    <select id="selectIdsByProjectIdsOrCollectionIds" resultType="java.lang.String">
         SELECT
         test_plan_functional_case.id
         FROM
@@ -682,10 +682,18 @@
         test_plan_functional_case.test_plan_id = #{request.testPlanId}
         AND functional_case.deleted = false
         <include refid="queryWhereConditionByBatchQueryRequest"/>
-        and functional_case.project_id in
-        <foreach collection="request.getMinderProjectIds()" item="projectId" open="(" separator="," close=")">
-            #{projectId}
-        </foreach>
+        <if test="request.getMinderProjectIds() != null and request.getMinderProjectIds().size() > 0">
+            and functional_case.project_id in
+            <foreach collection="request.getMinderProjectIds()" item="projectId" open="(" separator="," close=")">
+                #{projectId}
+            </foreach>
+        </if>
+        <if test="request.getMinderCollectionIds() != null and request.getMinderCollectionIds().size() > 0">
+            and test_plan_functional_case.test_plan_collection_id IN
+            <foreach collection="request.getMinderCollectionIds()" item="collectionId" separator="," open="(" close=")">
+                #{collectionId}
+            </foreach>
+        </if>
     </select>
 
     <select id="selectProjectByModuleIds" resultType="io.metersphere.functional.domain.FunctionalCaseModule">
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanFunctionalCaseMinderService.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanFunctionalCaseMinderService.java
index 9d4f1b21dd..1de0581f6f 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanFunctionalCaseMinderService.java
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanFunctionalCaseMinderService.java
@@ -56,9 +56,9 @@ public class TestPlanFunctionalCaseMinderService {
             return ids;
         } else {
             List<String> ids = new ArrayList<>();
-            //项目
-            if (CollectionUtils.isNotEmpty(request.getMinderProjectIds())) {
-                ids.addAll(extTestPlanFunctionalCaseMapper.selectIdsByProjectIds(request));
+            //项目 或 测试集
+            if (CollectionUtils.isNotEmpty(request.getMinderProjectIds()) || CollectionUtils.isNotEmpty(request.getMinderCollectionIds())) {
+                ids.addAll(extTestPlanFunctionalCaseMapper.selectIdsByProjectIdsOrCollectionIds(request));
             }
             //模块
             if (CollectionUtils.isNotEmpty(request.getMinderModuleIds())) {
diff --git a/backend/services/test-plan/src/test/java/io/metersphere/plan/controller/TestPlanCaseControllerTests.java b/backend/services/test-plan/src/test/java/io/metersphere/plan/controller/TestPlanCaseControllerTests.java
index 5a8057b497..ef7aba6d79 100644
--- a/backend/services/test-plan/src/test/java/io/metersphere/plan/controller/TestPlanCaseControllerTests.java
+++ b/backend/services/test-plan/src/test/java/io/metersphere/plan/controller/TestPlanCaseControllerTests.java
@@ -529,6 +529,7 @@ public class TestPlanCaseControllerTests extends BaseTest {
         request.setMinderProjectIds(List.of("123"));
         request.setMinderModuleIds(List.of("t_1"));
         request.setMinderCaseIds(List.of("fc_1"));
+        request.setMinderCollectionIds(List.of("123"));
         paramMap = new LinkedMultiValueMap<>();
         paramMap.add("request", JSON.toJSONString(request));
         paramMap.add("files", files);