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

refactor(接口测试): 优化报告查询sql

This commit is contained in:
fit2-zhao 2022-03-07 14:58:06 +08:00 committed by fit2-zhao
parent f9fa51dd6e
commit 4a54da4b21
1 changed files with 65 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
View File

@ -139,20 +139,19 @@
<select id="list" resultMap="BaseResultMap"> <select id="list" resultMap="BaseResultMap">
select * from ( select * from (
select * from ( SELECT s_r.name AS test_name,
SELECT s_r.name AS test_name, s_r.end_time,
s_r.end_time, s_r.user_id,
s_r.user_id, s_r.name,
s_r.name, s_r.id,
s_r.id, s_r.project_id,
s_r.project_id, s_r.create_time,
s_r.create_time, s_r.update_time,
s_r.update_time, s_r.status,
s_r.status, s_r.trigger_mode,
s_r.trigger_mode, s_r.execute_type,
s_r.execute_type, s_r.report_type
s_r.report_type FROM api_scenario_report s_r
FROM api_scenario_report s_r
<where> <where>
<if test="request.combine != null"> <if test="request.combine != null">
<include refid="listCombine"> <include refid="listCombine">
@ -197,28 +196,20 @@
</foreach> </foreach>
</if> </if>
AND s_r.execute_type = 'Saved' AND s_r.execute_type = 'Saved'
<if test="request.orders != null and request.orders.size() > 0">
order by
<foreach collection="request.orders" separator="," item="order">
${order.name} ${order.type}
</foreach>
</if>
</where> </where>
) apiScenarioReport union all
union
select * from (
select a_r.name as test_name, select a_r.name as test_name,
a_r.end_time, a_r.end_time,
a_r.user_id, a_r.user_id,
a_r.name, a_r.name,
a_r.id, a_r.id,
a_r.project_id, a_r.project_id,
a_r.create_time, a_r.create_time,
a_r.create_time as update_time, a_r.create_time as update_time,
a_r.status, a_r.status,
a_r.trigger_mode, a_r.trigger_mode,
'Saved' as execute_type, 'Saved' as execute_type,
'API_INDEPENDENT' as report_type 'API_INDEPENDENT' as report_type
from api_definition_exec_result a_r from api_definition_exec_result a_r
where (a_r.integrated_report_id is null or a_r.integrated_report_id = 'null') where (a_r.integrated_report_id is null or a_r.integrated_report_id = 'null')
<if test="request.combine != null"> <if test="request.combine != null">
@ -247,30 +238,32 @@
#{value} #{value}
</foreach> </foreach>
</when> </when>
<when test="key=='report_type'"> <when test="key=='trigger_mode'">
and a_r.report_type in
<foreach collection="values" item="value" separator="," open="(" close=")">
#{value}
</foreach>
</when>
<otherwise>
and a_r.trigger_mode in and a_r.trigger_mode in
<foreach collection="values" item="value" separator="," open="(" close=")"> <foreach collection="values" item="value" separator="," open="(" close=")">
#{value} #{value}
</foreach> </foreach>
</otherwise> </when>
</choose> </choose>
</if> </if>
</foreach> </foreach>
</if> </if>
<if test="request.orders != null and request.orders.size() > 0"> ) r
order by where 1 = 1
<foreach collection="request.orders" separator="," item="order"> <if test="request.filters != null and request.filters.size() > 0">
${order.name} ${order.type} <foreach collection="request.filters.entrySet()" index="key" item="values">
<if test="values != null and values.size() > 0">
<choose>
<when test="key=='report_type'">
and r.report_type in
<foreach collection="values" item="value" separator="," open="(" close=")">
#{value}
</foreach>
</when>
</choose>
</if>
</foreach> </foreach>
</if> </if>
) apiDefinitionReport
) r
<if test="request.orders != null and request.orders.size() > 0"> <if test="request.orders != null and request.orders.size() > 0">
order by order by
<foreach collection="request.orders" separator="," item="order"> <foreach collection="request.orders" separator="," item="order">
@ -281,32 +274,32 @@
<select id="idList" resultType="java.lang.String"> <select id="idList" resultType="java.lang.String">
select r.id from ( select r.id from (
SELECT s_r.name AS test_name, SELECT s_r.name AS test_name,
s_r.end_time, s_r.end_time,
s_r.user_id, s_r.user_id,
s_r.name, s_r.name,
s_r.id, s_r.id,
s_r.project_id, s_r.project_id,
s_r.create_time, s_r.create_time,
s_r.update_time, s_r.update_time,
s_r.status, s_r.status,
s_r.trigger_mode, s_r.trigger_mode,
s_r.execute_type, s_r.execute_type,
s_r.report_type s_r.report_type
FROM api_scenario_report s_r FROM api_scenario_report s_r
union union all
select a_r.name as test_name, select a_r.name as test_name,
a_r.end_time, a_r.end_time,
a_r.user_id, a_r.user_id,
a_r.name, a_r.name,
a_r.id, a_r.id,
a_r.project_id, a_r.project_id,
a_r.create_time, a_r.create_time,
a_r.create_time as update_time, a_r.create_time as update_time,
a_r.status, a_r.status,
a_r.trigger_mode, a_r.trigger_mode,
'Saved' as execute_type, 'Saved' as execute_type,
'API_INDEPENDENT' as report_type 'API_INDEPENDENT' as report_type
from api_definition_exec_result a_r from api_definition_exec_result a_r
where a_r.integrated_report_id is null or a_r.integrated_report_id = 'null' where a_r.integrated_report_id is null or a_r.integrated_report_id = 'null'
) r ) r