From 6e0c20771ee353fa9bec974428b1ee106f8da87f Mon Sep 17 00:00:00 2001
From: WangXu10 <xu.wang@fit2cloud.com>
Date: Thu, 18 Jul 2024 17:25:26 +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=90=8C=E6=AD=A5=E5=85=B3=E8=81=94&?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=85=B3=E8=81=94=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/mapper/ExtApiScenarioMapper.java      |  2 +-
 .../api/mapper/ExtApiScenarioMapper.xml       |  5 +++++
 .../api/mapper/ExtApiTestCaseMapper.java      |  2 +-
 .../api/mapper/ExtApiTestCaseMapper.xml       |  5 +++++
 .../mapper/ExtFunctionalCaseMapper.java       |  2 +-
 .../mapper/ExtFunctionalCaseMapper.xml        |  5 +++++
 .../mapper/ExtFunctionalCaseTestMapper.java   |  4 ++--
 .../mapper/ExtFunctionalCaseTestMapper.xml    | 10 +++++++++
 .../plan/service/TestPlanApiCaseService.java  |  4 ++--
 .../service/TestPlanApiScenarioService.java   |  2 +-
 .../TestPlanFunctionalCaseService.java        | 22 ++++++++++---------
 11 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioMapper.java b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioMapper.java
index 7282045d13..3b8d18ddd2 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioMapper.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioMapper.java
@@ -87,7 +87,7 @@ public interface ExtApiScenarioMapper {
     List<ApiScenario> selectAllCase(@Param("isRepeat") boolean isRepeat, @Param("projectId") String projectId, @Param("testPlanId") String testPlanId);
 
 
-    List<ApiScenario> getListBySelectModules(@Param("projectId") String projectId, @Param("moduleIds") List<String> moduleIds, @Param("testPlanId") String testPlanId);
+    List<ApiScenario> getListBySelectModules(@Param("isRepeat") boolean isRepeat, @Param("projectId") String projectId, @Param("moduleIds") List<String> moduleIds, @Param("testPlanId") String testPlanId);
 
     List<ApiScenario> getListBySelectIds(@Param("projectId") String projectId, @Param("ids") List<String> ids, @Param("testPlanId") String testPlanId);
 }
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioMapper.xml
index 574d8fee06..a03d1240b7 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioMapper.xml
@@ -708,6 +708,11 @@
         <foreach collection="moduleIds" item="moduleId" open="(" separator="," close=")">
             #{moduleId}
         </foreach>
+        <if test="!isRepeat">
+            AND api_scenario.id not in (
+            select api_scenario_id from test_plan_api_scenario where test_plan_id = #{testPlanId}
+            )
+        </if>
     </select>
 
     <select id="getListBySelectIds" resultType="io.metersphere.api.domain.ApiScenario">
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.java b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.java
index 4e669eab21..70a47cb645 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.java
@@ -105,7 +105,7 @@ public interface ExtApiTestCaseMapper {
 
     List<ApiTestCase> selectAllApiCase(@Param("isRepeat") boolean isRepeat, @Param("projectId") String projectId, @Param("testPlanId") String testPlanId);
 
-    List<ApiTestCase> getListBySelectModules(@Param("projectId") String projectId, @Param("moduleIds") List<String> moduleIds, @Param("testPlanId") String testPlanId);
+    List<ApiTestCase> getListBySelectModules(@Param("isRepeat") boolean isRepeat, @Param("projectId") String projectId, @Param("moduleIds") List<String> moduleIds, @Param("testPlanId") String testPlanId);
 
     List<ApiTestCase> getListBySelectIds(@Param("projectId") String projectId, @Param("ids") List<String> ids, @Param("testPlanId") String testPlanId);
 
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.xml
index c4878b2e35..72e72ac72c 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.xml
@@ -649,6 +649,11 @@
         <foreach collection="moduleIds" item="moduleId" open="(" separator="," close=")">
             #{moduleId}
         </foreach>
+        <if test="!isRepeat">
+            AND api_test_case.id not in (
+            select api_case_id from test_plan_api_case where test_plan_id = #{testPlanId}
+            )
+        </if>
     </select>
 
     <select id="getListBySelectIds" resultType="io.metersphere.api.domain.ApiTestCase">
diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.java b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.java
index a41928197e..721d27482f 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.java
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.java
@@ -101,7 +101,7 @@ public interface ExtFunctionalCaseMapper {
 
     List<FunctionalCase> selectAllFunctionalCase(@Param("isRepeat") boolean isRepeat, @Param("projectId") String projectId, @Param("testPlanId") String testPlanId);
 
-    List<FunctionalCase> getListBySelectModules(@Param("projectId") String projectId, @Param("moduleIds") List<String> moduleIds, @Param("testPlanId") String testPlanId);
+    List<FunctionalCase> getListBySelectModules(@Param("isRepeat") boolean isRepeat, @Param("projectId") String projectId, @Param("moduleIds") List<String> moduleIds, @Param("testPlanId") String testPlanId);
 
     List<FunctionalCase> getListBySelectIds(@Param("projectId") String projectId, @Param("ids") List<String> ids, @Param("testPlanId") String testPlanId);
 }
diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml
index 9696aea68a..34b3599d7c 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml
@@ -930,6 +930,11 @@
         <foreach collection="moduleIds" item="moduleId" open="(" separator="," close=")">
             #{moduleId}
         </foreach>
+        <if test="!isRepeat">
+            AND functional_case.id not in (
+            select functional_case_id from test_plan_functional_case where test_plan_id = #{testPlanId}
+            )
+        </if>
     </select>
 
 
diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseTestMapper.java b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseTestMapper.java
index a5586266e5..75a45f4fa9 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseTestMapper.java
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseTestMapper.java
@@ -25,9 +25,9 @@ public interface ExtFunctionalCaseTestMapper {
 
     List<TestPlanCaseExecuteHistoryDTO> getPlanExecuteHistoryList(@Param("caseId") String caseId, @Param("planId") String planId);
 
-    List<ApiTestCase> selectApiCaseByCaseIds(@Param("caseIds") List<String> caseIds);
+    List<ApiTestCase> selectApiCaseByCaseIds(@Param("isRepeat") boolean isRepeat, @Param("caseIds") List<String> caseIds, @Param("testPlanId") String testPlanId);
 
-    List<ApiScenario> selectApiScenarioByCaseIds(@Param("caseIds") List<String> caseIds);
+    List<ApiScenario> selectApiScenarioByCaseIds(@Param("isRepeat") boolean isRepeat, @Param("caseIds") List<String> caseIds, @Param("testPlanId") String testPlanId);
 
     List<FunctionalCaseTest> selectApiAndScenarioIdsFromCaseIds(@Param("caseIds") List<String> functionalCaseIds);
 }
diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseTestMapper.xml b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseTestMapper.xml
index 5dd803d3b2..e8bb08b7ff 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseTestMapper.xml
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseTestMapper.xml
@@ -223,6 +223,11 @@
             #{caseId}
             </foreach>
         </if>
+        <if test="!isRepeat">
+            AND api_test_case.id not in (
+            select api_case_id from test_plan_api_case where test_plan_id = #{testPlanId}
+            )
+        </if>
     </select>
 
 
@@ -243,6 +248,11 @@
                 #{caseId}
             </foreach>
         </if>
+        <if test="!isRepeat">
+            AND api_scenario.id not in (
+            select api_scenario_id from test_plan_api_scenario where test_plan_id = #{testPlanId}
+            )
+        </if>
     </select>
     <select id="selectApiAndScenarioIdsFromCaseIds"
             resultType="io.metersphere.functional.domain.FunctionalCaseTest">
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiCaseService.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiCaseService.java
index 57a2df6d5b..e416701e39 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiCaseService.java
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiCaseService.java
@@ -596,7 +596,7 @@ public class TestPlanApiCaseService extends TestPlanResourceService {
                     List<ApiTestCase> apiTestCaseList = new ArrayList<>();
                     //获取全选的模块数据
                     if (CollectionUtils.isNotEmpty(dto.getModuleIds())) {
-                        apiTestCaseList = extApiTestCaseMapper.getListBySelectModules(apiCase.getModules().getProjectId(), dto.getModuleIds(), testPlan.getId());
+                        apiTestCaseList = extApiTestCaseMapper.getListBySelectModules(isRepeat, apiCase.getModules().getProjectId(), dto.getModuleIds(), testPlan.getId());
                     }
 
                     if (CollectionUtils.isNotEmpty(dto.getSelectIds())) {
@@ -638,7 +638,7 @@ public class TestPlanApiCaseService extends TestPlanResourceService {
                     List<ApiTestCase> apiTestCaseList = new ArrayList<>();
                     //获取全选的模块数据
                     if (CollectionUtils.isNotEmpty(dto.getModuleIds())) {
-                        apiTestCaseList = extApiTestCaseMapper.getListBySelectModules(apiCase.getModules().getProjectId(), dto.getModuleIds(), testPlan.getId());
+                        apiTestCaseList = extApiTestCaseMapper.getListBySelectModules(isRepeat, apiCase.getModules().getProjectId(), dto.getModuleIds(), testPlan.getId());
                     }
 
                     if (CollectionUtils.isNotEmpty(dto.getSelectIds())) {
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiScenarioService.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiScenarioService.java
index 4603a9075b..2c0b24188d 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiScenarioService.java
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiScenarioService.java
@@ -207,7 +207,7 @@ public class TestPlanApiScenarioService extends TestPlanResourceService {
                     List<ApiScenario> scenarioList = new ArrayList<>();
                     //获取全选的模块数据
                     if (CollectionUtils.isNotEmpty(dto.getModuleIds())) {
-                        scenarioList = extApiScenarioMapper.getListBySelectModules(apiScenario.getModules().getProjectId(), dto.getModuleIds(), testPlan.getId());
+                        scenarioList = extApiScenarioMapper.getListBySelectModules(isRepeat, apiScenario.getModules().getProjectId(), dto.getModuleIds(), testPlan.getId());
                     }
 
                     if (CollectionUtils.isNotEmpty(dto.getSelectIds())) {
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanFunctionalCaseService.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanFunctionalCaseService.java
index aec95ca9d9..0d9954adf9 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanFunctionalCaseService.java
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanFunctionalCaseService.java
@@ -806,13 +806,13 @@ public class TestPlanFunctionalCaseService extends TestPlanResourceService {
             // 选择了全部模块
             List<FunctionalCase> functionalCaseList = extFunctionalCaseMapper.selectAllFunctionalCase(isRepeat, functional.getModules().getProjectId(), testPlan.getId());
             buildTestPlanFunctionalCaseDTO(functional, functionalCaseList, testPlan, user, testPlanFunctionalCaseList);
-            handleSyncCase(functionalCaseList, functional, testPlan, user);
+            handleSyncCase(isRepeat, functionalCaseList, functional, testPlan, user);
         } else {
             AssociateCaseDTO dto = super.getCaseIds(moduleMaps);
             List<FunctionalCase> functionalCaseList = new ArrayList<>();
             //获取全选的模块数据
             if (CollectionUtils.isNotEmpty(dto.getModuleIds())) {
-                functionalCaseList = extFunctionalCaseMapper.getListBySelectModules(functional.getModules().getProjectId(), dto.getModuleIds(), testPlan.getId());
+                functionalCaseList = extFunctionalCaseMapper.getListBySelectModules(isRepeat, functional.getModules().getProjectId(), dto.getModuleIds(), testPlan.getId());
             }
 
             if (CollectionUtils.isNotEmpty(dto.getSelectIds())) {
@@ -831,7 +831,7 @@ public class TestPlanFunctionalCaseService extends TestPlanResourceService {
             if (CollectionUtils.isNotEmpty(functionalCaseList)) {
                 List<FunctionalCase> list = functionalCaseList.stream().sorted(Comparator.comparing(FunctionalCase::getPos).reversed()).toList();
                 buildTestPlanFunctionalCaseDTO(functional, list, testPlan, user, testPlanFunctionalCaseList);
-                handleSyncCase(functionalCaseList, functional, testPlan, user);
+                handleSyncCase(isRepeat, functionalCaseList, functional, testPlan, user);
             }
 
         }
@@ -841,30 +841,32 @@ public class TestPlanFunctionalCaseService extends TestPlanResourceService {
     /**
      * 处理同步添加功能用例关联的用例
      *
+     * @param isRepeat
      * @param functionalCaseList
      * @param functional
      * @param testPlan
      * @param user
      */
-    private void handleSyncCase(List<FunctionalCase> functionalCaseList, BaseCollectionAssociateRequest functional, TestPlan testPlan, SessionUser user) {
+    private void handleSyncCase(boolean isRepeat, List<FunctionalCase> functionalCaseList, BaseCollectionAssociateRequest functional, TestPlan testPlan, SessionUser user) {
         if (BooleanUtils.isTrue(functional.getModules().isSyncCase())) {
-            handleApiCaseData(functionalCaseList, functional, testPlan, user);
-            handleApiScenarioData(functionalCaseList, functional, testPlan, user);
+            handleApiCaseData(isRepeat, functionalCaseList, functional, testPlan, user);
+            handleApiScenarioData(isRepeat, functionalCaseList, functional, testPlan, user);
         }
     }
 
     /**
      * 处理场景用例数据
      *
+     * @param isRepeat
      * @param functionalCaseList
      * @param functional
      * @param testPlan
      * @param user
      */
-    private void handleApiScenarioData(List<FunctionalCase> functionalCaseList, BaseCollectionAssociateRequest functional, TestPlan testPlan, SessionUser user) {
+    private void handleApiScenarioData(boolean isRepeat, List<FunctionalCase> functionalCaseList, BaseCollectionAssociateRequest functional, TestPlan testPlan, SessionUser user) {
         if (StringUtils.isNotBlank(functional.getModules().getApiScenarioCollectionId()) && checkApiCollection(testPlan, functional.getModules().getApiScenarioCollectionId(), CaseType.SCENARIO_CASE.getKey())) {
             List<String> caseIds = functionalCaseList.stream().map(FunctionalCase::getId).toList();
-            List<ApiScenario> scenarioList = extFunctionalCaseTestMapper.selectApiScenarioByCaseIds(caseIds);
+            List<ApiScenario> scenarioList = extFunctionalCaseTestMapper.selectApiScenarioByCaseIds(isRepeat, caseIds, testPlan.getId());
             List<TestPlanApiScenario> testPlanApiScenarioList = new ArrayList<>();
             testPlanApiScenarioService.buildTestPlanApiScenarioDTO(functional.getModules().getApiScenarioCollectionId(), scenarioList, testPlan, user, testPlanApiScenarioList);
             if (CollectionUtils.isNotEmpty(testPlanApiScenarioList)) {
@@ -881,10 +883,10 @@ public class TestPlanFunctionalCaseService extends TestPlanResourceService {
      * @param testPlan
      * @param user
      */
-    private void handleApiCaseData(List<FunctionalCase> functionalCaseList, BaseCollectionAssociateRequest functional, TestPlan testPlan, SessionUser user) {
+    private void handleApiCaseData(boolean isRepeat, List<FunctionalCase> functionalCaseList, BaseCollectionAssociateRequest functional, TestPlan testPlan, SessionUser user) {
         if (StringUtils.isNotBlank(functional.getModules().getApiCaseCollectionId()) && checkApiCollection(testPlan, functional.getModules().getApiCaseCollectionId(), CaseType.API_CASE.getKey())) {
             List<String> caseIds = functionalCaseList.stream().map(FunctionalCase::getId).toList();
-            List<ApiTestCase> apiTestCaseList = extFunctionalCaseTestMapper.selectApiCaseByCaseIds(caseIds);
+            List<ApiTestCase> apiTestCaseList = extFunctionalCaseTestMapper.selectApiCaseByCaseIds(isRepeat, caseIds, testPlan.getId());
             List<TestPlanApiCase> testPlanApiCaseList = new ArrayList<>();
             testPlanApiCaseService.buildTestPlanApiCaseDTO(functional.getModules().getApiCaseCollectionId(), apiTestCaseList, testPlan, user, testPlanApiCaseList);
             if (CollectionUtils.isNotEmpty(testPlanApiCaseList)) {