diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseTaskMapper.xml b/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseTaskMapper.xml index 2c99eb436b..9ef37eade4 100644 --- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseTaskMapper.xml +++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseTaskMapper.xml @@ -130,6 +130,27 @@ AND t.status IN ("running","starting","waiting") ) 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 + + #{id} + + + AND t.trigger_mode = #{request.triggerMode} + + + AND t.status = #{request.executionStatus} + + + AND t.user_id = #{request.executor} + + 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