diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java index 6c3461bf73..9661a711db 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java @@ -16,7 +16,7 @@ public interface ExtTestCaseMapper { List listByMethod(@Param("request") QueryTestCaseRequest request); - List listBytestCaseIds(@Param("request") TestCaseBatchRequest request); + List listByTestCaseIds(@Param("request") TestCaseBatchRequest request); TestCase getMaxNumByProjectId(@Param("projectId") String projectId); diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml index 44122dedce..70795a96ed 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml @@ -128,10 +128,20 @@ - and test_case.${key} in - - #{value} - + + + and test_case.priority in + + #{value} + + + + and test_case.type in + + #{value} + + + @@ -214,7 +224,7 @@ - select test_case.*,api_test.name as apiName,load_test.name AS performName from test_case left join api_test on test_case.test_id=api_test.id left join load_test on test_case.test_id=load_test.id diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml index ad66df821d..4b4d261199 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml @@ -95,7 +95,8 @@ - select test_plan.*, project.name as project_name from test_plan left join project on test_plan.project_id = project.id @@ -126,10 +127,21 @@ - and ${key} in - - #{value} - + + + + and test_plan.stage in + + #{value} + + + + and test_plan.status in + + #{value} + + + @@ -149,7 +161,7 @@ where test_plan.workspace_id = #{request.workspaceId} and (test_plan.principal = #{request.principal} - or test_plan.id in + or test_plan.id in #{planId} diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml index d502c3aa90..f64215b927 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml @@ -157,10 +157,26 @@ - and ${key} in - - #{value} - + + + and test_case.priority in + + #{value} + + + + and test_case.type in + + #{value} + + + + and test_case.method in + + #{value} + + + diff --git a/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java index bf4862583d..1bf4427b6d 100644 --- a/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java +++ b/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java @@ -44,7 +44,7 @@ public class TestCaseController { return testCaseService.listTestCase(request); } - /*项目下自动测试*/ + @GetMapping("/list/method/{projectId}") public List listByMethod(@PathVariable String projectId) { QueryTestCaseRequest request = new QueryTestCaseRequest(); diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java index b801195197..7307ca7d52 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java @@ -353,7 +353,7 @@ public class TestCaseService { } private List generateTestCaseExcel(TestCaseBatchRequest request) { - List TestCaseList = extTestCaseMapper.listBytestCaseIds(request); + List TestCaseList = extTestCaseMapper.listByTestCaseIds(request); List list = new ArrayList<>(); SessionUser user = SessionUtils.getUser(); StringBuilder step = new StringBuilder("");