From c6f5970f4c779209e6d8bdc42aa9445f07e0a809 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Sun, 23 Jan 2022 20:51:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E6=80=A7=E8=83=BD?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8D=E7=94=A8=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/base/domain/LoadTest.java  |  2 -
 .../base/domain/LoadTestExample.java          | 70 -------------------
 .../base/mapper/LoadTestMapper.xml            | 35 +++-------
 3 files changed, 8 insertions(+), 99 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/domain/LoadTest.java b/backend/src/main/java/io/metersphere/base/domain/LoadTest.java
index 7270e9ba18..a695562a1f 100644
--- a/backend/src/main/java/io/metersphere/base/domain/LoadTest.java
+++ b/backend/src/main/java/io/metersphere/base/domain/LoadTest.java
@@ -34,8 +34,6 @@ public class LoadTest implements Serializable {
 
     private Long order;
 
-    private String version;
-
     private String refId;
 
     private String versionId;
diff --git a/backend/src/main/java/io/metersphere/base/domain/LoadTestExample.java b/backend/src/main/java/io/metersphere/base/domain/LoadTestExample.java
index a714e05282..a5e618550a 100644
--- a/backend/src/main/java/io/metersphere/base/domain/LoadTestExample.java
+++ b/backend/src/main/java/io/metersphere/base/domain/LoadTestExample.java
@@ -1034,76 +1034,6 @@ public class LoadTestExample {
             return (Criteria) this;
         }
 
-        public Criteria andVersionIsNull() {
-            addCriterion("version is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionIsNotNull() {
-            addCriterion("version is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionEqualTo(String value) {
-            addCriterion("version =", value, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNotEqualTo(String value) {
-            addCriterion("version <>", value, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionGreaterThan(String value) {
-            addCriterion("version >", value, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionGreaterThanOrEqualTo(String value) {
-            addCriterion("version >=", value, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionLessThan(String value) {
-            addCriterion("version <", value, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionLessThanOrEqualTo(String value) {
-            addCriterion("version <=", value, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionLike(String value) {
-            addCriterion("version like", value, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNotLike(String value) {
-            addCriterion("version not like", value, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionIn(List<String> values) {
-            addCriterion("version in", values, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNotIn(List<String> values) {
-            addCriterion("version not in", values, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionBetween(String value1, String value2) {
-            addCriterion("version between", value1, value2, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNotBetween(String value1, String value2) {
-            addCriterion("version not between", value1, value2, "version");
-            return (Criteria) this;
-        }
-
         public Criteria andRefIdIsNull() {
             addCriterion("ref_id is null");
             return (Criteria) this;
diff --git a/backend/src/main/java/io/metersphere/base/mapper/LoadTestMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/LoadTestMapper.xml
index 5d39e2f982..19e314ab89 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/LoadTestMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/LoadTestMapper.xml
@@ -16,7 +16,6 @@
     <result column="scenario_version" jdbcType="INTEGER" property="scenarioVersion" />
     <result column="scenario_id" jdbcType="VARCHAR" property="scenarioId" />
     <result column="order" jdbcType="BIGINT" property="order" />
-    <result column="version" jdbcType="VARCHAR" property="version" />
     <result column="ref_id" jdbcType="VARCHAR" property="refId" />
     <result column="version_id" jdbcType="VARCHAR" property="versionId" />
     <result column="latest" jdbcType="BIT" property="latest" />
@@ -85,8 +84,8 @@
   </sql>
   <sql id="Base_Column_List">
     id, project_id, `name`, description, create_time, update_time, `status`, test_resource_pool_id, 
-    user_id, num, create_user, scenario_version, scenario_id, `order`, version, ref_id, 
-    version_id, latest
+    user_id, num, create_user, scenario_version, scenario_id, `order`, ref_id, version_id, 
+    latest
   </sql>
   <sql id="Blob_Column_List">
     load_configuration, advanced_configuration
@@ -144,18 +143,16 @@
       description, create_time, update_time, 
       `status`, test_resource_pool_id, user_id, 
       num, create_user, scenario_version, 
-      scenario_id, `order`, version, 
-      ref_id, version_id, latest, 
-      load_configuration, advanced_configuration
-      )
+      scenario_id, `order`, ref_id, 
+      version_id, latest, load_configuration, 
+      advanced_configuration)
     VALUES (#{id,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
       #{description,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
       #{status,jdbcType=VARCHAR}, #{testResourcePoolId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, 
       #{num,jdbcType=INTEGER}, #{createUser,jdbcType=VARCHAR}, #{scenarioVersion,jdbcType=INTEGER}, 
-      #{scenarioId,jdbcType=VARCHAR}, #{order,jdbcType=BIGINT}, #{version,jdbcType=VARCHAR}, 
-      #{refId,jdbcType=VARCHAR}, #{versionId,jdbcType=VARCHAR}, #{latest,jdbcType=BIT}, 
-      #{loadConfiguration,jdbcType=LONGVARCHAR}, #{advancedConfiguration,jdbcType=LONGVARCHAR}
-      )
+      #{scenarioId,jdbcType=VARCHAR}, #{order,jdbcType=BIGINT}, #{refId,jdbcType=VARCHAR}, 
+      #{versionId,jdbcType=VARCHAR}, #{latest,jdbcType=BIT}, #{loadConfiguration,jdbcType=LONGVARCHAR}, 
+      #{advancedConfiguration,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.LoadTestWithBLOBs">
     insert into load_test
@@ -202,9 +199,6 @@
       <if test="order != null">
         `order`,
       </if>
-      <if test="version != null">
-        version,
-      </if>
       <if test="refId != null">
         ref_id,
       </if>
@@ -264,9 +258,6 @@
       <if test="order != null">
         #{order,jdbcType=BIGINT},
       </if>
-      <if test="version != null">
-        #{version,jdbcType=VARCHAR},
-      </if>
       <if test="refId != null">
         #{refId,jdbcType=VARCHAR},
       </if>
@@ -335,9 +326,6 @@
       <if test="record.order != null">
         `order` = #{record.order,jdbcType=BIGINT},
       </if>
-      <if test="record.version != null">
-        version = #{record.version,jdbcType=VARCHAR},
-      </if>
       <if test="record.refId != null">
         ref_id = #{record.refId,jdbcType=VARCHAR},
       </if>
@@ -374,7 +362,6 @@
       scenario_version = #{record.scenarioVersion,jdbcType=INTEGER},
       scenario_id = #{record.scenarioId,jdbcType=VARCHAR},
       `order` = #{record.order,jdbcType=BIGINT},
-      version = #{record.version,jdbcType=VARCHAR},
       ref_id = #{record.refId,jdbcType=VARCHAR},
       version_id = #{record.versionId,jdbcType=VARCHAR},
       latest = #{record.latest,jdbcType=BIT},
@@ -400,7 +387,6 @@
       scenario_version = #{record.scenarioVersion,jdbcType=INTEGER},
       scenario_id = #{record.scenarioId,jdbcType=VARCHAR},
       `order` = #{record.order,jdbcType=BIGINT},
-      version = #{record.version,jdbcType=VARCHAR},
       ref_id = #{record.refId,jdbcType=VARCHAR},
       version_id = #{record.versionId,jdbcType=VARCHAR},
       latest = #{record.latest,jdbcType=BIT}
@@ -450,9 +436,6 @@
       <if test="order != null">
         `order` = #{order,jdbcType=BIGINT},
       </if>
-      <if test="version != null">
-        version = #{version,jdbcType=VARCHAR},
-      </if>
       <if test="refId != null">
         ref_id = #{refId,jdbcType=VARCHAR},
       </if>
@@ -486,7 +469,6 @@
       scenario_version = #{scenarioVersion,jdbcType=INTEGER},
       scenario_id = #{scenarioId,jdbcType=VARCHAR},
       `order` = #{order,jdbcType=BIGINT},
-      version = #{version,jdbcType=VARCHAR},
       ref_id = #{refId,jdbcType=VARCHAR},
       version_id = #{versionId,jdbcType=VARCHAR},
       latest = #{latest,jdbcType=BIT},
@@ -509,7 +491,6 @@
       scenario_version = #{scenarioVersion,jdbcType=INTEGER},
       scenario_id = #{scenarioId,jdbcType=VARCHAR},
       `order` = #{order,jdbcType=BIGINT},
-      version = #{version,jdbcType=VARCHAR},
       ref_id = #{refId,jdbcType=VARCHAR},
       version_id = #{versionId,jdbcType=VARCHAR},
       latest = #{latest,jdbcType=BIT}