fix(接口定义): 修复回收站高级搜索执行结果失败的缺陷 (#17469)

--bug=1016224 --user=王孝刚 【接口测试】接口定义,回收站,case列表,搜索执行结果是未执行的case,搜索结果是空的
https://www.tapd.cn/55049933/s/1234082

Co-authored-by: wxg0103 <727495428@qq.com>
This commit is contained in:
MeterSphere Bot 2022-08-26 13:41:27 +08:00 committed by GitHub
parent 8a738b350f
commit 4f9f8f1c86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions

View File

@ -114,12 +114,21 @@
<foreach collection="${object}.value" item="v" separator="," open="(" close=")"> <foreach collection="${object}.value" item="v" separator="," open="(" close=")">
#{v} #{v}
</foreach> </foreach>
<if test="${object}.value.contains(''.toString())">
or t3.status is null
</if>
<if test="${condition}.exec_result != null">
)
</if>
</when> </when>
<when test='${object}.operator == "not in"'> <when test='${object}.operator == "not in"'>
not in not in
<foreach collection="${object}.value" item="v" separator="," open="(" close=")"> <foreach collection="${object}.value" item="v" separator="," open="(" close=")">
#{v} #{v}
</foreach> </foreach>
<if test="${condition}.exec_result != null">
)
</if>
</when> </when>
<when test='${object}.operator == "between"'> <when test='${object}.operator == "between"'>
between #{${object}.value[0]} and #{${object}.value[1]} between #{${object}.value[0]} and #{${object}.value[1]}
@ -223,6 +232,13 @@
<property name="object" value="${condition}.status"/> <property name="object" value="${condition}.status"/>
</include> </include>
</if> </if>
<if test="${condition}.exec_result != null">
and (t3.status
<include refid="condition">
<property name="object" value="${condition}.exec_result"/>
</include>
</if>
</sql> </sql>
<sql id="countCombine"> <sql id="countCombine">

View File

@ -211,7 +211,7 @@ export const API_STATUS_TRASH = {
// 用例执行结果 // 用例执行结果
export const API_CASE_RESULT = { export const API_CASE_RESULT = {
key: "status", key: "exec_result",
name: 'MsTableSearchSelect', name: 'MsTableSearchSelect',
label: 'test_track.plan_view.execute_result', label: 'test_track.plan_view.execute_result',
operator: { operator: {