From 18fe38f87779fb9e2767074495745c431e6d8a43 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Wed, 23 Oct 2024 17:00:43 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=98=8E=E7=BB=86=E5=88=97=E8=A1=A8=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=82=B9=E9=A1=BA=E5=BA=8F=E4=B8=8D=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1046956 --user=宋昌昌 【测试计划】报告-报告详情-用例/接口/场景明细-开启测试点-顺序显示与测试规划内不一致 https://www.tapd.cn/55049933/s/1596639
---
 .../dto/response/TestPlanReportDetailCollectionResponse.java    | 2 ++
 .../metersphere/plan/mapper/ExtTestPlanReportApiCaseMapper.xml  | 2 +-
 .../plan/mapper/ExtTestPlanReportApiScenarioMapper.xml          | 2 +-
 .../plan/mapper/ExtTestPlanReportFunctionalCaseMapper.xml       | 2 +-
 .../java/io/metersphere/plan/service/TestPlanReportService.java | 1 +
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/response/TestPlanReportDetailCollectionResponse.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/response/TestPlanReportDetailCollectionResponse.java
index 9cc71b11ca..cc788a3dba 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/response/TestPlanReportDetailCollectionResponse.java
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/response/TestPlanReportDetailCollectionResponse.java
@@ -14,4 +14,6 @@ public class TestPlanReportDetailCollectionResponse {
 	private Long count;
 	@Schema(description = "计划名称")
 	private String planName;
+	@Schema(description = "位置")
+	private Long pos;
 }
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 bd5877d44f..03fefbcdb4 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
@@ -50,7 +50,7 @@
     </select>
 
     <select id="listCollection" resultType="io.metersphere.plan.dto.response.TestPlanReportDetailCollectionResponse">
-        select tpc.id as id, tpc.name as name, tp.name as planName, count(tprac.id) as count
+        select tpc.id as id, tpc.name as name, tp.name as planName, tpc.pos as pos, count(tprac.id) as count
         from test_plan_report_api_case tprac
                  right join test_plan_collection tpc on tprac.test_plan_collection_id = tpc.id and tpc.type = 'API'
                  join test_plan tp on tpc.test_plan_id = tp.id
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 95be1133d2..8c77564435 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
@@ -49,7 +49,7 @@
     </select>
 
     <select id="listCollection" resultType="io.metersphere.plan.dto.response.TestPlanReportDetailCollectionResponse">
-        select tpc.id as id, tpc.name as name, tp.name as planName, count(tpras.id) as count
+        select tpc.id as id, tpc.name as name, tp.name as planName, tpc.pos as pos, count(tpras.id) as count
         from test_plan_report_api_scenario tpras
                  right join test_plan_collection tpc on tpras.test_plan_collection_id = tpc.id and tpc.type = 'SCENARIO'
                  join test_plan tp on tpc.test_plan_id = tp.id
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 8ff9ed1b44..94bbbe83f9 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
@@ -70,7 +70,7 @@
     </select>
 
     <select id="listCollection" resultType="io.metersphere.plan.dto.response.TestPlanReportDetailCollectionResponse">
-        select tpc.id as id, tpc.name as name, tp.name as planName, count(tprfc.id) as count
+        select tpc.id as id, tpc.name as name, tp.name as planName, tpc.pos as pos, count(tprfc.id) as count
         from test_plan_report_function_case tprfc
             right join test_plan_collection tpc on tprfc.test_plan_collection_id = tpc.id and tpc.type = 'FUNCTIONAL'
             join test_plan tp on tpc.test_plan_id = tp.id
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanReportService.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanReportService.java
index 88546864fd..a35f76fc06 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanReportService.java
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanReportService.java
@@ -1290,6 +1290,7 @@ public class TestPlanReportService {
 			case CollectionQueryType.SCENARIO -> collections = extTestPlanReportApiScenarioMapper.listCollection(request);
 			default -> collections = new ArrayList<>();
 		}
+		collections.sort(Comparator.comparing(TestPlanReportDetailCollectionResponse::getPos));
 		return collections;
 	}