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

refactor(测试计划): 优化计划详情用例列表分页查询

This commit is contained in:
song-cc-rock 2024-09-05 14:50:13 +08:00 committed by Craftsman
parent dd6a088a92
commit 40b46536ea
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanApiCaseController.java
View File

@ -74,7 +74,7 @@ public class TestPlanApiCaseController {
public Pager<List<TestPlanApiCasePageResponse>> page(@Validated @RequestBody TestPlanApiCaseRequest request) { public Pager<List<TestPlanApiCasePageResponse>> page(@Validated @RequestBody TestPlanApiCaseRequest request) {
Page<Object> page = PageHelper.startPage(request.getCurrent(), request.getPageSize(), Page<Object> page = PageHelper.startPage(request.getCurrent(), request.getPageSize(),
StringUtils.isNotBlank(request.getSortString("id")) ? request.getSortString("id") : "t.pos desc"); StringUtils.isNotBlank(request.getSortString("id")) ? request.getSortString("id") : "t.pos desc");
return PageUtils.setPageInfo(page, testPlanApiCaseService.hasRelateApiCaseList(request, false)); return PageUtils.setPageInfo(page, testPlanApiCaseService.hasRelateApiCaseList(request, false, SessionUtils.getCurrentProjectId()));
} }

2
backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanApiScenarioController.java
View File

@ -63,7 +63,7 @@ public class TestPlanApiScenarioController {
public Pager<List<TestPlanApiScenarioPageResponse>> page(@Validated @RequestBody TestPlanApiScenarioRequest request) { public Pager<List<TestPlanApiScenarioPageResponse>> page(@Validated @RequestBody TestPlanApiScenarioRequest request) {
Page<Object> page = PageHelper.startPage(request.getCurrent(), request.getPageSize(), Page<Object> page = PageHelper.startPage(request.getCurrent(), request.getPageSize(),
StringUtils.isNotBlank(request.getSortString("id")) ? request.getSortString("id") : "test_plan_api_scenario.pos desc"); StringUtils.isNotBlank(request.getSortString("id")) ? request.getSortString("id") : "test_plan_api_scenario.pos desc");
return PageUtils.setPageInfo(page, testPlanApiScenarioService.hasRelateApiScenarioList(request, false)); return PageUtils.setPageInfo(page, testPlanApiScenarioService.hasRelateApiScenarioList(request, false, SessionUtils.getCurrentProjectId()));
} }
@PostMapping("/module/count") @PostMapping("/module/count")

4
backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiCaseService.java
View File

@ -244,13 +244,13 @@ public class TestPlanApiCaseService extends TestPlanResourceService {
* @param deleted * @param deleted
* @return * @return
*/ */
public List<TestPlanApiCasePageResponse> hasRelateApiCaseList(TestPlanApiCaseRequest request, boolean deleted) { public List<TestPlanApiCasePageResponse> hasRelateApiCaseList(TestPlanApiCaseRequest request, boolean deleted, String currentProjectId) {
filterCaseRequest(request); filterCaseRequest(request);
if (CollectionUtils.isEmpty(request.getProtocols())) { if (CollectionUtils.isEmpty(request.getProtocols())) {
return new ArrayList<>(); return new ArrayList<>();
} }
List<TestPlanApiCasePageResponse> list = extTestPlanApiCaseMapper.relateApiCaseList(request, deleted); List<TestPlanApiCasePageResponse> list = extTestPlanApiCaseMapper.relateApiCaseList(request, deleted);
buildApiCaseResponse(list, request.getTestPlanId(), request.getProjectId()); buildApiCaseResponse(list, request.getTestPlanId(), currentProjectId);
return list; return list;
} }

4
backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiScenarioService.java
View File

@ -386,10 +386,10 @@ public class TestPlanApiScenarioService extends TestPlanResourceService {
* @param deleted * @param deleted
* @return * @return
*/ */
public List<TestPlanApiScenarioPageResponse> hasRelateApiScenarioList(TestPlanApiScenarioRequest request, boolean deleted) { public List<TestPlanApiScenarioPageResponse> hasRelateApiScenarioList(TestPlanApiScenarioRequest request, boolean deleted, String currentProjectId) {
filterCaseRequest(request); filterCaseRequest(request);
List<TestPlanApiScenarioPageResponse> list = extTestPlanApiScenarioMapper.relateApiScenarioList(request, deleted); List<TestPlanApiScenarioPageResponse> list = extTestPlanApiScenarioMapper.relateApiScenarioList(request, deleted);
buildApiScenarioResponse(list, request.getTestPlanId(), request.getProjectId()); buildApiScenarioResponse(list, request.getTestPlanId(), currentProjectId);
return list; return list;
} }