From 6a3cb53e376a1b24cea06baaabf1f00c3118dc5f Mon Sep 17 00:00:00 2001
From: zhangyong <yong.zhang@fit2cloud.com>
Date: Mon, 17 Oct 2022 10:41:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(UI=E8=87=AA=E5=8A=A8=E5=8C=96):=20=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=BF=83socket=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E5=88=B7=E6=96=B0UI=E6=8A=A5=E5=91=8A=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/BaseTaskMapper.xml        | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

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
+        <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
         executor,t.create_time AS executionTime, ifnull(t.trigger_mode,'MANUAL') AS triggerMode
         ,ifnull(t.status,'Saved') AS executionStatus