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

fix(工作台): 待办测试计划列表排除关联的回收站用例 

--bug=1027178 --user=宋昌昌 [我的工作台]我的待办-测试计划待办统计错误 https://www.tapd.cn/55049933/s/1383354
This commit is contained in:
song-cc-rock 2023-06-19 18:12:08 +08:00
parent 0c888e3c3a
commit d36ed6ad9c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
View File

@ -159,6 +159,7 @@
<if test="request.executorOrPrincipal != null">
LEFT JOIN test_plan_principal ON test_plan_principal.test_plan_id = test_plan.id
LEFT JOIN test_plan_test_case on test_plan_test_case.plan_id = test_plan.id
LEFT JOIN test_case on test_case.id = test_plan_test_case.case_id
</if>
<where>
<if test="request.combine != null">
@ -202,7 +203,7 @@
<when test="key=='status'">
<choose>
<when test="request.executorOrPrincipal != null">
AND (( test_plan_principal.principal_id =
and (( test_plan_principal.principal_id =
'${@io.metersphere.commons.utils.SessionUtils@getUserId()}' and
test_plan.status in
<include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.filterInWrapper"/>
@ -214,6 +215,7 @@
<include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.filterInWrapper"/>
))
and (test_plan.status is null or test_plan.status != 'Trash')
and (test_case.status is null or test_case.status != 'Trash')
</when>
<otherwise>
and test_plan.status in
@ -416,6 +418,7 @@
<if test="request.executorOrPrincipal != null">
LEFT JOIN test_plan_principal ON test_plan_principal.test_plan_id = test_plan.id
LEFT JOIN test_plan_test_case on test_plan_test_case.plan_id = test_plan.id
LEFT JOIN test_case on test_case.id = test_plan_test_case.case_id
</if>
<where>
<if test="request.combine != null">

4
workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
View File

@ -219,6 +219,7 @@
select COUNT(DISTINCT(test_plan.id)) from test_plan
left join test_plan_principal ON test_plan_principal.test_plan_id = test_plan.id
left join test_plan_test_case on test_plan_test_case.plan_id = test_plan.id
left join test_case on test_case.id = test_plan_test_case.case_id
where
test_plan.project_id in
<foreach collection="projectIds" item="projectId" separator="," open="(" close=")">
@ -233,6 +234,7 @@
and
test_plan_test_case.status in ('Prepare','Underway')
))
and (test_plan.status is null or test_plan.status != 'Trash');
and (test_plan.status is null or test_plan.status != 'Trash')
and (test_case.status is null or test_case.status != 'Trash');
</select>
</mapper>