test/MeterSphere
1
0
Fork 0
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git synced 2024-12-03 12:39:12 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

feat(用例管理): 用例评审增加高级搜索

Browse Source
This commit is contained in:
guoyuqi 2024-09-25 18:49:12 +08:00 committed by Craftsman
parent 23e23d1392
commit 25c319b438
2 changed files with 92 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewMapper.java
View File

@ -5,6 +5,7 @@ import io.metersphere.functional.dto.CaseReviewDTO;
import io.metersphere.functional.request.CaseReviewBatchRequest;
import io.metersphere.functional.request.CaseReviewPageRequest;
import io.metersphere.project.dto.ModuleCountDTO;
import io.metersphere.system.interceptor.BaseConditionFilter;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -18,18 +19,22 @@ public interface ExtCaseReviewMapper {
Long getPos(@Param("projectId") String projectId);
@BaseConditionFilter
List<CaseReviewDTO> list(@Param("request") CaseReviewPageRequest request);
Long getPrePos(@Param("projectId") String projectId, @Param("basePos") Long basePos);
Long getLastPos(@Param("projectId") String projectId, @Param("basePos") Long basePos);
@BaseConditionFilter
List<String> getIds(@Param("request") CaseReviewBatchRequest request, @Param("projectId") String projectId);
void batchMoveModule(@Param("request") CaseReviewBatchRequest request, @Param("ids") List<String> ids, @Param("userId") String userId);
@BaseConditionFilter
List<ModuleCountDTO> countModuleIdByKeywordAndFileType(@Param("request") CaseReviewPageRequest request);
@BaseConditionFilter
long caseCount(@Param("request") CaseReviewPageRequest request);

112
backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewMapper.xml
View File

@ -79,19 +79,14 @@
<include refid="filters">
<property name="filter" value="request.condition.filter"/>
</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>
<if test="request.condition.combine != null">
<include refid="combine">
<property name="combineSearch" value="request.condition.combineSearch"/>
</include>
</if>
</sql>
<sql id="baseQueryCombine">
<!--<sql id="baseQueryCombine">
<if test="request.condition.combine != null">
<include refid="combine">
<property name="condition" value="request.condition.combine"/>
@ -102,7 +97,7 @@
</include>
</if>
1=1
</sql>
</sql>-->
<sql id="queryWhereCondition">
@ -131,19 +126,12 @@
<include refid="filters">
<property name="filter" value="request.filter"/>
</include>
<choose>
<when test='request.searchMode == "AND"'>
AND <include refid="queryCombine"/>
</when>
<when test='request.searchMode == "OR"'>
and (
<include refid="queryCombine"/>
)
</when>
</choose>
<include refid="combine">
<property name="combineSearch" value="request.combineSearch"/>
</include>
</sql>
<sql id="queryCombine">
<!--<sql id="queryCombine">
<include refid="combine">
<property name="condition" value="request.combine"/>
<property name="name" value="request.name"/>
@ -152,7 +140,7 @@
<property name="ObjectModuleIds" value="request.combine.moduleIds"/>
</include>
1=1
</sql>
</sql>-->
<sql id="queryType">
<choose>
@ -197,6 +185,80 @@
</sql>
<sql id="combine">
<trim prefix="AND">
<trim prefix="(" suffix=")" suffixOverrides="AND|OR">
<if test="${combineSearch} != null">
<foreach collection="${combineSearch}.userViewConditions" item="condition">
<if test="condition.name == 'createUser'">
<include refid="io.metersphere.system.mapper.BaseMapper.condition">
<property name="condition" value="condition"/>
<property name="column" value="case_review.create_user"/>
</include>
</if>
<if test="condition.name == 'reviewers'">
<include refid="io.metersphere.system.mapper.BaseMapper.associationCondition">
<property name="mainIdColumn" value="case_review.id"/>
<property name="associationTable" value="case_review_functional_case_user"/>
<property name="associationIdColumn" value="review_id"/>
<property name="searchColumn" value="user_id"/>
<property name="condition" value="condition"/>
</include>
</if>
<include refid="io.metersphere.system.mapper.BaseMapper.queryType">
<property name="searchMode" value="${combineSearch}.searchMode"/>
</include>
</foreach>
<foreach collection="${combineSearch}.systemFieldConditions" item="condition">
<include refid="io.metersphere.system.mapper.BaseMapper.commonSystemFieldConditions">
<property name="condition" value="condition"/>
<property name="tablePrefix" value="case_review"/>
</include>
<if test="condition.name == 'status'">
<include refid="io.metersphere.system.mapper.BaseMapper.condition">
<property name="condition" value="condition"/>
<property name="column" value="case_review.status"/>
</include>
</if>
<if test="condition.name == 'reviewPassRule'">
<include refid="io.metersphere.system.mapper.BaseMapper.condition">
<property name="condition" value="condition"/>
<property name="column" value="case_review.review_pass_rule"/>
</include>
</if>
<if test="condition.name == 'startTime'">
<include refid="io.metersphere.system.mapper.BaseMapper.condition">
<property name="condition" value="condition"/>
<property name="column" value="case_review.start_time"/>
</include>
</if>
<if test="condition.name == 'endTime'">
<include refid="io.metersphere.system.mapper.BaseMapper.condition">
<property name="condition" value="condition"/>
<property name="column" value="case_review.end_time"/>
</include>
</if>
<if test="condition.name == 'caseCount'">
<include refid="io.metersphere.system.mapper.BaseMapper.condition">
<property name="condition" value="condition"/>
<property name="column" value="case_review.case_count"/>
</include>
</if>
<if test="condition.name == 'passRate'">
<include refid="io.metersphere.system.mapper.BaseMapper.condition">
<property name="condition" value="condition"/>
<property name="column" value="case_review.pass_rate"/>
</include>
</if>
<include refid="io.metersphere.system.mapper.BaseMapper.queryType">
<property name="searchMode" value="${combineSearch}.searchMode"/>
</include>
</foreach>
</if>
</trim>
</trim>
</sql>
<!--<sql id="combine">
<if test="request.combine != null">
<if test='${condition}.name != null'>
case_review.name
@ -374,7 +436,7 @@
</include>
</if>
</if>
</sql>
</sql>-->
<sql id="condition">
<choose>