diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewMapper.xml b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewMapper.xml index 108ced7124..3fa461e03d 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewMapper.xml +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewMapper.xml @@ -116,6 +116,7 @@ and ( case_review.name like concat('%', #{request.keyword},'%') or case_review.num like concat('%', #{request.keyword},'%') + or case_review.tags like concat('%', #{request.keyword},'%') ) diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml index 489c5088b6..8f6291bb8c 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml @@ -669,6 +669,17 @@ WHERE deleted = #{deleted} AND project_id = #{request.projectId} + + AND functional_case.id not in ( + select case_id from case_review_functional_case where review_id = #{request.reviewId} + ) + + + AND functional_case.id not in + + #{excludeId} + + diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/preAndPostCaseDrawer.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/preAndPostCaseDrawer.vue index 7fd549afd8..52e19387d9 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/preAndPostCaseDrawer.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDependency/preAndPostCaseDrawer.vue @@ -374,21 +374,6 @@ } } - async function getModulesCount() { - try { - const emitTableParams: CaseModuleQueryParams = { - keyword: keyword.value, - moduleIds: [], - projectId: currentProjectId.value, - current: propsRes.value.msPagination?.current, - pageSize: propsRes.value.msPagination?.pageSize, - }; - modulesCount.value = await getCaseModulesCounts(emitTableParams); - } catch (error) { - console.log(error); - } - } - const searchParams = ref({ projectId: currentProjectId.value, moduleIds: [], @@ -418,6 +403,23 @@ }); } + async function getModulesCount() { + const { excludeIds } = searchParams.value; + try { + const emitTableParams: CaseModuleQueryParams = { + keyword: keyword.value, + moduleIds: [], + projectId: currentProjectId.value, + current: propsRes.value.msPagination?.current, + pageSize: propsRes.value.msPagination?.pageSize, + excludeIds, + }; + modulesCount.value = await getCaseModulesCounts(emitTableParams); + } catch (error) { + console.log(error); + } + } + const setFocusKey = (node: MsTreeNodeData) => { focusNodeKey.value = node.id || ''; }; diff --git a/frontend/src/views/case-management/caseReview/components/index/reviewTable.vue b/frontend/src/views/case-management/caseReview/components/index/reviewTable.vue index d1132f53c1..6e29f13723 100644 --- a/frontend/src/views/case-management/caseReview/components/index/reviewTable.vue +++ b/frontend/src/views/case-management/caseReview/components/index/reviewTable.vue @@ -5,7 +5,7 @@ v-model:keyword="keyword" :filter-config-list="filterConfigList" :row-count="filterRowCount" - :search-placeholder="t('caseManagement.caseReview.searchPlaceholder')" + :search-placeholder="t('caseManagement.caseReview.list.searchPlaceholder')" @keyword-search="(val, filter) => searchReview(filter)" @adv-search="searchReview" @refresh="searchReview" diff --git a/frontend/src/views/case-management/caseReview/locale/en-US.ts b/frontend/src/views/case-management/caseReview/locale/en-US.ts index b008fbfb26..4085c7a7db 100644 --- a/frontend/src/views/case-management/caseReview/locale/en-US.ts +++ b/frontend/src/views/case-management/caseReview/locale/en-US.ts @@ -3,6 +3,7 @@ export default { 'caseManagement.caseReview.waitMyReview': 'I reviewed', 'caseManagement.caseReview.myCreate': 'I created', 'caseManagement.caseReview.searchPlaceholder': 'Search by ID or name', + 'caseManagement.caseReview.list.searchPlaceholder': 'Search by ID, name, or tag', 'caseManagement.caseReview.archive': 'Archive', 'caseManagement.caseReview.tableNoData': 'No data yet, please', 'caseManagement.caseReview.name': 'Review name', diff --git a/frontend/src/views/case-management/caseReview/locale/zh-CN.ts b/frontend/src/views/case-management/caseReview/locale/zh-CN.ts index da1d3db9c7..78854fabed 100644 --- a/frontend/src/views/case-management/caseReview/locale/zh-CN.ts +++ b/frontend/src/views/case-management/caseReview/locale/zh-CN.ts @@ -3,6 +3,7 @@ export default { 'caseManagement.caseReview.waitMyReview': '我评审的', 'caseManagement.caseReview.myCreate': '我创建的', 'caseManagement.caseReview.searchPlaceholder': '通过 ID 或名称搜索', + 'caseManagement.caseReview.list.searchPlaceholder': '通过ID、名称或标签搜索', 'caseManagement.caseReview.archive': '归档', 'caseManagement.caseReview.tableNoData': '暂无数据,请', 'caseManagement.caseReview.name': '评审名称',