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:
song-tianyang 2022-09-22 15:15:45 +08:00 committed by 建国
parent 6a12064421
commit 3a29a3c71c
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/api/controller/APITestController.java
View File

@ -234,7 +234,7 @@ public class APITestController {
for (ExecuteResultCountDTO execResult : apiCaseExecResultList) { for (ExecuteResultCountDTO execResult : apiCaseExecResultList) {
if (StringUtils.isEmpty(execResult.getExecResult())) { if (StringUtils.isEmpty(execResult.getExecResult())) {
unexecuteCount += execResult.getCount(); unexecuteCount += execResult.getCount();
} else if (StringUtils.equalsAnyIgnoreCase(execResult.getExecResult(), "Underway", ExecuteResult.TEST_PLAN_PREPARE.toString())) { } else if (StringUtils.equalsAnyIgnoreCase(execResult.getExecResult(), "Underway", ExecuteResult.STOP.toString(), ExecuteResult.TEST_PLAN_PREPARE.toString())) {
unexecuteCount += execResult.getCount(); unexecuteCount += execResult.getCount();
} else if (StringUtils.equalsIgnoreCase(execResult.getExecResult(), ExecuteResult.API_SUCCESS.toString())) { } else if (StringUtils.equalsIgnoreCase(execResult.getExecResult(), ExecuteResult.API_SUCCESS.toString())) {
executionPassCount += execResult.getCount(); executionPassCount += execResult.getCount();

23
backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
View File

@ -446,19 +446,19 @@
</foreach> </foreach>
</if> </if>
<if test="request.redirectFilter == 'unexecuteCount' "> <if test="request.redirectFilter == 'unexecuteCount' ">
and (t1.status IS NULL or t1.status = '' or t1.status = 'Prepare' or t1.status = 'Underway') and (t3.status IS NULL or t3.status = '' or t3.status = 'Prepare' or t3.status = 'Underway' or t3.status = 'stop')
</if> </if>
<if test="request.redirectFilter == 'executionPassCount' "> <if test="request.redirectFilter == 'executionPassCount' ">
and t1.status = 'success' and t3.status = 'success'
</if> </if>
<if test="request.redirectFilter == 'executionFailedCount' "> <if test="request.redirectFilter == 'executionFailedCount' ">
and t1.status = 'error' and t3.status = 'error'
</if> </if>
<if test="request.redirectFilter == 'fakeErrorCount' "> <if test="request.redirectFilter == 'fakeErrorCount' ">
and t1.status = 'errorReportResult' and t3.status = 'errorReportResult'
</if> </if>
<if test="request.redirectFilter == 'notSuccessCount' "> <if test="request.redirectFilter == 'notSuccessCount' ">
and t1.status IN ('error','errorReportResult') and t3.status IN ('error','errorReportResult')
</if> </if>
<if test="request.filters != null and request.filters.size() > 0"> <if test="request.filters != null and request.filters.size() > 0">
<foreach collection="request.filters.entrySet()" index="key" item="values"> <foreach collection="request.filters.entrySet()" index="key" item="values">
@ -982,15 +982,16 @@
<select id="selectExecuteResultByProjectId" <select id="selectExecuteResultByProjectId"
resultType="io.metersphere.api.dto.datacount.response.ExecuteResultCountDTO"> resultType="io.metersphere.api.dto.datacount.response.ExecuteResultCountDTO">
SELECT status AS execResult, count(id) AS `count` SELECT t3.status AS execResult, count(t1.id) AS `count`
FROM api_test_case FROM api_test_case t1
WHERE project_id = #{0} LEFT JOIN api_definition_exec_result t3 ON t1.last_result_id = t3.id
AND (`status` IS NULL OR `status` != 'Trash') WHERE t1.project_id = #{0}
AND api_definition_id IN (SELECT id AND (t1.`status` IS NULL OR t1.`status` != 'Trash')
AND t1.api_definition_id IN (SELECT id
FROM api_definition FROM api_definition
WHERE project_id = #{0} WHERE project_id = #{0}
AND latest = 1) AND latest = 1)
GROUP BY `status` GROUP BY t3.`status`
</select> </select>
<select id="caseList" resultType="io.metersphere.base.domain.ApiTestCaseWithBLOBs"> <select id="caseList" resultType="io.metersphere.base.domain.ApiTestCaseWithBLOBs">
SELECT SELECT