From 1dc14534e6a3ec7f377427f20acf7f6eccb855ad Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Thu, 19 Sep 2024 16:27:19 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):?=
 =?UTF-8?q?=20=E7=BC=BA=E9=99=B7=E5=88=97=E8=A1=A8=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AEID=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/plan/dto/TestPlanBugCaseDTO.java    | 2 ++
 .../io/metersphere/plan/mapper/ExtTestPlanBugMapper.xml     | 6 +++---
 .../plan/mapper/ExtTestPlanReportApiCaseMapper.xml          | 5 +++--
 .../plan/mapper/ExtTestPlanReportApiScenarioMapper.xml      | 5 +++--
 .../plan/mapper/ExtTestPlanReportFunctionalCaseMapper.xml   | 3 ++-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/TestPlanBugCaseDTO.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/TestPlanBugCaseDTO.java
index 50cde15260..a8b9186a02 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/TestPlanBugCaseDTO.java
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/TestPlanBugCaseDTO.java
@@ -18,4 +18,6 @@ public class TestPlanBugCaseDTO {
 	private String bugId;
 	@Schema(description = "用例名称")
 	private String name;
+	@Schema(description = "项目ID")
+	private String projectId;
 }
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanBugMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanBugMapper.xml
index 3cc16a5b6a..64ee80da77 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanBugMapper.xml
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanBugMapper.xml
@@ -42,7 +42,7 @@
 
 
     <select id="getBugRelatedCase" resultType="io.metersphere.plan.dto.TestPlanBugCaseDTO">
-        select brc.case_id as id, fc.num as num, 'FUNCTIONAL' as type, brc.bug_id as bugId, fc.name as name
+        select brc.case_id as id, fc.num as num, 'FUNCTIONAL' as type, brc.bug_id as bugId, fc.name as name, fc.project_id as projectId
             from bug_relation_case brc
             join functional_case fc on brc.case_id = fc.id
         where brc.test_plan_id = #{planId}
@@ -51,7 +51,7 @@
             #{id}
         </foreach>
         union all
-        select brc.case_id as id, atc.num as num, 'API' as type, brc.bug_id as bugId, atc.name as name
+        select brc.case_id as id, atc.num as num, 'API' as type, brc.bug_id as bugId, atc.name as name, atc.project_id as projectId
             from bug_relation_case brc
             join api_test_case atc on brc.case_id = atc.id
         where brc.test_plan_id = #{planId}
@@ -60,7 +60,7 @@
             #{id}
         </foreach>
         union all
-        select brc.case_id as id, asi.num as num, 'SCENARIO' as type, brc.bug_id as bugId, asi.name as name
+        select brc.case_id as id, asi.num as num, 'SCENARIO' as type, brc.bug_id as bugId, asi.name as name, asi.project_id as projectId
             from bug_relation_case brc
             join api_scenario asi on brc.case_id = asi.id
         where brc.test_plan_id = #{planId}
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportApiCaseMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportApiCaseMapper.xml
index 241750c8d6..d167c01c8f 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportApiCaseMapper.xml
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportApiCaseMapper.xml
@@ -10,7 +10,7 @@
     <select id="getPlanExecuteCases" resultType="io.metersphere.plan.domain.TestPlanReportApiCase">
         select  tpac.id as testPlanApiCaseId, atc.id as apiCaseId, atc.num as apiCaseNum, atc.name as apiCaseName, atc.priority as apiCasePriority,
                 tpac.test_plan_collection_id testPlanCollectionId, tpac.environment_id as environmentId,
-                if(ad.module_id = 'root','未规划用例', ad.module_id) as apiCaseModule, tpac.execute_user as apiCaseExecuteUser,
+                if(ad.module_id = 'root','未规划接口', ad.module_id) as apiCaseModule, tpac.execute_user as apiCaseExecuteUser,
                 ifnull(tpac.last_exec_result, 'PENDING') as apiCaseExecuteResult, tpac.last_exec_report_id apiCaseExecuteReportId, tpac.pos as pos
         from test_plan_api_case tpac join api_test_case atc on atc.id = tpac.api_case_id
         left join api_definition ad on atc.api_definition_id = ad.id
@@ -40,7 +40,8 @@
         where tprac.test_plan_report_id = #{request.reportId}
         <if test="request.keyword != null and request.keyword != ''">
             and (tprac.api_case_num like concat('%', #{request.keyword}, '%')
-            or tprac.api_case_name like concat('%', #{request.keyword}, '%'))
+            or tprac.api_case_name like concat('%', #{request.keyword}, '%')
+            or tprac.api_case_module like concat('%', #{request.keyword}, '%'))
         </if>
         <if test="request.collectionId != null and request.collectionId != ''">
             and tprac.test_plan_collection_id = #{request.collectionId}
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportApiScenarioMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportApiScenarioMapper.xml
index 321df54f35..d7ecb2fafb 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportApiScenarioMapper.xml
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportApiScenarioMapper.xml
@@ -10,7 +10,7 @@
     <select id="getPlanExecuteCases" resultType="io.metersphere.plan.domain.TestPlanReportApiScenario">
         select  tpas.id as testPlanApiScenarioId, aso.id as apiScenarioId, aso.num as apiScenarioNum, aso.name as apiScenarioName, aso.priority as apiScenarioPriority,
                 tpas.test_plan_collection_id testPlanCollectionId, tpas.grouped as grouped, tpas.environment_id environmentId,
-                if(aso.module_id = 'root','未规划用例', aso.module_id) as apiScenarioModule, tpas.execute_user as apiScenarioExecuteUser,
+                if(aso.module_id = 'root','未规划场景', aso.module_id) as apiScenarioModule, tpas.execute_user as apiScenarioExecuteUser,
                 ifnull(tpas.last_exec_result, 'PENDING') as apiScenarioExecuteResult, tpas.last_exec_report_id apiScenarioExecuteReportId, tpas.pos as pos
         from test_plan_api_scenario tpas join api_scenario aso on aso.id = tpas.api_scenario_id
         left join api_scenario_module asm on aso.module_id = asm.id
@@ -39,7 +39,8 @@
         where tpras.test_plan_report_id = #{request.reportId}
         <if test="request.keyword != null and request.keyword != ''">
             and (tpras.api_scenario_num like concat('%', #{request.keyword}, '%')
-            or tpras.api_scenario_name like concat('%', #{request.keyword}, '%'))
+            or tpras.api_scenario_name like concat('%', #{request.keyword}, '%')
+            or tpras.api_scenario_module like concat('%', #{request.keyword}, '%'))
         </if>
         <if test="request.collectionId != null and request.collectionId != ''">
             and tpras.test_plan_collection_id = #{request.collectionId}
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportFunctionalCaseMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportFunctionalCaseMapper.xml
index 780f94657a..db01a96097 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportFunctionalCaseMapper.xml
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportFunctionalCaseMapper.xml
@@ -60,7 +60,8 @@
         where tprfc.test_plan_report_id = #{request.reportId}
         <if test="request.keyword != null and request.keyword != ''">
             and (tprfc.function_case_num like concat('%', #{request.keyword}, '%')
-            or tprfc.function_case_name like concat('%', #{request.keyword}, '%'))
+            or tprfc.function_case_name like concat('%', #{request.keyword}, '%')
+            or tprfc.function_case_module like concat('%', #{request.keyword}, '%'))
         </if>
         <if test="request.collectionId != null and request.collectionId != ''">
             and tprfc.test_plan_collection_id = #{request.collectionId}