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] =?UTF-8?q?update=EF=BC=9A=E5=A2=9E=E5=8A=A0test=5Fplan?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E7=9A=84=E7=BB=B4?=
 =?UTF-8?q?=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}