From c3a605e99f28728c65a13d0be6fb59c3c8ee84ac Mon Sep 17 00:00:00 2001
From: WangXu10 <xu.wang@fit2cloud.com>
Date: Sun, 4 Feb 2024 13:59:37 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E7=94=A8=E4=BE=8B=E7=AE=A1=E7=90=86):?=
 =?UTF-8?q?=20=E7=94=A8=E4=BE=8B=E8=AF=84=E5=AE=A1=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExtCaseReviewFunctionalCaseMapper.xml     | 50 +++++++-------
 .../mapper/ExtFunctionalCaseMapper.xml        | 66 ++++++-------------
 .../request/BaseReviewCaseBatchRequest.java   |  4 ++
 .../service/FunctionalCaseModuleService.java  |  4 ++
 .../service/FunctionalCaseService.java        |  4 ++
 5 files changed, 57 insertions(+), 71 deletions(-)

diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewFunctionalCaseMapper.xml b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewFunctionalCaseMapper.xml
index 860e8b7931..a16ce0b74f 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewFunctionalCaseMapper.xml
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewFunctionalCaseMapper.xml
@@ -71,7 +71,7 @@
                 #{moduleId}
             </foreach>
         </if>
-        <if test="request.keyword != null">
+        <if test="request.keyword != null and request.keyword != ''">
             and (
             functional_case.name like concat('%', #{request.keyword},'%')
             or functional_case.num like concat('%', #{request.keyword},'%')
@@ -306,16 +306,7 @@
         <if test="userId != null and userId != ''">
             AND crfc.case_id in (select case_id from case_review_functional_case_user crfcu where crfcu.review_id = #{request.reviewId} and crfcu.user_id = #{userId})
         </if>
-        <choose>
-            <when test='request.condition.searchMode == "AND"'>
-                AND <include refid="queryWhereConditionByBaseQueryRequest"/>
-            </when>
-            <when test='request.condition.searchMode == "OR"'>
-                and (
-                <include refid="queryWhereConditionByBaseQueryRequest"/>
-                )
-            </when>
-        </choose>
+        <include refid="queryWhereConditionByBaseQueryRequest"/>
     </select>
 
     <select id="getListByRequest" resultType="io.metersphere.functional.domain.CaseReviewFunctionalCase">
@@ -330,16 +321,7 @@
         <if test="userId != null and userId != ''">
             AND crfc.case_id in (select case_id from case_review_functional_case_user crfcu where crfcu.review_id = #{request.reviewId} and crfcu.user_id = #{userId})
         </if>
-        <choose>
-            <when test='request.condition.searchMode == "AND"'>
-                AND <include refid="queryWhereConditionByBaseQueryRequest"/>
-            </when>
-            <when test='request.condition.searchMode == "OR"'>
-                and (
-                <include refid="queryWhereConditionByBaseQueryRequest"/>
-                )
-            </when>
-        </choose>
+        <include refid="queryWhereConditionByBaseQueryRequest"/>
         <if test="request.excludeIds != null and request.excludeIds.size() > 0" >
             and crfc.id not in
             <foreach collection="request.excludeIds" item="excludeId" open="(" separator="," close=")">
@@ -350,20 +332,35 @@
 
 
     <sql id="queryWhereConditionByBaseQueryRequest">
+        <if test="request.moduleIds != null and request.moduleIds.size() > 0">
+            and functional_case.module_id in
+            <foreach collection="request.moduleIds" item="moduleId" separator="," open="(" close=")">
+                #{moduleId}
+            </foreach>
+        </if>
         <if test="request.condition.keyword != null">
-            (
+            and (
             functional_case.name like concat('%', #{request.keyword},'%')
             or functional_case.num like concat('%', #{request.keyword},'%')
             or JSON_CONTAINS(tags, concat('["',#{request.keyword},'"]'))
             )
-            <include refid="queryType">
-                <property name="searchMode" value="request.condition.searchMode"/>
-            </include>
         </if>
         <include refid="filters">
             <property name="filter" value="request.condition.filter"/>
-            <property name="searchMode" value="request.condition.searchMode"/>
         </include>
+        <choose>
+            <when test='request.condition.searchMode == "AND"'>
+                AND <include refid="baseQueryCombine"/>
+            </when>
+            <when test='request.condition.searchMode == "OR"'>
+                and (
+                <include refid="baseQueryCombine"/>
+                )
+            </when>
+        </choose>
+    </sql>
+
+    <sql id="baseQueryCombine">
         <if test="request.condition.combine != null">
             <include refid="combine">
                 <property name="condition" value="request.condition.combine"/>
@@ -373,6 +370,7 @@
         1=1
     </sql>
 
+
     <select id="getPos" resultType="java.lang.Long">
         SELECT
             pos
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 cd4fb24c8a..a08fb77935 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
@@ -356,28 +356,6 @@
         </if>
     </sql>
 
-    <sql id="queryVersionConditionByBaseQueryRequest">
-        <if test="request.versionId != null">
-            ${versionTable}.version_id = #{request.versionId}
-            <include refid="queryType">
-                <property name="searchMode" value="request.condition.searchMode"/>
-            </include>
-        </if>
-        <if test="request.refId != null">
-            ${versionTable}.ref_id = #{request.refId}
-            <include refid="queryType">
-                <property name="searchMode" value="request.condition.searchMode"/>
-            </include>
-        </if>
-        <if test="request.versionId == null and request.refId == null">
-            ${versionTable}.latest = 1
-            <include refid="queryType">
-                <property name="searchMode" value="request.condition.searchMode"/>
-            </include>
-        </if>
-        1 = 1
-    </sql>
-
     <sql id="queryVersionCondition">
         <if test="request.versionId != null">
             and ${versionTable}.version_id = #{request.versionId}
@@ -513,51 +491,49 @@
         WHERE
             functional_case.project_id = #{projectId}
             and functional_case.deleted = #{deleted}
-        <choose>
-            <when test='request.condition.searchMode == "AND"'>
-                AND <include refid="queryWhereConditionByBaseQueryRequest"/>
-            </when>
-            <when test='request.condition.searchMode == "OR"'>
-                and (
-                <include refid="queryWhereConditionByBaseQueryRequest"/>
-                )
-            </when>
-        </choose>
+        <include refid="queryWhereConditionByBaseQueryRequest"/>
     </select>
 
     <sql id="queryWhereConditionByBaseQueryRequest">
         <if test="request.moduleIds != null and request.moduleIds.size() > 0">
-            functional_case.module_id in
+            and functional_case.module_id in
             <foreach collection="request.moduleIds" item="moduleId" separator="," open="(" close=")">
                 #{moduleId}
             </foreach>
-            <include refid="queryType">
-                <property name="searchMode" value="request.condition.searchMode"/>
-            </include>
         </if>
-        <if test="request.condition.keyword != null">
-            (
+        <if test="request.condition.keyword != null and request.condition.keyword != ''">
+            and (
             functional_case.name like concat('%', #{request.keyword},'%')
             or functional_case.num like concat('%', #{request.keyword},'%')
             or JSON_CONTAINS(tags, concat('["',#{request.keyword},'"]'))
             )
-            <include refid="queryType">
-                <property name="searchMode" value="request.condition.searchMode"/>
-            </include>
         </if>
         <include refid="filters">
             <property name="filter" value="request.condition.filter"/>
-            <property name="searchMode" value="request.condition.searchMode"/>
         </include>
+        <choose>
+            <when test='request.condition.searchMode == "AND"'>
+                AND <include refid="baseQueryCombine"/>
+            </when>
+            <when test='request.condition.searchMode == "OR"'>
+                and (
+                <include refid="baseQueryCombine"/>
+                )
+            </when>
+        </choose>
+        <include refid="queryVersionCondition">
+            <property name="versionTable" value="functional_case"/>
+        </include>
+    </sql>
+
+    <sql id="baseQueryCombine">
         <if test="request.condition.combine != null">
             <include refid="combine">
                 <property name="condition" value="request.condition.combine"/>
                 <property name="searchMode" value="request.condition.searchMode"/>
             </include>
         </if>
-        <include refid="queryVersionConditionByBaseQueryRequest">
-            <property name="versionTable" value="functional_case"/>
-        </include>
+        1=1
     </sql>
 
     <select id="getRefIds" resultType="java.lang.String">
diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/request/BaseReviewCaseBatchRequest.java b/backend/services/case-management/src/main/java/io/metersphere/functional/request/BaseReviewCaseBatchRequest.java
index e306cab02e..4d85d43d76 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/request/BaseReviewCaseBatchRequest.java
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/request/BaseReviewCaseBatchRequest.java
@@ -7,6 +7,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author wx
@@ -24,4 +25,7 @@ public class BaseReviewCaseBatchRequest extends TableBatchProcessDTO implements
 
     @Schema(description = "userId用来判断是否只看我的")
     private String userId;
+
+    @Schema(description = "模块id")
+    private List<String> moduleIds;
 }
diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseModuleService.java b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseModuleService.java
index ad3a55460e..96a8001238 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseModuleService.java
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseModuleService.java
@@ -405,4 +405,8 @@ public class FunctionalCaseModuleService extends ModuleTreeService {
         return this.add(request, userId);
     }
 
+
+    public FunctionalCaseModule getModule(String id) {
+        return functionalCaseModuleMapper.selectByPrimaryKey(id);
+    }
 }
\ No newline at end of file
diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseService.java b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseService.java
index 222f6f1e7d..a38a0e6409 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseService.java
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseService.java
@@ -276,6 +276,10 @@ public class FunctionalCaseService {
             functionalCaseDetailDTO.setVersionName(versions.get(0).getName());
         }
 
+        //模块名称
+        FunctionalCaseModule module = functionalCaseModuleService.getModule(functionalCaseDetailDTO.getModuleId());
+        functionalCaseDetailDTO.setModuleName(module.getName());
+
         //处理已关联需求数量/缺陷数量/用例数量
         handleCount(functionalCaseDetailDTO);