From b08822252d72857961e26bfa8b8f3bee319b9951 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Thu, 26 May 2022 15:03:02 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=BA=E6=99=AF=E7=94=A8=E4=BE=8B=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E6=8C=89=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E7=9A=84=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1012783 --user=王孝刚 【接口测试】接口测试-测试报告，case报告，结束时间排序只排了当前页面的数据
https://www.tapd.cn/55049933/s/1164891
---
 .../ext/ExtApiDefinitionExecResultMapper.xml  |  6 +----
 .../mapper/ext/ExtApiScenarioReportMapper.xml | 26 +++++++++----------
 2 files changed, 14 insertions(+), 18 deletions(-)

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 1435175975..df9fa407c9 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
@@ -123,8 +123,7 @@
     </select>
     <select id="list" resultType="io.metersphere.base.domain.ApiDefinitionExecResultExpand">
         SELECT a_r.name AS test_name,
-        a_r.end_time as end_time,
-        if (a_r.end_time + 0 > a_r.create_time + 0, a_r.end_time, a_r.create_time) as calc_end_time,
+        if (a_r.end_time + 0 > a_r.create_time + 0, a_r.end_time, a_r.create_time) as end_time,
         a_r.user_id,
         a_r.name,
         a_r.id,
@@ -183,9 +182,6 @@
             order by
             <foreach collection="request.orders" separator="," item="order">
                 <choose>
-                    <when test="order.name == 'end_time' ">
-                        calc_end_time ${order.type}
-                    </when>
                     <otherwise>
                         `${order.name}` ${order.type}
                     </otherwise>
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 c7c905e002..820d4084b4 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
@@ -140,18 +140,18 @@
     </sql>
 
     <select id="list" resultMap="BaseResultMap">
-            SELECT s_r.name AS test_name,
-            s_r.end_time as end_time,
-            s_r.user_id,
-            s_r.name,
-            s_r.id,
-            s_r.project_id,
-            s_r.create_time,
-            s_r.update_time,
-            s_r.status,
-            s_r.trigger_mode,
-            s_r.execute_type,
-            s_r.report_type
+        SELECT s_r.name AS test_name,
+        if (s_r.end_time + 0 > s_r.create_time + 0, s_r.end_time, s_r.create_time) as end_time,
+        s_r.user_id,
+        s_r.name,
+        s_r.id,
+        s_r.project_id,
+        s_r.create_time,
+        s_r.update_time,
+        s_r.status,
+        s_r.trigger_mode,
+        s_r.execute_type,
+        s_r.report_type
             FROM api_scenario_report s_r
         <where>
             <if test="request.combine != null">
@@ -210,7 +210,7 @@
             <if test="request.orders != null and request.orders.size() > 0">
                 order by
                 <foreach collection="request.orders" separator="," item="order">
-                    s_r.${order.name} ${order.type}
+                    ${order.name} ${order.type}
                 </foreach>
             </if>
         </where>