From 89b2bb95252fa74a61ed7b1588bb2be2dfc73d3e Mon Sep 17 00:00:00 2001
From: xuxm <xm@jw.com>
Date: Fri, 18 Sep 2020 13:52:08 +0800
Subject: [PATCH 1/7] =?UTF-8?q?update=EF=BC=9A=E5=A2=9E=E5=8A=A0=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=AE=A1=E5=88=92=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E2=80=9C=E8=AE=A1=E5=88=92=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E2=80=9D=EF=BC=8C=E2=80=9C=E8=AE=A1=E5=88=92=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E2=80=9D=EF=BC=8C=E2=80=9C=E5=AE=9E=E9=99=85=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E2=80=9D=EF=BC=8C=E2=80=9C=E5=AE=9E=E9=99=85=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/plan/components/TestPlanList.vue    | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue
index a2aee7c3da..6bb4e17386 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue
@@ -70,20 +70,38 @@
       </el-table-column>
       <el-table-column
         sortable
-        prop="createTime"
-        :label="$t('commons.create_time')"
+        prop="plannedStartTime"
+        :label="$t('test_track.plan.planned_start_time')"
         show-overflow-tooltip>
         <template v-slot:default="scope">
-          <span>{{ scope.row.createTime | timestampFormatDate }}</span>
+          <span>{{ scope.row.plannedStartTime | timestampFormatDate }}</span>
         </template>
       </el-table-column>
       <el-table-column
         sortable
-        prop="updateTime"
-        :label="$t('commons.update_time')"
+        prop="plannedEndTime"
+        :label="$t('test_track.plan.planned_end_time')"
         show-overflow-tooltip>
         <template v-slot:default="scope">
-          <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
+          <span>{{ scope.row.plannedEndTime | timestampFormatDate }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        sortable
+        prop="actualStartTime"
+        :label="$t('test_track.plan.actual_start_time')"
+        show-overflow-tooltip>
+        <template v-slot:default="scope">
+          <span>{{ scope.row.actualStartTime | timestampFormatDate }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        sortable
+        prop="actualEndTime"
+        :label="$t('test_track.plan.actual_end_time')"
+        show-overflow-tooltip>
+        <template v-slot:default="scope">
+          <span>{{ scope.row.actualEndTime | timestampFormatDate }}</span>
         </template>
       </el-table-column>
       <el-table-column

From 2062b14a17a30f2a97a35ff8d1eb2348ad6ff015 Mon Sep 17 00:00:00 2001
From: xuxm <xm@jw.com>
Date: Fri, 18 Sep 2020 13:54:38 +0800
Subject: [PATCH 2/7] =?UTF-8?q?update=EF=BC=9A=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E8=A1=A8=E5=8D=95=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E2=80=98=E8=AE=A1=E5=88=92=E5=BC=80=E5=A7=8B=E2=80=99=EF=BC=8C?=
 =?UTF-8?q?=E2=80=98=E8=AE=A1=E5=88=92=E7=BB=93=E6=9D=9F=E2=80=99=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/plan/components/TestPlanEdit.vue    | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
index a974899971..6456988ca3 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
@@ -69,6 +69,30 @@
           </el-col>
         </el-row>
 
+        <!--start:xuxm增加自定义‘计划开始’，‘计划结束’时间字段-->
+        <el-row>
+          <el-col :span="8" :offset="1">
+            <el-form-item
+              :placeholder="$t('test_track.plan.planned_start_time')"
+              :label="$t('test_track.plan.planned_start_time')"
+              :label-width="formLabelWidth"
+              prop="plannedStartTime">
+              <el-input v-model="form.planned_start_time" type="date" ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="11" :offset="2">
+            <el-form-item
+              :placeholder="$t('test_track.plan.planned_end_time')"
+              :label="$t('test_track.plan.planned_end_time')"
+              :label-width="formLabelWidth"
+              prop="planned_end_time">
+              <el-input v-model="form.planned_end_time" type="date" ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!--end:xuxm增加自定义‘计划开始’，‘计划结束’时间字段-->
+
         <el-row type="flex" justify="left" style="margin-top: 10px;">
           <el-col :span="23" :offset="1">
             <el-form-item :label="$t('commons.description')" :label-width="formLabelWidth" prop="description">

From 1d2d7128d9e14566286542dc9cbde836557c8032 Mon Sep 17 00:00:00 2001
From: xuxm <xm@jw.com>
Date: Fri, 18 Sep 2020 13:59:18 +0800
Subject: [PATCH 3/7] =?UTF-8?q?update=EF=BC=9Atest=5Fplan=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A04=E4=B8=AA=E5=AD=97=E6=AE=B5=EF=BC=9Aplanned=5Fstart?=
 =?UTF-8?q?=5Ftime=E3=80=81planned=5Fend=5Ftime=E3=80=81actual=5Fstart=5Ft?=
 =?UTF-8?q?ime=E3=80=81actual=5Fend=5Ftime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/i18n/zh-CN.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index c42cec6d2d..546461d001 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -721,6 +721,10 @@ export default {
       plan_status_prepare: "未开始",
       plan_status_running: "进行中",
       plan_status_completed: "已完成",
+      planned_start_time: "计划开始",
+      planned_end_time: "计划结束",
+      actual_start_time: "实际开始",
+      actual_end_time: "实际结束",
       plan_delete_confirm: "将删除该测试计划下所有用例，确认删除测试计划: ",
       plan_delete: "删除计划",
     },

From 5cc53ee6e2e1863778f0615445c52a74ffd5a045 Mon Sep 17 00:00:00 2001
From: xuxm <xm@jw.com>
Date: Fri, 18 Sep 2020 14:04:36 +0800
Subject: [PATCH 4/7] =?UTF-8?q?update=EF=BC=9A=E5=A2=9E=E5=8A=A0test=5Fpla?=
 =?UTF-8?q?n=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E7=9A=84=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/metersphere/base/domain/TestPlan.java    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/base/domain/TestPlan.java b/backend/src/main/java/io/metersphere/base/domain/TestPlan.java
index 9e73da87bc..91157b7c85 100644
--- a/backend/src/main/java/io/metersphere/base/domain/TestPlan.java
+++ b/backend/src/main/java/io/metersphere/base/domain/TestPlan.java
@@ -24,6 +24,14 @@ public class TestPlan implements Serializable {
     private String testCaseMatchRule;
 
     private String executorMatchRule;
+    
+    private Long plannedStartTime;
+
+    private Long plannedEndTime;
+
+    private Long actualStartTime;
+
+    private Long actualEndTime;
 
     private Long createTime;
 

From 36edbe9ded91c6fe894e8b7d2741179c43319326 Mon Sep 17 00:00:00 2001
From: xuxm <xm@jw.com>
Date: Fri, 18 Sep 2020 14:12:55 +0800
Subject: [PATCH 5/7] =?UTF-8?q?update=EF=BC=9A=E5=A2=9E=E5=8A=A0test=5Fpla?=
 =?UTF-8?q?n=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E7=9A=84?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/TestPlanMapper.xml            | 126 +++++++++++++-----
 1 file changed, 91 insertions(+), 35 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/TestPlanMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/TestPlanMapper.xml
index 5d92075a51..716bb2c64a 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/TestPlanMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/TestPlanMapper.xml
@@ -12,6 +12,10 @@
     <result column="principal" jdbcType="VARCHAR" property="principal" />
     <result column="test_case_match_rule" jdbcType="VARCHAR" property="testCaseMatchRule" />
     <result column="executor_match_rule" jdbcType="VARCHAR" property="executorMatchRule" />
+    <result column="planned_start_time" jdbcType="BIGINT" property="plannedStartTime" />
+    <result column="planned_end_time" jdbcType="BIGINT" property="plannedEndTime" />
+    <result column="actual_start_time" jdbcType="BIGINT" property="actualStartTime" />
+    <result column="actual_end_time" jdbcType="BIGINT" property="actualEndTime" />
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
   </resultMap>
@@ -78,7 +82,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, workspace_id, report_id, `name`, description, `status`, stage, principal, test_case_match_rule, 
-    executor_match_rule, create_time, update_time
+    executor_match_rule, planned_start_time, planned_end_time, actual_start_time, actual_end_time, create_time, update_time
   </sql>
   <sql id="Blob_Column_List">
     tags
@@ -114,7 +118,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
-    select 
+    select
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
@@ -132,16 +136,16 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.base.domain.TestPlan">
-    insert into test_plan (id, workspace_id, report_id, 
-      `name`, description, `status`, 
-      stage, principal, test_case_match_rule, 
-      executor_match_rule, create_time, update_time, 
-      tags)
-    values (#{id,jdbcType=VARCHAR}, #{workspaceId,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR}, 
-      #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, 
-      #{stage,jdbcType=VARCHAR}, #{principal,jdbcType=VARCHAR}, #{testCaseMatchRule,jdbcType=VARCHAR}, 
-      #{executorMatchRule,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
-      #{tags,jdbcType=LONGVARCHAR})
+    insert into test_plan (id, workspace_id, report_id,
+      `name`, description, `status`,
+      stage, principal, test_case_match_rule,
+      executor_match_rule, planned_start_time, planned_end_time, create_time,
+      update_time, tags)
+    values (#{id,jdbcType=VARCHAR}, #{workspaceId,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR},
+      #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR},
+      #{stage,jdbcType=VARCHAR}, #{principal,jdbcType=VARCHAR}, #{testCaseMatchRule,jdbcType=VARCHAR},
+      #{executorMatchRule,jdbcType=VARCHAR}, #{plannedStartTime,jdbcType=BIGINT}, #{plannedEndTime,jdbcType=BIGINT},
+      #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{tags,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.TestPlan">
     insert into test_plan
@@ -176,6 +180,12 @@
       <if test="executorMatchRule != null">
         executor_match_rule,
       </if>
+      <if test="plannedStartTime != null">
+        planned_start_time,
+      </if>
+      <if test="plannedEndTime != null">
+        planned_end_time,
+      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -217,6 +227,12 @@
       <if test="executorMatchRule != null">
         #{executorMatchRule,jdbcType=VARCHAR},
       </if>
+      <if test="plannedStartTime != null">
+        #{plannedStartTime,jdbcType=BIGINT},
+      </if>
+      <if test="plannedEndTime != null">
+        #{plannedEndTime,jdbcType=BIGINT},
+      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=BIGINT},
       </if>
@@ -267,6 +283,18 @@
       <if test="record.executorMatchRule != null">
         executor_match_rule = #{record.executorMatchRule,jdbcType=VARCHAR},
       </if>
+      <if test="record.plannedStartTime != null">
+        planned_start_time = #{record.plannedStartTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.plannedEndTime != null">
+        planned_end_time = #{record.plannedEndTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.actualStartTime != null">
+        actual_start_time = #{record.actualStartTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.actualEndTime != null">
+        actual_end_time = #{record.actualEndTime,jdbcType=BIGINT},
+      </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=BIGINT},
       </if>
@@ -284,18 +312,22 @@
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update test_plan
     set id = #{record.id,jdbcType=VARCHAR},
-      workspace_id = #{record.workspaceId,jdbcType=VARCHAR},
-      report_id = #{record.reportId,jdbcType=VARCHAR},
-      `name` = #{record.name,jdbcType=VARCHAR},
-      description = #{record.description,jdbcType=VARCHAR},
-      `status` = #{record.status,jdbcType=VARCHAR},
-      stage = #{record.stage,jdbcType=VARCHAR},
-      principal = #{record.principal,jdbcType=VARCHAR},
-      test_case_match_rule = #{record.testCaseMatchRule,jdbcType=VARCHAR},
-      executor_match_rule = #{record.executorMatchRule,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=BIGINT},
-      update_time = #{record.updateTime,jdbcType=BIGINT},
-      tags = #{record.tags,jdbcType=LONGVARCHAR}
+    workspace_id = #{record.workspaceId,jdbcType=VARCHAR},
+    report_id = #{record.reportId,jdbcType=VARCHAR},
+    `name` = #{record.name,jdbcType=VARCHAR},
+    description = #{record.description,jdbcType=VARCHAR},
+    `status` = #{record.status,jdbcType=VARCHAR},
+    stage = #{record.stage,jdbcType=VARCHAR},
+    principal = #{record.principal,jdbcType=VARCHAR},
+    test_case_match_rule = #{record.testCaseMatchRule,jdbcType=VARCHAR},
+    executor_match_rule = #{record.executorMatchRule,jdbcType=VARCHAR},
+    planned_start_time = #{record.plannedStartTime,jdbcType=BIGINT},
+    planned_end_time = #{record.plannedEndTime,jdbcType=BIGINT},
+    actual_start_time = #{record.actualStartTime,jdbcType=BIGINT},
+    actual_end_time = #{record.actualEndTime,jdbcType=BIGINT},
+    create_time = #{record.createTime,jdbcType=BIGINT},
+    update_time = #{record.updateTime,jdbcType=BIGINT},
+    tags = #{record.tags,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -303,17 +335,21 @@
   <update id="updateByExample" parameterType="map">
     update test_plan
     set id = #{record.id,jdbcType=VARCHAR},
-      workspace_id = #{record.workspaceId,jdbcType=VARCHAR},
-      report_id = #{record.reportId,jdbcType=VARCHAR},
-      `name` = #{record.name,jdbcType=VARCHAR},
-      description = #{record.description,jdbcType=VARCHAR},
-      `status` = #{record.status,jdbcType=VARCHAR},
-      stage = #{record.stage,jdbcType=VARCHAR},
-      principal = #{record.principal,jdbcType=VARCHAR},
-      test_case_match_rule = #{record.testCaseMatchRule,jdbcType=VARCHAR},
-      executor_match_rule = #{record.executorMatchRule,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=BIGINT},
-      update_time = #{record.updateTime,jdbcType=BIGINT}
+    workspace_id = #{record.workspaceId,jdbcType=VARCHAR},
+    report_id = #{record.reportId,jdbcType=VARCHAR},
+    `name` = #{record.name,jdbcType=VARCHAR},
+    description = #{record.description,jdbcType=VARCHAR},
+    `status` = #{record.status,jdbcType=VARCHAR},
+    stage = #{record.stage,jdbcType=VARCHAR},
+    principal = #{record.principal,jdbcType=VARCHAR},
+    test_case_match_rule = #{record.testCaseMatchRule,jdbcType=VARCHAR},
+    executor_match_rule = #{record.executorMatchRule,jdbcType=VARCHAR},
+    planned_start_time = #{record.plannedStartTime,jdbcType=BIGINT},
+    planned_end_time = #{record.plannedEndTime,jdbcType=BIGINT},
+    actual_start_time = #{record.actualStartTime,jdbcType=BIGINT},
+    actual_end_time = #{record.actualEndTime,jdbcType=BIGINT},
+    create_time = #{record.createTime,jdbcType=BIGINT},
+    update_time = #{record.updateTime,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -348,6 +384,18 @@
       <if test="executorMatchRule != null">
         executor_match_rule = #{executorMatchRule,jdbcType=VARCHAR},
       </if>
+      <if test="plannedStartTime != null">
+        planned_start_time = #{plannedStartTime,jdbcType=BIGINT},
+      </if>
+      <if test="plannedEndTime != null">
+        planned_end_time = #{plannedEndTime,jdbcType=BIGINT},
+      </if>
+      <if test="actualStartTime != null">
+        actual_start_time = #{actualStartTime,jdbcType=BIGINT},
+      </if>
+      <if test="actualEndTime != null">
+        actual_end_time = #{actualEndTime,jdbcType=BIGINT},
+      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=BIGINT},
       </if>
@@ -371,6 +419,10 @@
       principal = #{principal,jdbcType=VARCHAR},
       test_case_match_rule = #{testCaseMatchRule,jdbcType=VARCHAR},
       executor_match_rule = #{executorMatchRule,jdbcType=VARCHAR},
+      planned_start_time = #{plannedStartTime,jdbcType=BIGINT},
+      planned_end_time = #{plannedEndTime,jdbcType=BIGINT},
+      actual_start_time = #{actualStartTime,jdbcType=BIGINT},
+      actual_end_time = #{actualEndTime,jdbcType=BIGINT},
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},
       tags = #{tags,jdbcType=LONGVARCHAR}
@@ -387,6 +439,10 @@
       principal = #{principal,jdbcType=VARCHAR},
       test_case_match_rule = #{testCaseMatchRule,jdbcType=VARCHAR},
       executor_match_rule = #{executorMatchRule,jdbcType=VARCHAR},
+      planned_start_time = #{plannedStartTime,jdbcType=BIGINT},
+      planned_end_time = #{plannedEndTime,jdbcType=BIGINT},
+      actual_start_time = #{actualStartTime,jdbcType=BIGINT},
+      actual_end_time = #{actualEndTime,jdbcType=BIGINT},
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT}
     where id = #{id,jdbcType=VARCHAR}

From 84dce085bc09f2be5b0087894435d292db1f8f2a Mon Sep 17 00:00:00 2001
From: xuxm <xm@jw.com>
Date: Fri, 18 Sep 2020 14:17:26 +0800
Subject: [PATCH 6/7] =?UTF-8?q?update=EF=BC=9A=E5=A2=9E=E5=8A=A0test=5Fpla?=
 =?UTF-8?q?n=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E7=9A=84=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/base/domain/TestPlan.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/base/domain/TestPlan.java b/backend/src/main/java/io/metersphere/base/domain/TestPlan.java
index 91157b7c85..50612a4b10 100644
--- a/backend/src/main/java/io/metersphere/base/domain/TestPlan.java
+++ b/backend/src/main/java/io/metersphere/base/domain/TestPlan.java
@@ -24,7 +24,7 @@ public class TestPlan implements Serializable {
     private String testCaseMatchRule;
 
     private String executorMatchRule;
-    
+
     private Long plannedStartTime;
 
     private Long plannedEndTime;

From 721b1f01050c320f78b0bfd5498ffd7e962cbede Mon Sep 17 00:00:00 2001
From: xuxm <xm@jw.com>
Date: Fri, 18 Sep 2020 14:24:40 +0800
Subject: [PATCH 7/7] =?UTF-8?q?update=EF=BC=9A=E5=A2=9E=E5=8A=A0test=5Fpla?=
 =?UTF-8?q?n=E8=A1=A8=E6=8F=92=E5=85=A5=E6=96=B0=E5=A2=9E=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E5=AD=97=E6=AE=B5=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/service/TestPlanService.java        | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index 7f95cd805d..70ca52c95b 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -95,6 +95,10 @@ public class TestPlanService {
 
         testPlan.setId(testPlanId);
         testPlan.setStatus(TestPlanStatus.Prepare.name());
+        testPlan.setPlannedStartTime(System.currentTimeMillis());
+        testPlan.setPlannedEndTime(System.currentTimeMillis());
+        testPlan.setActualStartTime(System.currentTimeMillis());
+        testPlan.setActualEndTime(System.currentTimeMillis());
         testPlan.setCreateTime(System.currentTimeMillis());
         testPlan.setUpdateTime(System.currentTimeMillis());
         testPlanMapper.insert(testPlan);
@@ -111,11 +115,20 @@ public class TestPlanService {
         return Optional.ofNullable(testPlanMapper.selectByPrimaryKey(testPlanId)).orElse(new TestPlan());
     }
 
-    public int editTestPlan(TestPlanDTO testPlan) {
-        editTestPlanProject(testPlan);
+    public int editTestPlan(TestPlan testPlan) {
         testPlan.setUpdateTime(System.currentTimeMillis());
         checkTestPlanExist(testPlan);
-        return testPlanMapper.updateByPrimaryKeySelective(testPlan);
+        //进行中状态，写入实际开始时间
+        if ("Underway".equals(testPlan.getStatus())) {
+            testPlan.setActualStartTime(System.currentTimeMillis());
+            return testPlanMapper.updateByPrimaryKeySelective(testPlan);
+        } else if("Completed".equals(testPlan.getStatus())){
+            //已完成，写入实际完成时间
+            testPlan.setActualEndTime(System.currentTimeMillis());
+            return testPlanMapper.updateByPrimaryKeySelective(testPlan);
+        } else {
+            return 0;
+        }
     }
 
     private void editTestPlanProject(TestPlanDTO testPlan) {