From 4d4661b5a0f59e6b26ab85eebbd77848e1eb5b24 Mon Sep 17 00:00:00 2001
From: wenyann <wenyan.yang@fit2cloud.com>
Date: Mon, 14 Jun 2021 20:54:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ext/ExtTestPlanTestCaseMapper.xml  | 10 ++++--
 .../components/common/model/JsonData.js       |  8 +++--
 .../comonents/api/TestPlanApiCaseList.vue     | 11 +++++++
 .../comonents/api/TestPlanApiScenarioList.vue |  9 +++++
 .../functional/FunctionalTestCaseList.vue     | 33 ++++++++++++-------
 .../src/common/js/default-table-header.js     |  1 +
 6 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
index 01edb3753e..2f4dee387f 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
@@ -224,9 +224,13 @@
 
     <select id="list" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
         select test_plan_test_case.id as id, test_case.id as caseId, test_case.name, test_case.priority,
-        test_case.type,test_case.test_id as testId,test_case.node_id, test_case.tags, test_case.maintainer, test_case.custom_fields,
-        test_case.node_path, test_case.method, if(project.custom_num = 0, cast(test_case.num as char), test_case.custom_num) as customNum, test_plan_test_case.executor, test_plan_test_case.status, test_plan_test_case.actual_result,
-        test_plan_test_case.update_time, test_case_node.name as model, project.name as projectName,
+        test_case.type,test_case.test_id as testId,test_case.node_id, test_case.tags, test_case.maintainer,
+        test_case.custom_fields,
+        test_case.node_path, test_case.method, if(project.custom_num = 0, cast(test_case.num as char),
+        test_case.custom_num) as customNum, test_plan_test_case.executor, test_plan_test_case.status,
+        test_plan_test_case.actual_result,
+        test_plan_test_case.update_time, test_plan_test_case.create_time,test_case_node.name as model, project.name as
+        projectName,
         test_plan_test_case.plan_id as planId
         from test_plan_test_case
         inner join test_case on test_plan_test_case.case_id = test_case.id
diff --git a/frontend/src/business/components/common/model/JsonData.js b/frontend/src/business/components/common/model/JsonData.js
index faa41df3ac..2a4086abca 100644
--- a/frontend/src/business/components/common/model/JsonData.js
+++ b/frontend/src/business/components/common/model/JsonData.js
@@ -94,7 +94,9 @@ export const Test_Plan_Api_Case = [
   {id: 'custom', label: i18n.t('api_test.definition.api_last_time')},
   {id: 'tags', label: i18n.t('commons.tag')},
   {id: 'execResult', label: '执行状态'},
-  {id: 'maintainer', label: i18n.t('api_test.definition.request.responsible')}
+  {id: 'maintainer', label: i18n.t('api_test.definition.request.responsible')},
+  {id: 'createTime', label: i18n.t('commons.create_time')},
+
 
 ]
 //测试计划-性能用例
@@ -119,7 +121,9 @@ export const Test_Plan_Scenario_Case = [
   {id: 'stepTotal', label: i18n.t('api_test.automation.success')},
   {id: 'lastResult', label: i18n.t('api_test.automation.fail')},
   {id: 'passRate', label: i18n.t('api_test.automation.passing_rate')},
-  {id: 'maintainer', label: i18n.t('api_test.definition.request.responsible')}
+  {id: 'maintainer', label: i18n.t('api_test.definition.request.responsible')},
+  {id: 'createTime', label: i18n.t('commons.create_time')},
+
 
 ]
 
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
index aa8c84d09a..7b6c07426b 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
@@ -92,6 +92,17 @@
               <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
             </template>
           </el-table-column>
+          <el-table-column
+            v-if="item.id == 'createTime'"
+            sortable="custom"
+            min-width="160"
+            :label="$t('commons.create_time')"
+            prop="createTime"
+            :key="index">
+            <template v-slot:default="scope">
+              <span>{{ scope.row.createTime | timestampFormatDate }}</span>
+            </template>
+          </el-table-column>
 
           <el-table-column
             v-if="item.id == 'tags'"
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
index 4a47431edf..d026f4245d 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
@@ -74,6 +74,15 @@
               <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
             </template>
           </el-table-column>
+          <el-table-column v-if="item.id == 'createTime'"
+                           prop="createTime"
+                           min-width="120px"
+                           sortable="custom"
+                           :label="$t('commons.create_time')" width="180" :key="index">
+            <template v-slot:default="scope">
+              <span>{{ scope.row.createTime | timestampFormatDate }}</span>
+            </template>
+          </el-table-column>
           <el-table-column v-if="item.id == 'stepTotal'" prop="stepTotal" :label="$t('api_test.automation.step')"
                            min-width="80px"
                            show-overflow-tooltip :key="index"/>
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
index 100a4008c3..298731429b 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
@@ -65,26 +65,37 @@
         </ms-table-column>
 
         <ms-table-column
-          prop="tags"
-          :field="item"
-          :fields-width="fieldsWidth"
-          :label="$t('commons.tag')"
-          min-width="120px">
+            prop="tags"
+            :field="item"
+            :fields-width="fieldsWidth"
+            :label="$t('commons.tag')"
+            min-width="120px">
           <template v-slot:default="scope">
             <ms-tag v-for="(tag, index) in scope.row.showTags" :key="tag + '_' + index" type="success" effect="plain"
                     :content="tag" style="margin-left: 0px; margin-right: 2px"/>
           </template>
         </ms-table-column>
+          <ms-table-column
+              sortable
+              prop="createTime"
+              :field="item"
+              :fields-width="fieldsWidth"
+              :label="$t('commons.create_time')"
+              min-width="120px">
+          <template v-slot:default="scope">
+            <span>{{ scope.row.createTime | timestampFormatDate }}</span>
+          </template>
+        </ms-table-column>
 
         <ms-table-column
-          prop="nodePath"
-          :field="item"
-          :fields-width="fieldsWidth"
-          :label="$t('test_track.case.module')"
-          min-width="120px"/>
+            prop="nodePath"
+            :field="item"
+            :fields-width="fieldsWidth"
+            :label="$t('test_track.case.module')"
+            min-width="120px"/>
 
         <ms-table-column
-          prop="projectName"
+            prop="projectName"
           :field="item"
           :fields-width="fieldsWidth"
           :label="$t('test_track.plan.plan_project')"
diff --git a/frontend/src/common/js/default-table-header.js b/frontend/src/common/js/default-table-header.js
index 22440291d2..b8ebe16db9 100644
--- a/frontend/src/common/js/default-table-header.js
+++ b/frontend/src/common/js/default-table-header.js
@@ -123,6 +123,7 @@ export const CUSTOM_TABLE_HEADER = {
     {id: 'executorName', key: '7', label: i18n.t('test_track.plan_view.executor')},
     {id: 'status', key: '8', label: i18n.t('test_track.plan_view.execute_result')},
     {id: 'updateTime', key: '9', label: i18n.t('commons.update_time')},
+    {id: 'createTime', key: 'a', label: i18n.t('commons.create_time')},
   ],
   //测试计划-api用例
   TEST_PLAN_API_CASE: [