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

fix(接口定义): 修复case搜索执行结果失败的缺陷 

--bug=1021812 --user=王孝刚 【接口测试】接口case列表，按执行结果搜索，搜索结果错误
https://www.tapd.cn/55049933/s/1325964
This commit is contained in:
wxg0103 2023-01-11 13:49:22 +08:00 committed by wxg0103
parent 128ef19b77
commit 9f5f813533
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
View File

@ -230,7 +230,7 @@
</include> </include>
</if> </if>
<if test="${condition}.exec_result != null"> <if test="${condition}.exec_result != null">
and (t1.status and (t3.status
<choose> <choose>
<when test='${condition}.exec_result.operator == "in"'> <when test='${condition}.exec_result.operator == "in"'>
in in
@ -238,7 +238,7 @@
#{v} #{v}
</foreach> </foreach>
<if test="${condition}.exec_result.value.contains('') or ${condition}.exec_result.value.contains('PENDING')"> <if test="${condition}.exec_result.value.contains('') or ${condition}.exec_result.value.contains('PENDING')">
or t1.status is null or t1.status = '' or t3.status is null or t3.status = ''
</if> </if>
<if test="${condition}.exec_result != null"> <if test="${condition}.exec_result != null">
) )
@ -250,10 +250,10 @@
#{v} #{v}
</foreach> </foreach>
<if test="${condition}.exec_result != null and (${condition}.exec_result.value.contains('') or ${condition}.exec_result.value.contains('PENDING'))"> <if test="${condition}.exec_result != null and (${condition}.exec_result.value.contains('') or ${condition}.exec_result.value.contains('PENDING'))">
and t1.status is not null and t1.status != '' and t3.status is not null and t3.status != ''
</if> </if>
<if test="${condition}.exec_result != null and !${condition}.exec_result.value.contains('PENDING')"> <if test="${condition}.exec_result != null and !${condition}.exec_result.value.contains('PENDING')">
or t1.status is null or t1.status = '' or t3.status is null or t3.status = ''
</if> </if>
<if test="${condition}.exec_result != null"> <if test="${condition}.exec_result != null">
) )
@ -406,7 +406,7 @@
a.path, a.path,
a.protocol, a.protocol,
t1.tags, t1.tags,
t1.status AS execResult, t3.status AS execResult,
t1.last_result_id AS lastResultId, t1.last_result_id AS lastResultId,
project.NAME AS project_name, project.NAME AS project_name,
t1.delete_time, t1.delete_time,

1
api-test/backend/src/main/java/io/metersphere/service/TestResultService.java
View File

@ -253,6 +253,7 @@ public class TestResultService {
ApiTestCaseWithBLOBs apiTestCase = new ApiTestCaseWithBLOBs(); ApiTestCaseWithBLOBs apiTestCase = new ApiTestCaseWithBLOBs();
apiTestCase.setLastResultId(dto.getReportId()); apiTestCase.setLastResultId(dto.getReportId());
apiTestCase.setId(dto.getTestId()); apiTestCase.setId(dto.getTestId());
apiTestCase.setStatus(record.getStatus());
apiTestCaseService.updateByPrimaryKeySelective(apiTestCase); apiTestCaseService.updateByPrimaryKeySelective(apiTestCase);
} }