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

fix(测试计划): 优化测试计划状态筛选逻辑

This commit is contained in:
Jianguo-Genius 2024-12-13 14:15:38 +08:00 committed by 刘瑞斌
parent 8fdeee6855
commit 87583d3943
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanApiCaseMapper.xml
View File

@ -913,12 +913,13 @@
END AS execResult, END AS execResult,
test_plan.group_id AS testPlanGroupId test_plan.group_id AS testPlanGroupId
from test_plan_api_case resource from test_plan_api_case resource
INNER JOIN api_test_case apiCase ON resource.api_case_id = apiCase.id
INNER JOIN test_plan ON test_plan.id = resource.test_plan_id INNER JOIN test_plan ON test_plan.id = resource.test_plan_id
where test_plan.id IN where resource.test_plan_id IN
<foreach collection="testPlanIds" item="testPlanId" separator="," open="(" close=")"> <foreach collection="testPlanIds" item="testPlanId" separator="," open="(" close=")">
#{testPlanId} #{testPlanId}
</foreach> </foreach>
AND test_plan.status != 'ARCHIVED' AND apiCase.deleted IS FALSE
</select> </select>
<select id="selectLastExecResultByTestPlanIds" <select id="selectLastExecResultByTestPlanIds"

5
backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanApiScenarioMapper.xml
View File

@ -639,12 +639,13 @@
END AS execResult, END AS execResult,
test_plan.group_id AS testPlanGroupId test_plan.group_id AS testPlanGroupId
from test_plan_api_scenario resource from test_plan_api_scenario resource
INNER JOIN api_scenario scenario ON resource.api_scenario_id = scenario.id
INNER JOIN test_plan ON test_plan.id = resource.test_plan_id INNER JOIN test_plan ON test_plan.id = resource.test_plan_id
where test_plan.id IN where resource.test_plan_id IN
<foreach collection="testPlanIds" item="testPlanId" separator="," open="(" close=")"> <foreach collection="testPlanIds" item="testPlanId" separator="," open="(" close=")">
#{testPlanId} #{testPlanId}
</foreach> </foreach>
AND test_plan.status != 'ARCHIVED' AND scenario.deleted IS FALSE
</select> </select>
<select id="getBatchRunInfoByIds" resultType="io.metersphere.plan.dto.TestPlanApiScenarioBatchRunDTO"> <select id="getBatchRunInfoByIds" resultType="io.metersphere.plan.dto.TestPlanApiScenarioBatchRunDTO">

6
backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanFunctionalCaseMapper.xml
View File

@ -730,13 +730,13 @@
END AS execResult, END AS execResult,
test_plan.group_id AS testPlanGroupId test_plan.group_id AS testPlanGroupId
from test_plan_functional_case resource from test_plan_functional_case resource
INNER JOIN functional_case funcCase ON resource.functional_case_id = funcCase.id
INNER JOIN test_plan ON test_plan.id = resource.test_plan_id INNER JOIN test_plan ON test_plan.id = resource.test_plan_id
where test_plan.id IN where resource.test_plan_id IN
<foreach collection="testPlanIds" item="testPlanId" separator="," open="(" close=")"> <foreach collection="testPlanIds" item="testPlanId" separator="," open="(" close=")">
#{testPlanId} #{testPlanId}
</foreach> </foreach>
AND test_plan.status != 'ARCHIVED' AND funcCase.deleted IS FALSE
</select> </select>
<select id="selectIdsByProjectIdsOrCollectionIds" resultType="java.lang.String"> <select id="selectIdsByProjectIdsOrCollectionIds" resultType="java.lang.String">