test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(测试计划): 报告导出测试点用例顺序不一致 

--bug=1048370 --user=宋昌昌 【测试计划】开启功能/接口/场景用例测试点导出计划组报告-测试点顺序和报告不一致 https://www.tapd.cn/55049933/s/1610928
This commit is contained in:
song-cc-rock 2024-11-18 10:58:52 +08:00 committed by Craftsman
parent fa013cfe97
commit 173b6c9bfe
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/services/api-test/src/main/java/io/metersphere/api/service/CleanupApiReportServiceImpl.java
View File

@ -42,8 +42,6 @@ public class CleanupApiReportServiceImpl implements BaseCleanUpReport {
private ApiScenarioReportDetailBlobMapper apiScenarioReportDetailBlobMapper; private ApiScenarioReportDetailBlobMapper apiScenarioReportDetailBlobMapper;
@Resource @Resource
private ApiReportRelateTaskMapper apiReportRelateTaskMapper; private ApiReportRelateTaskMapper apiReportRelateTaskMapper;
@Resource
private ExtApiReportRelateTaskMapper extApiReportRelateTaskMapper;
@Override @Override
public void cleanReport(Map<String, String> map, String projectId) { public void cleanReport(Map<String, String> map, String projectId) {

6
backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanReportController.java
View File

@ -183,7 +183,7 @@ public class TestPlanReportController {
// 不分页仅排序 {测试集升序, 用例位次倒序} // 不分页仅排序 {测试集升序, 用例位次倒序}
page.setPageSize(0); page.setPageSize(0);
page.setPageSizeZero(true); page.setPageSizeZero(true);
page.setOrderBy("tpc.pos, tprfc.pos desc"); page.setOrderBy("tpc.pos, tpc.name, tprfc.pos desc");
page.setOrderByOnly(true); page.setOrderByOnly(true);
} }
return PageUtils.setPageInfo(page, testPlanReportService.listReportDetailCases(request, AssociateCaseType.FUNCTIONAL)); return PageUtils.setPageInfo(page, testPlanReportService.listReportDetailCases(request, AssociateCaseType.FUNCTIONAL));
@ -207,7 +207,7 @@ public class TestPlanReportController {
// 不分页仅排序 {测试集升序, 用例位次倒序} // 不分页仅排序 {测试集升序, 用例位次倒序}
page.setPageSize(0); page.setPageSize(0);
page.setPageSizeZero(true); page.setPageSizeZero(true);
page.setOrderBy("tpc.pos, tprac.pos desc"); page.setOrderBy("tpc.pos, tpc.name, tprac.pos desc");
page.setOrderByOnly(true); page.setOrderByOnly(true);
} }
return PageUtils.setPageInfo(page, testPlanReportService.listReportDetailCases(request, AssociateCaseType.API_CASE)); return PageUtils.setPageInfo(page, testPlanReportService.listReportDetailCases(request, AssociateCaseType.API_CASE));
@ -224,7 +224,7 @@ public class TestPlanReportController {
// 不分页仅排序 {测试集升序, 用例位次倒序} // 不分页仅排序 {测试集升序, 用例位次倒序}
page.setPageSize(0); page.setPageSize(0);
page.setPageSizeZero(true); page.setPageSizeZero(true);
page.setOrderBy("tpc.pos, tpras.pos desc"); page.setOrderBy("tpc.pos, tpc.name, tpras.pos desc");
page.setOrderByOnly(true); page.setOrderByOnly(true);
} }
return PageUtils.setPageInfo(page, testPlanReportService.listReportDetailCases(request, AssociateCaseType.API_SCENARIO)); return PageUtils.setPageInfo(page, testPlanReportService.listReportDetailCases(request, AssociateCaseType.API_SCENARIO));