From fec6cfce98207f3f18a964bf26a4bac5f6597948 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 19 Apr 2024 12:02:29 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86):?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/mapper/ExtApiReportMapper.xml         | 88 +++++++++----------
 .../api/mapper/ExtApiScenarioReportMapper.xml | 86 ++++++++----------
 2 files changed, 80 insertions(+), 94 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml
index 2debbcd7d1..8b75cc4a6a 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml
@@ -25,16 +25,16 @@
 
     <select id="list" resultType="io.metersphere.api.domain.ApiReport">
         select
-        api_report.*
-        from api_report where api_report.deleted = false
-                          and api_report.test_plan_id = 'NONE'
+        ar.*
+        from api_report ar where ar.deleted = false
+                          and ar.test_plan_id = 'NONE'
         <if test="request.keyword != null and request.keyword != ''">
             and (
-            api_report.name like concat('%', #{request.keyword},'%')
+            ar.name like concat('%', #{request.keyword},'%')
             )
         </if>
         <if test="request.projectId != null and request.projectId != ''">
-            and api_report.project_id = #{request.projectId}
+            and ar.project_id = #{request.projectId}
         </if>
         <include refid="filters">
             <property name="filter" value="request.filter"/>
@@ -42,16 +42,16 @@
     </select>
     <select id="getIds" resultType="java.lang.String">
         select
-        api_report.id
-        from api_report where api_report.deleted = false
-                          and api_report.test_plan_id = 'NONE'
+        ar.id
+        from api_report ar where ar.deleted = false
+                          and ar.test_plan_id = 'NONE'
         <if test="request.condition.keyword != null">
             and (
-            api_report.name like concat('%', #{request.condition.keyword},'%')
+            ar.name like concat('%', #{request.condition.keyword},'%')
             )
         </if>
         <if test="request.projectId != null and request.projectId != ''">
-            and api_report.project_id = #{request.projectId}
+            and ar.project_id = #{request.projectId}
         </if>
         <include refid="filters">
             <property name="filter" value="request.condition.filter"/>
@@ -117,7 +117,7 @@
                 <if test="values != null and values.size() > 0">
                     <choose>
                         <when test="key=='integrated'">
-                            and api_report.integrated in
+                            and ar.integrated in
                             <foreach collection="values" item="value" separator="," open="(" close=")">
                                 <choose>
                                     <when test="value == 'true'">1</when>
@@ -127,29 +127,29 @@
                             </foreach>
                         </when>
                         <when test="key=='status'">
-                            and api_report.status in
+                            and ar.status in
                             <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
                         </when>
                         <when test="key=='triggerMode'">
-                            and api_report.trigger_mode in
+                            and ar.trigger_mode in
                             <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
                         </when>
                         <when test="key=='createUser'">
-                            and api_report.create_user in
+                            and ar.create_user in
                             <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
                         </when>
                         <when test="key=='updateUser'">
-                            and api_report.update_user in
+                            and ar.update_user in
                             <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
                         </when>
                         <when test="key=='projectIds'">
-                            and api_report.project_id in
+                            and ar.project_id in
                             <foreach collection="values" item="value" separator="," open="(" close=")">
                                 #{value}
                             </foreach>
                         </when>
                         <when test="key=='organizationIds'">
-                            and api_report.organization_id in
+                            and project.organization_id in
                             <foreach collection="values" item="value" separator="," open="(" close=")">
                                 #{value}
                             </foreach>
@@ -161,7 +161,7 @@
     </sql>
 
     <select id="taskCenterlist" resultType="io.metersphere.system.dto.taskcenter.TaskCenterDTO">
-        SELECT api_report.* from (
+
         select
         distinct ar.id,
         ar.project_id,
@@ -173,20 +173,9 @@
         ar.start_time,
         project.organization_id,
 
-        CASE
-        WHEN ar.integrated = 0 THEN
-        c.num ELSE ar.id
-        END AS resourceNum,
-
-        CASE
-        WHEN ar.integrated = 0 THEN
-        c.id ELSE ar.id
-        END AS resourceId,
-
-        CASE
-        WHEN ar.integrated = 0 THEN
-        c.NAME ELSE ar.NAME
-        END AS resourceName,
+        if(ar.integrated, ar.id, c.num) AS resourceNum,
+        if(ar.integrated, ar.name,c.name) AS resourceName,
+        if (ar.integrated,ar.id,c.id ) AS resourceId,
 
         t.NAME AS poolName
         FROM
@@ -198,16 +187,16 @@
         where
          ar.test_plan_id = 'NONE'
         and ar.start_time BETWEEN #{startTime} AND #{endTime}
-        ) as api_report
-        where
-        api_report.project_id IN
+
+        and
+        ar.project_id IN
         <foreach collection="projectIds" item="projectId" separator="," open="(" close=")">
             #{projectId}
         </foreach>
         <if test="request.keyword != null and request.keyword != ''">
-            and ( api_report.resourceName like concat('%', #{request.keyword},'%')
+            and ( if(ar.integrated, ar.id, c.num) like concat('%', #{request.keyword},'%')
 
-            or api_report.resourceNum like concat('%', #{request.keyword},'%')
+            or if(ar.integrated, ar.name,c.name) like concat('%', #{request.keyword},'%')
             )
         </if>
         <include refid="filters">
@@ -215,29 +204,34 @@
         </include>
     </select>
     <select id="getReports" resultType="io.metersphere.api.dto.report.ReportDTO">
-        select id, pool_id from  (select ar.* , project.organization_id from api_report ar
-                           left join project on ar.project_id = project.id ) as api_report
-
+       select distinct ar.* , project.organization_id from api_report ar
+        LEFT JOIN api_test_case_record a ON ar.id = a.api_report_id
+        LEFT JOIN api_test_case c ON a.api_test_case_id = c.id
+        left join project on ar.project_id = project.id
                            where
-        api_report.deleted = false
-        and api_report.test_plan_id = 'NONE'
-        and api_report.start_time BETWEEN #{startTime} AND #{endTime}
-        and api_report.status in ('PENDING', 'RUNNING', 'RERUNNING')
+        ar.deleted = false
+        and ar.test_plan_id = 'NONE'
+        and ar.start_time BETWEEN #{startTime} AND #{endTime}
+        and ar.status in ('PENDING', 'RUNNING', 'RERUNNING')
         <if test="ids != null and ids.size() > 0">
-            and api_report.id in
+            and ar.id in
             <foreach collection="ids" item="id" open="(" separator="," close=")">
                 #{id}
             </foreach>
         </if>
         <if test="projectIds != null and projectIds.size() > 0">
-            and api_report.project_id in
+            and ar.project_id in
             <foreach collection="projectIds" item="projectId" open="(" separator="," close=")">
                 #{projectId}
             </foreach>
         </if>
         <if test="request.condition.keyword != null">
             and (
-            api_report.name like concat('%', #{request.condition.keyword},'%')
+
+            if(ar.integrated, ar.id, c.num) like concat('%', #{request.condition.keyword},'%')
+
+            or if(ar.integrated, ar.name,c.name) like concat('%', #{request.condition.keyword},'%')
+
             )
         </if>
 
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml
index b1255d7173..6b82202da2 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml
@@ -24,16 +24,16 @@
 
     <select id="list" resultType="io.metersphere.api.domain.ApiScenarioReport">
         select
-        api_scenario_report.*
-        from api_scenario_report where api_scenario_report.deleted = false
-                          and api_scenario_report.test_plan_id = 'NONE'
+        asr.*
+        from api_scenario_report asr where asr.deleted = false
+                          and asr.test_plan_id = 'NONE'
         <if test="request.keyword != null and request.keyword != ''">
             and (
-            api_scenario_report.name like concat('%', #{request.keyword},'%')
+            asr.name like concat('%', #{request.keyword},'%')
             )
         </if>
         <if test="request.projectId != null and request.projectId != ''">
-            and api_scenario_report.project_id = #{request.projectId}
+            and asr.project_id = #{request.projectId}
         </if>
         <include refid="filters">
             <property name="filter" value="request.filter"/>
@@ -41,16 +41,16 @@
     </select>
     <select id="getIds" resultType="java.lang.String">
         select
-        api_scenario_report.id
-        from api_scenario_report where api_scenario_report.deleted = false
-                          and api_scenario_report.test_plan_id = 'NONE'
+        asr.id
+        from api_scenario_report asr where asr.deleted = false
+                          and asr.test_plan_id = 'NONE'
         <if test="request.condition.keyword != null">
             and (
-            api_scenario_report.name like concat('%', #{request.condition.keyword},'%')
+            asr.name like concat('%', #{request.condition.keyword},'%')
             )
         </if>
         <if test="request.projectId != null and request.projectId != ''">
-            and api_scenario_report.project_id = #{request.projectId}
+            and asr.project_id = #{request.projectId}
         </if>
         <include refid="filters">
             <property name="filter" value="request.condition.filter"/>
@@ -111,29 +111,33 @@
           and api_scenario_report.project_id = #{projectId} limit 500
     </select>
     <select id="getReports" resultType="io.metersphere.api.dto.report.ReportDTO">
-        select id, pool_id from (
-        select asr.*, p.organization_id from api_scenario_report asr
-                      left join project p on asr.project_id = p.id ) as api_scenario_report
+
+        select distinct asr.*, project.organization_id from api_scenario_report asr
+        left join api_scenario_record a on asr.id = a.api_scenario_report_id
+        left JOIN api_scenario s on a.api_scenario_id = s.id
+                      left join project on asr.project_id = project.id
                       where
-        api_scenario_report.deleted = false
-        and api_scenario_report.test_plan_id = 'NONE'
-        and api_scenario_report.start_time BETWEEN #{startTime} AND #{endTime}
-        and api_scenario_report.status in ('PENDING', 'RUNNING', 'RERUNNING')
+        asr.deleted = false
+        and asr.test_plan_id = 'NONE'
+        and asr.start_time BETWEEN #{startTime} AND #{endTime}
+        and asr.status in ('PENDING', 'RUNNING', 'RERUNNING')
         <if test="ids != null and ids.size() > 0">
-            and api_scenario_report.id in
+            and asr.id in
             <foreach collection="ids" item="id" open="(" separator="," close=")">
                 #{id}
             </foreach>
         </if>
         <if test="projectIds != null and projectIds.size() > 0">
-            and api_scenario_report.project_id in
+            and asr.project_id in
             <foreach collection="projectIds" item="projectId" open="(" separator="," close=")">
                 #{projectId}
             </foreach>
         </if>
         <if test="request.condition.keyword != null">
             and (
-            api_scenario_report.name like concat('%', #{request.condition.keyword},'%')
+            if(asr.integrated, asr.id, s.num) like concat('%', #{request.condition.keyword},'%')
+            or if(asr.integrated, asr.name,s.name) like concat('%', #{request.condition.keyword},'%')
+
             )
         </if>
         <include refid="filters">
@@ -143,7 +147,6 @@
     </select>
 
     <select id="taskCenterlist" resultType="io.metersphere.system.dto.taskcenter.TaskCenterDTO">
-        select * from (
         select
         distinct asr.id,
         asr.project_id,
@@ -156,20 +159,9 @@
         asr.start_time,
         project.organization_id,
 
-        CASE
-        WHEN asr.integrated = 0 THEN
-        s.num ELSE asr.id
-        END AS resourceNum,
-
-        CASE
-        WHEN asr.integrated = 0 THEN
-        s.NAME ELSE asr.NAME
-        END AS resourceName,
-
-        CASE
-        WHEN asr.integrated = 0 THEN
-        s.id ELSE asr.id
-        END AS resourceId,
+        if(asr.integrated, asr.id, s.num) AS resourceNum,
+        if(asr.integrated, asr.name,s.name) AS resourceName,
+        if (asr.integrated,asr.id,s.id ) AS resourceId,
 
         t.name as poolName
         from api_scenario_report asr
@@ -178,16 +170,16 @@
         left JOIN test_resource_pool t on asr.pool_id = t.id
         left join project on asr.project_id = project.id
         where asr.test_plan_id = 'NONE'
-          and asr.start_time BETWEEN #{startTime} AND #{endTime} ) api_scenario_report
-        where
-           api_scenario_report.project_id IN
+          and asr.start_time BETWEEN #{startTime} AND #{endTime}
+        and
+        asr.project_id IN
         <foreach collection="projectIds" item="projectId" separator="," open="(" close=")">
             #{projectId}
         </foreach>
         <if test="request.keyword != null and request.keyword != ''">
             and (
-            api_scenario_report.resourceName like concat('%', #{request.keyword},'%')
-                or api_scenario_report.resourceNum like concat('%', #{request.keyword},'%')
+            if(asr.integrated, asr.id, s.num) like concat('%', #{request.keyword},'%')
+                or if(asr.integrated, asr.name,s.name) like concat('%', #{request.keyword},'%')
                )
         </if>
         <include refid="filters">
@@ -265,7 +257,7 @@
                 <if test="values != null and values.size() > 0">
                     <choose>
                         <when test="key=='integrated'">
-                            and api_scenario_report.integrated in
+                            and asr.integrated in
                             <foreach collection="values" item="value" separator="," open="(" close=")">
                                 <choose>
                                     <when test="value == 'true'">1</when>
@@ -275,29 +267,29 @@
                             </foreach>
                         </when>
                         <when test="key=='status'">
-                            and api_scenario_report.status in
+                            and asr.status in
                             <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
                         </when>
                         <when test="key=='triggerMode'">
-                            and api_scenario_report.trigger_mode in
+                            and asr.trigger_mode in
                             <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
                         </when>
                         <when test="key=='createUser'">
-                            and api_scenario_report.create_user in
+                            and asr.create_user in
                             <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
                         </when>
                         <when test="key=='updateUser'">
-                            and api_scenario_report.update_user in
+                            and asr.update_user in
                             <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
                         </when>
                         <when test="key=='projectIds'">
-                            and api_scenario_report.project_id in
+                            and asr.project_id in
                             <foreach collection="values" item="value" separator="," open="(" close=")">
                                 #{value}
                             </foreach>
                         </when>
                         <when test="key=='organizationIds'">
-                            and api_scenario_report.organization_id in
+                            and project.organization_id in
                             <foreach collection="values" item="value" separator="," open="(" close=")">
                                 #{value}
                             </foreach>