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

fix(接口测试): 任务中心数量统计调整统计(running,starting,waiting)三种状态

This commit is contained in:
fit2-zhao 2022-04-27 13:21:21 +08:00 committed by fit2-zhao
parent 6ec13df043
commit dad453b1fb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTaskMapper.xml
View File

@ -93,7 +93,7 @@
<if test="request.executor != null and request.executor != ''">
and t.user_id = #{request.executor}
</if>
and t.status not in ("saved","completed","success","error","STOP")
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 executor,t.create_time as executionTime, ifnull(t.trigger_mode,'MANUAL') as triggerMode ,ifnull(t.status,'Saved') as executionStatus
@ -113,7 +113,7 @@
and t.user_id = #{request.executor}
</if>
and (t.integrated_report_id is null or t.integrated_report_id = 'null')
and t.status not in ("saved","completed","success","error","STOP")
and t.status in ("running","starting","waiting")
)
UNION ALL
(select t.id,'PERFORMANCE' as executionModule,'PERFORMANCE' as 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
@ -131,7 +131,7 @@
<if test="request.executor != null and request.executor != ''">
and t.user_id = #{request.executor}
</if>
and t.status not in ("saved","completed","success","error")
and t.status in ("running","starting","waiting")
)
)tt;
</select>