From 835f459565e9a5ee297d5d138b467e95f4693ce0 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Mon, 22 Nov 2021 13:55:07 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=BF=83):=20?=
 =?UTF-8?q?=E7=BC=BA=E5=B0=91sql=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ext/ExtApiDefinitionExecResultMapper.java |  7 +++++--
 .../ext/ExtApiDefinitionExecResultMapper.xml  | 19 +++++++++++++++++--
 .../ext/ExtApiScenarioReportMapper.java       |  2 ++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.java
index fa3d030d85..eb19dbb3bb 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.java
@@ -22,9 +22,12 @@ public interface ExtApiDefinitionExecResultMapper {
 
     List<ExecutedCaseInfoResult> findFaliureCaseInfoByProjectIDAndExecuteTimeAndLimitNumber(@Param("projectId") String projectId, @Param("startTimestamp") long startTimestamp);
 
-    String  selectExecResult(String resourceId);
+    String selectExecResult(String resourceId);
 
     ApiDefinitionExecResult selectPlanApiMaxResultByTestIdAndType(String resourceId, String type);
 
-    List<ApiDefinitionExecResult> selectStatusByIdList(@Param("ids")Collection<String> values);
+    List<ApiDefinitionExecResult> selectStatusByIdList(@Param("ids") Collection<String> values);
+
+    List<ApiDefinitionExecResult> selectApiResultByProjectId(String projectId);
+
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
index 8abf019d6d..4656d8e493 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
@@ -2,7 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.metersphere.base.mapper.ext.ExtApiDefinitionExecResultMapper">
     <delete id="deleteByResourceId" parameterType="java.lang.String">
-      delete from api_definition_exec_result  where resource_id = #{id,jdbcType=VARCHAR}
+        delete
+        from api_definition_exec_result  where resource_id = #{id,jdbcType=VARCHAR}
     </delete>
 
     <select id="selectMaxResultByResourceId" parameterType="java.lang.String" resultType="io.metersphere.base.domain.ApiDefinitionExecResult">
@@ -95,11 +96,25 @@
 
     <select id="selectStatusByIdList"
             resultType="io.metersphere.base.domain.ApiDefinitionExecResult">
-        select  id,status from api_definition_exec_result
+        select id,status from api_definition_exec_result
         where id in
         <foreach collection="ids" item="v" separator="," open="(" close=")">
             #{v}
         </foreach>
     </select>
 
+    <select id="selectApiResultByProjectId" resultType="io.metersphere.base.domain.ApiDefinitionExecResult">
+        select *
+        from api_definition_exec_result t
+                 left join `user` t1 ON t.user_id = t1.id
+                 left join test_resource_pool t2 on t.actuator = t2.id
+                 left join api_definition t3 on t.resource_id = t3.id
+                 left join api_test_case t4 on t4.id = t.resource_id
+                 left join test_plan_api_case t5 on t.resource_id = t5.id
+                 left join test_plan t6 on t5.test_plan_id = t6.id
+        where to_days(FROM_UNIXTIME(t.create_time / 1000)) = to_days(now())
+          and (t3.project_id = #{projectId} OR t4.project_id = #{projectId} OR t6.project_id = #{projectId})
+          and t.`STATUS` in ('running', 'waiting')
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.java
index 8dcca9fa9b..f0f0624d0a 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.java
@@ -32,4 +32,6 @@ public interface ExtApiScenarioReportMapper {
     List<ApiReportCountDTO> countByApiScenarioId();
 
     List<ApiScenarioReport> selectStatusByIds(@Param("ids") Collection<String> values);
+
+    List<ApiScenarioReport> selectReportByProjectId(String projectId);
 }
\ No newline at end of file