fix(UI自动化): 解决任务中心socket无法刷新UI报告问题

This commit is contained in:
zhangyong 2022-10-17 10:41:16 +08:00 committed by zhangyongfit2cloud
parent 29a15dfd6f
commit 6a3cb53e37
1 changed files with 21 additions and 0 deletions

View File

@ -130,6 +130,27 @@
AND t.status IN ("running","starting","waiting") AND t.status IN ("running","starting","waiting")
) )
UNION ALL UNION ALL
(SELECT t.id,'SCENARIO' AS executionModule,t.report_type, ifnull(t2.name,'LOCAL') AS actuator, t1.`name` AS
executor,t.create_time AS executionTime, t.trigger_mode AS triggerMode ,t.status AS executionStatus
FROM ui_scenario_report t LEFT JOIN `user` t1 ON t.user_id = t1.id LEFT JOIN test_resource_pool t2 ON
t.actuator = t2.id
WHERE to_days(FROM_UNIXTIME(t.create_time/1000))= to_days(now()) AND t.execute_type !='Debug' AND t.execute_type
!='Marge' AND t.project_id IN
<foreach collection="request.projects" item="id" separator="," open="(" close=")">
#{id}
</foreach>
<if test="request.triggerMode != null and request.triggerMode != ''">
AND t.trigger_mode = #{request.triggerMode}
</if>
<if test="request.executionStatus != null and request.executionStatus != ''">
AND t.status = #{request.executionStatus}
</if>
<if test="request.executor != null and request.executor != ''">
AND t.user_id = #{request.executor}
</if>
AND t.status IN ("running","starting","waiting")
)
UNION ALL
(SELECT t.id,'API' AS executionModule, t.report_type, ifnull(t2.name,'LOCAL') AS actuator, t1.`name` AS (SELECT t.id,'API' AS executionModule, t.report_type, ifnull(t2.name,'LOCAL') AS actuator, t1.`name` AS
executor,t.create_time AS executionTime, ifnull(t.trigger_mode,'MANUAL') AS triggerMode executor,t.create_time AS executionTime, ifnull(t.trigger_mode,'MANUAL') AS triggerMode
,ifnull(t.status,'Saved') AS executionStatus ,ifnull(t.status,'Saved') AS executionStatus