From 173b6c9bfe419f6936c782b25bfd231a0fca9bf4 Mon Sep 17 00:00:00 2001 From: song-cc-rock Date: Mon, 18 Nov 2024 10:58:52 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=AF=BC=E5=87=BA=E6=B5=8B=E8=AF=95=E7=82=B9?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E9=A1=BA=E5=BA=8F=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1048370 --user=宋昌昌 【测试计划】开启功能/接口/场景用例测试点导出计划组报告-测试点顺序和报告不一致 https://www.tapd.cn/55049933/s/1610928 --- .../api/service/CleanupApiReportServiceImpl.java | 2 -- .../plan/controller/TestPlanReportController.java | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/CleanupApiReportServiceImpl.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/CleanupApiReportServiceImpl.java index 79a6865d71..fc5fd344ee 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/service/CleanupApiReportServiceImpl.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/CleanupApiReportServiceImpl.java @@ -42,8 +42,6 @@ public class CleanupApiReportServiceImpl implements BaseCleanUpReport { private ApiScenarioReportDetailBlobMapper apiScenarioReportDetailBlobMapper; @Resource private ApiReportRelateTaskMapper apiReportRelateTaskMapper; - @Resource - private ExtApiReportRelateTaskMapper extApiReportRelateTaskMapper; @Override public void cleanReport(Map map, String projectId) { diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanReportController.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanReportController.java index 128c6c1512..870540832c 100644 --- a/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanReportController.java +++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanReportController.java @@ -183,7 +183,7 @@ public class TestPlanReportController { // 不分页仅排序 {测试集升序, 用例位次倒序} page.setPageSize(0); page.setPageSizeZero(true); - page.setOrderBy("tpc.pos, tprfc.pos desc"); + page.setOrderBy("tpc.pos, tpc.name, tprfc.pos desc"); page.setOrderByOnly(true); } return PageUtils.setPageInfo(page, testPlanReportService.listReportDetailCases(request, AssociateCaseType.FUNCTIONAL)); @@ -207,7 +207,7 @@ public class TestPlanReportController { // 不分页仅排序 {测试集升序, 用例位次倒序} page.setPageSize(0); page.setPageSizeZero(true); - page.setOrderBy("tpc.pos, tprac.pos desc"); + page.setOrderBy("tpc.pos, tpc.name, tprac.pos desc"); page.setOrderByOnly(true); } return PageUtils.setPageInfo(page, testPlanReportService.listReportDetailCases(request, AssociateCaseType.API_CASE)); @@ -224,7 +224,7 @@ public class TestPlanReportController { // 不分页仅排序 {测试集升序, 用例位次倒序} page.setPageSize(0); page.setPageSizeZero(true); - page.setOrderBy("tpc.pos, tpras.pos desc"); + page.setOrderBy("tpc.pos, tpc.name, tpras.pos desc"); page.setOrderByOnly(true); } return PageUtils.setPageInfo(page, testPlanReportService.listReportDetailCases(request, AssociateCaseType.API_SCENARIO));