From 83e570c2b9bfdf0df4c44782d3fa49d8daa072a3 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 26 May 2022 12:05:04 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20ca?=
 =?UTF-8?q?se=E6=8A=A5=E5=91=8A=EF=BC=8C=E7=BB=93=E6=9D=9F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?=
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/1164606
---
 .../mapper/ext/ExtApiDefinitionExecResultMapper.xml    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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 46b795890c..1435175975 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
@@ -124,6 +124,7 @@
     <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,
         a_r.user_id,
         a_r.name,
         a_r.id,
@@ -181,7 +182,14 @@
         <if test="request.orders != null and request.orders.size() > 0">
             order by
             <foreach collection="request.orders" separator="," item="order">
-                ${order.name} ${order.type}
+                <choose>
+                    <when test="order.name == 'end_time' ">
+                        calc_end_time ${order.type}
+                    </when>
+                    <otherwise>
+                        `${order.name}` ${order.type}
+                    </otherwise>
+                </choose>
             </foreach>
         </if>
     </select>