From 4e2e2460c959fd4594ca6e1aa842c181ad698ae4 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 8 Aug 2023 16:33:08 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1=E4=B8=AD=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E7=BB=9F=E8=AE=A1=E5=B7=B2=E7=BB=8F=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E4=BA=86=E7=9A=84=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1028197 --user=宋天阳 【性能测试】-【首页】-测试日历中的记录数包含定时任务执行的记录
https://www.tapd.cn/55049933/s/1401693
---
 .../base/mapper/ext/ExtLoadTestReportMapper.xml     | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.xml b/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.xml
index 12136412fe..e8a124248f 100644
--- a/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.xml
+++ b/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.xml
@@ -205,13 +205,11 @@
     </select>
 
     <select id="selectDashboardTests" resultType="io.metersphere.dto.DashboardTestDTO">
-        SELECT min(create_time) AS date, count(load_test_report.id) AS count,
-        date_format(from_unixtime(create_time / 1000), '%Y-%m-%d') AS x
+        SELECT min(create_time)                                           AS date,
+               count(load_test_report.id)                                 AS count,
+               date_format(from_unixtime(create_time / 1000), '%Y-%m-%d') AS x
         FROM load_test_report
-        WHERE test_id IN (SELECT load_test.id
-            FROM load_test
-            JOIN project ON load_test.project_id = project.id
-            WHERE project_id = #{projectId, jdbcType=VARCHAR})
+        WHERE project_id = #{projectId, jdbcType=VARCHAR}
           AND create_time
             > #{startTimestamp}
         GROUP BY x
@@ -261,7 +259,8 @@
         SELECT id
         FROM load_test_report
         WHERE test_id = #{testId}
-          AND `status` !='Completed' AND `status` !='Error'
+          AND `status` != 'Completed'
+          AND `status` != 'Error'
     </select>
 
     <select id="selectStatusById" resultType="string">