diff --git a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml index 53d853454c..9332c81246 100644 --- a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml +++ b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml @@ -213,9 +213,13 @@ and (test_case.name like CONCAT('%', #{request.name},'%') - or test_case.num like CONCAT('%', #{request.name},'%') - or test_case.tags like CONCAT('%', #{request.name},'%') - or test_case.custom_num like CONCAT('%', #{request.name},'%')) + + or test_case.custom_num like CONCAT('%', #{request.name},'%') + + + or test_case.num like CONCAT('%', #{request.name},'%') + + or test_case.tags like CONCAT('%', #{request.name},'%')) AND test_case.project_id = #{request.projectId} diff --git a/test-track/backend/src/main/java/io/metersphere/controller/TestCaseController.java b/test-track/backend/src/main/java/io/metersphere/controller/TestCaseController.java index a3c3b8060c..de92cabbb7 100644 --- a/test-track/backend/src/main/java/io/metersphere/controller/TestCaseController.java +++ b/test-track/backend/src/main/java/io/metersphere/controller/TestCaseController.java @@ -26,6 +26,9 @@ import io.metersphere.service.FileService; import io.metersphere.service.TestCaseService; import io.metersphere.service.wapper.CheckPermissionService; import io.metersphere.xpack.track.dto.EditTestCaseRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -35,9 +38,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.List; @@ -142,6 +142,7 @@ public class TestCaseController { @PostMapping("/relate/{goPage}/{pageSize}") @RequiresPermissions(PermissionConstants.PROJECT_TRACK_CASE_READ) public Pager> getTestCaseRelateList(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryTestCaseRequest request) { + testCaseService.setRequestCustomNumParam(request); return testCaseService.getTestCaseRelateList(request, goPage, pageSize); } @@ -181,6 +182,7 @@ public class TestCaseController { @PostMapping("/reviews/case/{goPage}/{pageSize}") @RequiresPermissions(PermissionConstants.PROJECT_TRACK_CASE_READ) public Pager> getReviewCase(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryTestCaseRequest request) { + testCaseService.setRequestCustomNumParam(request); Page page = PageHelper.startPage(goPage, pageSize, true); return PageUtils.setPageInfo(page, testCaseService.getReviewCase(request)); } diff --git a/test-track/backend/src/main/java/io/metersphere/request/testcase/QueryTestCaseRequest.java b/test-track/backend/src/main/java/io/metersphere/request/testcase/QueryTestCaseRequest.java index 04279ac5f5..a2cf0bbfb9 100644 --- a/test-track/backend/src/main/java/io/metersphere/request/testcase/QueryTestCaseRequest.java +++ b/test-track/backend/src/main/java/io/metersphere/request/testcase/QueryTestCaseRequest.java @@ -73,4 +73,9 @@ public class QueryTestCaseRequest extends BaseQueryRequest { * 是否待办状态 */ private boolean unComing; + + /** + * 是否开启了用例自定义ID选项 + */ + private boolean customNum; } diff --git a/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java b/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java index e2c5adc50c..80dac82317 100644 --- a/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java +++ b/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java @@ -3508,6 +3508,14 @@ public class TestCaseService { } } + public void setRequestCustomNumParam(QueryTestCaseRequest request) { + Project project = baseProjectService.getProjectById(request.getProjectId()); + if (project != null) { + ProjectConfig config = baseProjectApplicationService.getSpecificTypeValue(project.getId(), ProjectApplicationType.CASE_CUSTOM_NUM.name()); + request.setCustomNum(config.getCaseCustomNum()); + } + } + /** * 是否包含超级管理员用户组(当前登录用户) * diff --git a/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalRelevance.vue b/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalRelevance.vue index 41fece933c..d7d1d1e136 100644 --- a/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalRelevance.vue +++ b/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalRelevance.vue @@ -21,7 +21,7 @@ ref="nodeTree"/> - + diff --git a/test-track/frontend/src/business/review/view/components/TestReviewRelevance.vue b/test-track/frontend/src/business/review/view/components/TestReviewRelevance.vue index a3eccb42a1..2bae4596c2 100644 --- a/test-track/frontend/src/business/review/view/components/TestReviewRelevance.vue +++ b/test-track/frontend/src/business/review/view/components/TestReviewRelevance.vue @@ -42,10 +42,10 @@ :tree-nodes="treeNodes" ref="nodeTree"/> - + -