diff --git a/backend/src/main/java/io/metersphere/api/dto/QueryAPIReportRequest.java b/backend/src/main/java/io/metersphere/api/dto/QueryAPIReportRequest.java index 6ebfbf5220..b5c3e69d15 100644 --- a/backend/src/main/java/io/metersphere/api/dto/QueryAPIReportRequest.java +++ b/backend/src/main/java/io/metersphere/api/dto/QueryAPIReportRequest.java @@ -18,4 +18,5 @@ public class QueryAPIReportRequest { private boolean recent = false; private List orders; private Map> filters; + private Map combine; } diff --git a/backend/src/main/java/io/metersphere/api/dto/QueryAPITestRequest.java b/backend/src/main/java/io/metersphere/api/dto/QueryAPITestRequest.java index 9c7daa2fdb..65fb9be3dd 100644 --- a/backend/src/main/java/io/metersphere/api/dto/QueryAPITestRequest.java +++ b/backend/src/main/java/io/metersphere/api/dto/QueryAPITestRequest.java @@ -18,5 +18,5 @@ public class QueryAPITestRequest { private boolean recent = false; private List orders; private Map> filters; - + private Map combine; } diff --git a/backend/src/main/java/io/metersphere/api/service/APITestService.java b/backend/src/main/java/io/metersphere/api/service/APITestService.java index 33b9af99cd..0474519ac0 100644 --- a/backend/src/main/java/io/metersphere/api/service/APITestService.java +++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java @@ -33,11 +33,9 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; + import java.io.*; -import java.util.List; -import java.util.Objects; -import java.util.Random; -import java.util.UUID; +import java.util.*; import java.util.stream.Collectors; @Service @@ -189,7 +187,7 @@ public class APITestService { ApiTestExample example = new ApiTestExample(); example.createCriteria().andNameEqualTo(request.getName()).andProjectIdEqualTo(request.getProjectId()).andIdNotEqualTo(request.getId()); if (apiTestMapper.countByExample(example) > 0) { - return true; + return true; } return false; } @@ -292,7 +290,7 @@ public class APITestService { } private SaveAPITestRequest getImportApiTest(MultipartFile file, ApiImport apiImport) { - SaveAPITestRequest request = new SaveAPITestRequest(); + SaveAPITestRequest request = new SaveAPITestRequest(); request.setName(file.getOriginalFilename()); request.setProjectId(""); request.setScenarioDefinition(apiImport.getScenarios()); @@ -304,7 +302,8 @@ public class APITestService { if (name.endsWith(suffix)) { request.setName(name.substring(0, name.length() - suffix.length())); } - }; + } + ; if (isNameExist(request)) { request.setName(request.getName() + "_" + request.getId().substring(0, 5)); } diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestMapper.xml index 4458cdd58d..ff36804523 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestMapper.xml @@ -8,15 +8,109 @@ + + + + like CONCAT('%', #{${object}.value},'%') + + + not like CONCAT('%', #{${object}.value},'%') + + + in + + #{v} + + + + not in + + #{v} + + + + between #{${object}.value[0]} and #{${object}.value[1]} + + + > #{${object}.value} + + + < #{${object}.value} + + + >= #{${object}.value} + + + <= #{${object}.value} + + + = '${@io.metersphere.commons.utils.SessionUtils@getUserId()}' + + + = #{${object}.value} + + + + + + + and api_test.name + + + + + + and api_test.update_time + + + + + + and project.name + + + + + + and api_test.create_time + + + + + + and api_test.status + + + + + + and api_test.user_id + + + + + + SELECT t.name AS test_name, r.name, r.description, r.id, r.test_id, r.create_time, r.update_time, r.status, r.trigger_mode, @@ -17,9 +66,20 @@ LEFT JOIN project ON project.id = t.project_id LEFT JOIN user ON user.id = r.user_id - - AND r.name like CONCAT('%', #{request.name},'%') - + + + + + + + + + + + and r.name like CONCAT('%', #{request.name},'%') + + + AND project.id = #{request.projectId} diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml index 083c5e2c7c..b212edf625 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml @@ -8,15 +8,69 @@ + + + + + + + and load_test.name + + + + + + and load_test.update_time + + + + + + and project.name + + + + + + and load_test.create_time + + + + + + and load_test.status + + + + + + and load_test.user_id + + + + + + select ltr.id, ltr.name, ltr.test_id as testId, ltr.description, user.name as userName, project.name as projectName, ltr.trigger_mode, @@ -26,9 +75,20 @@ JOIN project on project.id = lt.project_id - - AND ltr.name like CONCAT('%', #{reportRequest.name},'%') - + + + + + + + + + + + AND ltr.name like CONCAT('%', #{reportRequest.name},'%') + + + AND workspace_id = #{reportRequest.workspaceId,jdbcType=VARCHAR} 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 fe7b7dceb7..7928286245 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 @@ -2,13 +2,120 @@ + + + + like CONCAT('%', #{${object}.value},'%') + + + not like CONCAT('%', #{${object}.value},'%') + + + in + + #{v} + + + + not in + + #{v} + + + + between #{${object}.value[0]} and #{${object}.value[1]} + + + > #{${object}.value} + + + < #{${object}.value} + + + >= #{${object}.value} + + + <= #{${object}.value} + + + = '${@io.metersphere.commons.utils.SessionUtils@getUserId()}' + + + = #{${object}.value} + + + + + + + and test_case.name + + + + + + and test_case.node_path + + + + + + and test_case.priority + + + + + + and test_case.create_time + + + + + + and test_case.type + + + + + + and test_case.update_time + + + + + + and test_case.method + + + + + + and test_case.maintainer + + + + + + +