From 658beceb7dcd5a780f17e9346cad1ebb7c8b94d1 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 19 Jul 2022 17:18:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=90=E8=A1=8C=E7=8E=AF=E5=A2=83=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E4=BD=8D=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1015018 --user=宋天阳 【测试跟踪】测试计划报告里的运行环境显示错位了
https://www.tapd.cn/55049933/s/1204559
---
 .../ext/ExtApiDefinitionExecResultMapper.xml  | 18 ++++++++++--
 .../report/detail/TestPlanOverviewReport.vue  | 29 +++++++++++--------
 2 files changed, 33 insertions(+), 14 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 d31e752d64..3d4e5e1bb9 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
@@ -422,13 +422,27 @@
 
     <select id="selectByResourceIdsAndMaxCreateTime"
             resultType="io.metersphere.base.domain.ApiDefinitionExecResultWithBLOBs">
-        SELECT resource_id,max(create_time) AS create_time, id, env_config, project_id FROM api_definition_exec_result
+        SELECT
+        execResult.resource_id,
+        execResult.create_time,
+        execResult.id,
+        execResult.env_config,
+        execResult.project_id
+        FROM api_definition_exec_result execResult
+        INNER JOIN ( SELECT
+        resource_id,
+        max( create_time + 0 ) AS create_time
+        FROM
+        api_definition_exec_result
         WHERE
         resource_id IN
         <foreach collection="ids" item="id" separator="," open="(" close=")">
             #{id}
         </foreach>
-        GROUP BY resource_id;
+        GROUP BY
+        resource_id )maxdata ON maxdata.resource_id = execResult.resource_id AND maxdata.create_time = execResult.create_time;
+
+
     </select>
 
     <select id="findByProjectIds" resultType="io.metersphere.base.domain.ApiDefinitionExecResult"
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanOverviewReport.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanOverviewReport.vue
index 444a3e59ad..d116c0b5df 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanOverviewReport.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanOverviewReport.vue
@@ -4,21 +4,26 @@
       <el-form-item :label="$t('test_track.report.testing_time') + ':'">
         {{ showTime }}
       </el-form-item>
-      <el-row type="flex" class="select-time"
-              v-if="report.envGroupName || report.projectEnvMap">
-        <el-form-item :label="$t('commons.environment') + ':'" style="width: 100%">
-          <div v-if="report.envGroupName" style="margin-left: 12px">
-            <ms-tag type="danger" :content="$t('commons.group')"></ms-tag>
-            {{ report.envGroupName }}
+      <el-row class="select-time"
+              v-if="report.envGroupName || report.projectEnvMap" style="display:inline-block">
+        <div>
+          <div style="float: left">
+            {{$t('commons.environment') + ':'}}
           </div>
-          <div v-else-if="report.projectEnvMap" style="margin-left: 12px">
-            <div v-for="(values,key) in report.projectEnvMap" :key="key" style="margin-right: 10px">
-              {{ key + ":" }}
-              <ms-tag v-for="(item,index) in values" :key="index" type="success" :content="item"
-                      style="margin-left: 2px"/>
+          <div style="float: right">
+            <div v-if="report.envGroupName" style="margin-left: 42px">
+              <ms-tag type="danger" :content="$t('commons.group')"></ms-tag>
+              {{ report.envGroupName }}
+            </div>
+            <div v-else-if="report.projectEnvMap" style="margin-left: 42px">
+              <div v-for="(values,key) in report.projectEnvMap" :key="key" style="margin-right: 10px">
+                {{ key + ":" }}
+                <ms-tag v-for="(item,index) in values" :key="index" type="success" :content="item"
+                        style="margin-left: 2px"/>
+              </div>
             </div>
           </div>
-        </el-form-item>
+        </div>
       </el-row>
       <el-row type="flex" justify="space-between" class="select-time">
         <el-col :span="8">