From ff3575970b8ce4fd8058e6bb2eb03439846b123e Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 18 Feb 2022 13:59:39 +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=E7=94=A8=E4=BE=8B=E6=8A=A5=E5=91=8A=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1010385 --user=赵勇 接口测试测试报告独立case 结束时间显示有误 https://www.tapd.cn/55049933/s/1105689
---
 .../api/service/ApiDefinitionExecResultService.java        | 2 +-
 .../components/api/automation/report/ApiReportList.vue     | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
index ce02aa3e16..d7b38d46fb 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
@@ -357,7 +357,7 @@ public class ApiDefinitionExecResultService {
             saveResult.setStatus(status);
             saveResult.setResourceId(item.getName());
             saveResult.setStartTime(item.getStartTime());
-            saveResult.setEndTime(item.getResponseResult().getResponseTime());
+            saveResult.setEndTime(item.getEndTime());
             // 清空上次执行结果的内容，只保留近五条结果
             ApiDefinitionExecResult prevResult = extApiDefinitionExecResultMapper.selectMaxResultByResourceIdAndType(item.getName(), type);
             if (prevResult != null) {
diff --git a/frontend/src/business/components/api/automation/report/ApiReportList.vue b/frontend/src/business/components/api/automation/report/ApiReportList.vue
index b4129349de..615bd6745a 100644
--- a/frontend/src/business/components/api/automation/report/ApiReportList.vue
+++ b/frontend/src/business/components/api/automation/report/ApiReportList.vue
@@ -81,7 +81,12 @@
           </el-table-column>
           <el-table-column prop="endTime" min-width="120" :label="$t('report.test_end_time')" sortable>
             <template v-slot:default="scope">
-              <span>{{ scope.row.endTime | timestampFormatDate }}</span>
+              <span v-if="scope.row.endTime < scope.row.createTime">
+                {{ scope.row.updateTime | timestampFormatDate }}
+              </span>
+              <span v-else>
+                {{ scope.row.endTime | timestampFormatDate }}
+              </span>
             </template>
           </el-table-column>
           <el-table-column prop="triggerMode" width="150" :label="$t('commons.trigger_mode.name')"