From 61bc49d5f6d3064b6a74ab5669038c05c17a3815 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 31 Dec 2021 14:09:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1009438 --user=lyh
[github#9018]接口测试模块，添加了定时任务，且执行完成后，在首页-场景定时任务数量统计栏未显示对应的本周执行、历史总执行、成功率等数据，请修改
https://www.tapd.cn/55049933/s/1088942

Closes #9018
---
 .../base/mapper/ext/ExtApiScenarioReportMapper.xml  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
index 724ef3a990..ac538bbfcd 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
@@ -233,22 +233,21 @@
     </select>
 
     <select id="countByProjectIdAndCreateAndByScheduleInThisWeek" resultType="java.lang.Long">
-        SELECT count(acr.report_id) AS countNumber FROM api_scenario_report_detail acr
-        INNER JOIN api_scenario_report ar ON ar.id = acr.report_id
+        SELECT count(ar.id) AS countNumber FROM
+        api_scenario_report ar
         INNER JOIN (
             SELECT acitem.`name`,acitem.id FROM api_scenario acitem INNER JOIN `schedule` sc ON acitem.id = sc.resource_id
         ) ac on ar.scenario_id = ac.id
-        WHERE acr.project_id = #{projectId} AND ar.trigger_mode = 'SCHEDULE' AND ar.create_time BETWEEN #{firstDayTimestamp} AND #{lastDayTimestamp}
+        WHERE ar.project_id = #{projectId} AND ar.trigger_mode = 'SCHEDULE' AND ar.create_time BETWEEN #{firstDayTimestamp} AND #{lastDayTimestamp}
     </select>
 
     <select id="countByProjectIdGroupByExecuteResult" resultType="io.metersphere.api.dto.datacount.ApiDataCountResult">
-        SELECT count(acr.report_id) AS countNumber,ar.status AS groupField
-        FROM api_scenario_report_detail acr
-        INNER JOIN api_scenario_report ar ON ar.id = acr.report_id
+        SELECT count(ar.id) AS countNumber,ar.status AS groupField FROM
+        api_scenario_report ar
         INNER JOIN (
         SELECT acitem.`name`,acitem.id FROM api_scenario acitem INNER JOIN `schedule` sc ON acitem.id = sc.resource_id
         ) ac on ar.scenario_id = ac.id
-        WHERE acr.project_id = #{projectId} AND ar.trigger_mode = 'SCHEDULE'
+        WHERE ar.project_id = #{projectId} AND ar.trigger_mode = 'SCHEDULE'
         GROUP BY groupField;
     </select>
     <select id="selectLastReportByIds" resultType="io.metersphere.base.domain.ApiScenarioReport">