From e8a8ff5ef0ceb9e8712bb9a2349d6931fc09555d Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Wed, 13 Mar 2024 14:23:44 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=BC=BA=E9=99=B7=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E7=94=A8=E4=BE=8B=E9=83=A8=E5=88=86BUG?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1036911 --user=宋昌昌 【缺陷管理】缺陷详情-用例-关联用例-搜索框搜索应该支持ID、名称、标签搜索 https://www.tapd.cn/55049933/s/1473917
---
 .../io/metersphere/bug/dto/response/BugRelateCaseDTO.java     | 3 +++
 .../java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml | 2 +-
 .../metersphere/functional/mapper/ExtFunctionalCaseMapper.xml | 4 +++-
 frontend/src/views/bug-management/components/bugCaseTab.vue   | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/backend/services/bug-management/src/main/java/io/metersphere/bug/dto/response/BugRelateCaseDTO.java b/backend/services/bug-management/src/main/java/io/metersphere/bug/dto/response/BugRelateCaseDTO.java
index 11602eb075..6d0bd44577 100644
--- a/backend/services/bug-management/src/main/java/io/metersphere/bug/dto/response/BugRelateCaseDTO.java
+++ b/backend/services/bug-management/src/main/java/io/metersphere/bug/dto/response/BugRelateCaseDTO.java
@@ -12,6 +12,9 @@ public class BugRelateCaseDTO{
     @Schema(description = "关联用例ID")
     private String relateCaseId;
 
+    @Schema(description = "关联用例业务ID")
+    private String relateCaseNum;
+
     @Schema(description = "关联用例名称")
     private String relateCaseName;
 
diff --git a/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml b/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml
index a8fc824aa0..1eaeb7d107 100644
--- a/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml
+++ b/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml
@@ -44,7 +44,7 @@
     </select>
 
     <select id="list" resultType="io.metersphere.bug.dto.response.BugRelateCaseDTO">
-        select brc.id relateId, fc.num relateCaseId, fc.name relateCaseName, fc.project_id projectId, fc.version_id versionId, brc.case_type relateCaseType,
+        select brc.id relateId, fc.id relateCaseId, fc.num relateCaseNum, fc.name relateCaseName, fc.project_id projectId, fc.version_id versionId, brc.case_type relateCaseType,
                brc.test_plan_id is not null relatePlanCase, brc.case_id is not null relateCase
         from bug_relation_case brc join functional_case fc on (brc.case_id = fc.id or brc.test_plan_case_id = fc.id)
         where brc.bug_id = #{request.bugId} and fc.deleted = false
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 4d766a8848..a6abdd1e04 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
@@ -748,7 +748,9 @@
         <!-- 待补充关联Case弹窗中的高级搜索条件 -->
         <if test="request.keyword != null and request.keyword != ''">
             and (
-            fc.num like concat('%', #{request.keyword}, '%') or fc.name like concat('%', #{request.keyword}, '%')
+                fc.num like concat('%', #{request.keyword}, '%')
+                or fc.name like concat('%', #{request.keyword}, '%')
+                or fc.tags like concat('%', #{request.keyword}, '%')
             )
         </if>
         <if test="request.moduleIds != null and request.moduleIds.size() > 0">
diff --git a/frontend/src/views/bug-management/components/bugCaseTab.vue b/frontend/src/views/bug-management/components/bugCaseTab.vue
index 668fd8c80b..837db6fca5 100644
--- a/frontend/src/views/bug-management/components/bugCaseTab.vue
+++ b/frontend/src/views/bug-management/components/bugCaseTab.vue
@@ -4,7 +4,7 @@
       <a-button type="primary" @click="handleSelect">{{ t('caseManagement.featureCase.linkCase') }}</a-button>
       <a-input-search
         v-model:model-value="keyword"
-        :placeholder="t('caseManagement.featureCase.searchByIdAndName')"
+        :placeholder="t('caseManagement.featureCase.searchByNameAndId')"
         allow-clear
         class="mx-[8px] w-[240px]"
         @search="searchCase"