test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(用例管理): 用例评审高级筛选调试

This commit is contained in:
guoyuqi 2024-11-04 18:04:20 +08:00 committed by Craftsman
parent a955e34981
commit b2f262628a
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@
<include refid="filters"> <include refid="filters">
<property name="filter" value="request.condition.filter"/> <property name="filter" value="request.condition.filter"/>
</include> </include>
<if test="request.condition.combine != null"> <if test="request.condition.combineSearch != null">
<include refid="combine"> <include refid="combine">
<property name="combineSearch" value="request.condition.combineSearch"/> <property name="combineSearch" value="request.condition.combineSearch"/>
</include> </include>
@ -195,24 +195,30 @@
<property name="column" value="case_review.create_user"/> <property name="column" value="case_review.create_user"/>
</include> </include>
</if> </if>
<if test="condition.name == 'reviewers'"> <if test="condition.name == 'follower'">
<include refid="io.metersphere.system.mapper.BaseMapper.associationCondition"> <include refid="io.metersphere.system.mapper.BaseMapper.associationCondition">
<property name="mainIdColumn" value="case_review.id"/> <property name="mainIdColumn" value="case_review.id"/>
<property name="associationTable" value="case_review_functional_case_user"/> <property name="associationTable" value="case_review_follower"/>
<property name="associationIdColumn" value="review_id"/> <property name="associationIdColumn" value="review_id"/>
<property name="searchColumn" value="user_id"/> <property name="searchColumn" value="user_id"/>
<property name="condition" value="condition"/> <property name="condition" value="condition"/>
</include> </include>
</if> </if>
<include refid="io.metersphere.system.mapper.BaseMapper.queryType">
<property name="searchMode" value="${combineSearch}.searchMode"/>
</include>
</foreach> </foreach>
<foreach collection="${combineSearch}.systemFieldConditions" item="condition"> <foreach collection="${combineSearch}.systemFieldConditions" item="condition">
<include refid="io.metersphere.system.mapper.BaseMapper.commonSystemFieldConditions"> <include refid="io.metersphere.system.mapper.BaseMapper.commonSystemFieldConditions">
<property name="condition" value="condition"/> <property name="condition" value="condition"/>
<property name="tablePrefix" value="case_review"/> <property name="tablePrefix" value="case_review"/>
</include> </include>
<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_user"/>
<property name="associationIdColumn" value="review_id"/>
<property name="searchColumn" value="user_id"/>
<property name="condition" value="condition"/>
</include>
</if>
<if test="condition.name == 'status'"> <if test="condition.name == 'status'">
<include refid="io.metersphere.system.mapper.BaseMapper.condition"> <include refid="io.metersphere.system.mapper.BaseMapper.condition">
<property name="condition" value="condition"/> <property name="condition" value="condition"/>
@ -249,9 +255,12 @@
<property name="column" value="case_review.pass_rate"/> <property name="column" value="case_review.pass_rate"/>
</include> </include>
</if> </if>
<include refid="io.metersphere.system.mapper.BaseMapper.queryType"> <if test="condition.name == 'description'">
<property name="searchMode" value="${combineSearch}.searchMode"/> <include refid="io.metersphere.system.mapper.BaseMapper.condition">
</include> <property name="condition" value="condition"/>
<property name="column" value="case_review.description"/>
</include>
</if>
</foreach> </foreach>
</if> </if>
</trim> </trim>

7
backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewControllerTests.java
View File

@ -8,6 +8,7 @@ import io.metersphere.functional.mapper.*;
import io.metersphere.functional.request.*; import io.metersphere.functional.request.*;
import io.metersphere.functional.result.CaseManagementResultCode; import io.metersphere.functional.result.CaseManagementResultCode;
import io.metersphere.sdk.constants.SessionConstants; import io.metersphere.sdk.constants.SessionConstants;
import io.metersphere.sdk.dto.CombineSearch;
import io.metersphere.sdk.util.JSON; import io.metersphere.sdk.util.JSON;
import io.metersphere.system.base.BaseTest; import io.metersphere.system.base.BaseTest;
import io.metersphere.system.controller.handler.ResultHolder; import io.metersphere.system.controller.handler.ResultHolder;
@ -408,7 +409,11 @@ public class CaseReviewControllerTests extends BaseTest {
Map<String, List<String>> filters = new HashMap<>(); Map<String, List<String>> filters = new HashMap<>();
filters.put("status", Arrays.asList("PREPARED", "UNDERWAY", "COMPLETED", "ARCHIVED")); filters.put("status", Arrays.asList("PREPARED", "UNDERWAY", "COMPLETED", "ARCHIVED"));
request.setFilter(filters); request.setFilter(filters);
request.setCombine(caseReviewCombine); CombineSearch combineSearch = new CombineSearch();
combineSearch.setSearchMode("AND");
combineSearch.setConditions(new ArrayList<>());
request.setCombineSearch(combineSearch);
request.setViewId("my_follow");
request.setProjectId(projectId); request.setProjectId(projectId);
request.setKeyword("评审更新"); request.setKeyword("评审更新");
request.setReviewByMe("admin"); request.setReviewByMe("admin");