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

refactor(测试跟踪): 修复测试计划无法执行其余项目的测试计划的缺陷 

--bug=1011498 --user=宋天阳 【测试跟踪】-测试计划 点击执行时 ，性能测试没有执行
https://www.tapd.cn/55049933/s/1122643
This commit is contained in:
song-tianyang 2022-03-21 19:33:07 +08:00 committed by 刘瑞斌
parent c8d9429e02
commit d03a2b058a
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanApiCaseMapper.xml
View File

@ -306,7 +306,7 @@
and t.status = #{status} and t.status = #{status}
</if> </if>
and (c.status != 'Trash' or c.status is null) and (c.status != 'Trash' or c.status is null)
where t.test_plan_id = #{planId}; where t.test_plan_id = #{planId} ORDER BY t.order DESC
</select> </select>
<select id="getFailureListByIds" resultType="io.metersphere.api.dto.automation.TestPlanFailureApiDTO"> <select id="getFailureListByIds" resultType="io.metersphere.api.dto.automation.TestPlanFailureApiDTO">

2
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.xml
View File

@ -297,7 +297,7 @@
<if test="status != null"> <if test="status != null">
and tplc.status = 'error' and tplc.status = 'error'
</if> </if>
where tplc.test_plan_id = #{planId} where tplc.test_plan_id = #{planId} ORDER BY tplc.order DESC
</select> </select>
<select id="getCasesByIds" resultType="io.metersphere.track.dto.TestPlanLoadCaseDTO"> <select id="getCasesByIds" resultType="io.metersphere.track.dto.TestPlanLoadCaseDTO">

1
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanScenarioCaseMapper.xml
View File

@ -255,6 +255,7 @@
and t.last_result in ('Fail','Error') and t.last_result in ('Fail','Error')
</if> </if>
where t.test_plan_id = #{planId} where t.test_plan_id = #{planId}
ORDER BY t.order DESC
</select> </select>
<select id="getFailureListByIds" resultType="io.metersphere.api.dto.automation.TestPlanFailureScenarioDTO"> <select id="getFailureListByIds" resultType="io.metersphere.api.dto.automation.TestPlanFailureScenarioDTO">

1
backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
View File

@ -225,7 +225,6 @@ public class TestPlanReportService {
} }
LoadCaseRequest loadCaseRequest = new LoadCaseRequest(); LoadCaseRequest loadCaseRequest = new LoadCaseRequest();
loadCaseRequest.setTestPlanId(planId); loadCaseRequest.setTestPlanId(planId);
loadCaseRequest.setProjectId(projectID);
List<TestPlanLoadCaseDTO> testPlanLoadCaseDTOList = extTestPlanLoadCaseMapper.selectTestPlanLoadCaseList(loadCaseRequest); List<TestPlanLoadCaseDTO> testPlanLoadCaseDTOList = extTestPlanLoadCaseMapper.selectTestPlanLoadCaseList(loadCaseRequest);
for (TestPlanLoadCaseDTO dto : testPlanLoadCaseDTOList) { for (TestPlanLoadCaseDTO dto : testPlanLoadCaseDTOList) {
performanceIdMap.put(dto.getId(), dto.getLoadCaseId()); performanceIdMap.put(dto.getId(), dto.getLoadCaseId());

3
frontend/src/business/components/track/plan/view/comonents/report/detail/component/LoadFailureResult.vue
View File

@ -42,6 +42,9 @@
<el-tag size="mini" v-else-if="row.status === 'Completed'"> <el-tag size="mini" v-else-if="row.status === 'Completed'">
{{ row.status }} {{ row.status }}
</el-tag> </el-tag>
<el-tag size="mini" v-else-if="!row.status || row.status === '' ">
Prepare
</el-tag>
<el-tag size="mini" v-else> <el-tag size="mini" v-else>
{{ row.status }} {{ row.status }}
</el-tag> </el-tag>