diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiScenario.java b/backend/src/main/java/io/metersphere/base/domain/ApiScenario.java index 2809346efc..c2af6b66d1 100644 --- a/backend/src/main/java/io/metersphere/base/domain/ApiScenario.java +++ b/backend/src/main/java/io/metersphere/base/domain/ApiScenario.java @@ -28,8 +28,6 @@ public class ApiScenario implements Serializable { private Integer stepTotal; - private String followPeople; - private String schedule; private Long createTime; diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiScenarioExample.java b/backend/src/main/java/io/metersphere/base/domain/ApiScenarioExample.java index 7475ef3d4c..7b3206ff95 100644 --- a/backend/src/main/java/io/metersphere/base/domain/ApiScenarioExample.java +++ b/backend/src/main/java/io/metersphere/base/domain/ApiScenarioExample.java @@ -864,76 +864,6 @@ public class ApiScenarioExample { return (Criteria) this; } - public Criteria andFollowPeopleIsNull() { - addCriterion("follow_people is null"); - return (Criteria) this; - } - - public Criteria andFollowPeopleIsNotNull() { - addCriterion("follow_people is not null"); - return (Criteria) this; - } - - public Criteria andFollowPeopleEqualTo(String value) { - addCriterion("follow_people =", value, "followPeople"); - return (Criteria) this; - } - - public Criteria andFollowPeopleNotEqualTo(String value) { - addCriterion("follow_people <>", value, "followPeople"); - return (Criteria) this; - } - - public Criteria andFollowPeopleGreaterThan(String value) { - addCriterion("follow_people >", value, "followPeople"); - return (Criteria) this; - } - - public Criteria andFollowPeopleGreaterThanOrEqualTo(String value) { - addCriterion("follow_people >=", value, "followPeople"); - return (Criteria) this; - } - - public Criteria andFollowPeopleLessThan(String value) { - addCriterion("follow_people <", value, "followPeople"); - return (Criteria) this; - } - - public Criteria andFollowPeopleLessThanOrEqualTo(String value) { - addCriterion("follow_people <=", value, "followPeople"); - return (Criteria) this; - } - - public Criteria andFollowPeopleLike(String value) { - addCriterion("follow_people like", value, "followPeople"); - return (Criteria) this; - } - - public Criteria andFollowPeopleNotLike(String value) { - addCriterion("follow_people not like", value, "followPeople"); - return (Criteria) this; - } - - public Criteria andFollowPeopleIn(List values) { - addCriterion("follow_people in", values, "followPeople"); - return (Criteria) this; - } - - public Criteria andFollowPeopleNotIn(List values) { - addCriterion("follow_people not in", values, "followPeople"); - return (Criteria) this; - } - - public Criteria andFollowPeopleBetween(String value1, String value2) { - addCriterion("follow_people between", value1, value2, "followPeople"); - return (Criteria) this; - } - - public Criteria andFollowPeopleNotBetween(String value1, String value2) { - addCriterion("follow_people not between", value1, value2, "followPeople"); - return (Criteria) this; - } - public Criteria andScheduleIsNull() { addCriterion("schedule is null"); return (Criteria) this; diff --git a/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioMapper.xml index 5ba7ea25f6..12fcc980cd 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ApiScenarioMapper.xml @@ -13,7 +13,6 @@ - @@ -101,10 +100,10 @@ id, project_id, tags, user_id, api_scenario_module_id, module_path, `name`, `level`, - `status`, principal, step_total, follow_people, schedule, create_time, update_time, - pass_rate, last_result, report_id, num, original_state, custom_num, create_user, - version, delete_time, delete_user_id, execute_times, `order`, environment_type, environment_group_id, - version_id, ref_id, latest + `status`, principal, step_total, schedule, create_time, update_time, pass_rate, last_result, + report_id, num, original_state, custom_num, create_user, version, delete_time, delete_user_id, + execute_times, `order`, environment_type, environment_group_id, version_id, ref_id, + latest scenario_definition, description, use_url, environment_json @@ -161,29 +160,27 @@ INSERT INTO api_scenario (id, project_id, tags, user_id, api_scenario_module_id, module_path, `name`, `level`, `status`, - principal, step_total, follow_people, - schedule, create_time, update_time, - pass_rate, last_result, report_id, - num, original_state, custom_num, - create_user, version, delete_time, - delete_user_id, execute_times, `order`, - environment_type, environment_group_id, version_id, - ref_id, latest, scenario_definition, - description, use_url, environment_json - ) + principal, step_total, schedule, + create_time, update_time, pass_rate, + last_result, report_id, num, + original_state, custom_num, create_user, + version, delete_time, delete_user_id, + execute_times, `order`, environment_type, + environment_group_id, version_id, ref_id, + latest, scenario_definition, description, + use_url, environment_json) VALUES (#{id,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{tags,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{apiScenarioModuleId,jdbcType=VARCHAR}, #{modulePath,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{level,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, - #{principal,jdbcType=VARCHAR}, #{stepTotal,jdbcType=INTEGER}, #{followPeople,jdbcType=VARCHAR}, - #{schedule,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, - #{passRate,jdbcType=VARCHAR}, #{lastResult,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR}, - #{num,jdbcType=INTEGER}, #{originalState,jdbcType=VARCHAR}, #{customNum,jdbcType=VARCHAR}, - #{createUser,jdbcType=VARCHAR}, #{version,jdbcType=INTEGER}, #{deleteTime,jdbcType=BIGINT}, - #{deleteUserId,jdbcType=VARCHAR}, #{executeTimes,jdbcType=INTEGER}, #{order,jdbcType=BIGINT}, - #{environmentType,jdbcType=VARCHAR}, #{environmentGroupId,jdbcType=VARCHAR}, #{versionId,jdbcType=VARCHAR}, - #{refId,jdbcType=VARCHAR}, #{latest,jdbcType=BIT}, #{scenarioDefinition,jdbcType=LONGVARCHAR}, - #{description,jdbcType=LONGVARCHAR}, #{useUrl,jdbcType=LONGVARCHAR}, #{environmentJson,jdbcType=LONGVARCHAR} - ) + #{principal,jdbcType=VARCHAR}, #{stepTotal,jdbcType=INTEGER}, #{schedule,jdbcType=VARCHAR}, + #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{passRate,jdbcType=VARCHAR}, + #{lastResult,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR}, #{num,jdbcType=INTEGER}, + #{originalState,jdbcType=VARCHAR}, #{customNum,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, + #{version,jdbcType=INTEGER}, #{deleteTime,jdbcType=BIGINT}, #{deleteUserId,jdbcType=VARCHAR}, + #{executeTimes,jdbcType=INTEGER}, #{order,jdbcType=BIGINT}, #{environmentType,jdbcType=VARCHAR}, + #{environmentGroupId,jdbcType=VARCHAR}, #{versionId,jdbcType=VARCHAR}, #{refId,jdbcType=VARCHAR}, + #{latest,jdbcType=BIT}, #{scenarioDefinition,jdbcType=LONGVARCHAR}, #{description,jdbcType=LONGVARCHAR}, + #{useUrl,jdbcType=LONGVARCHAR}, #{environmentJson,jdbcType=LONGVARCHAR}) insert into api_scenario @@ -221,9 +218,6 @@ step_total, - - follow_people, - schedule, @@ -331,9 +325,6 @@ #{stepTotal,jdbcType=INTEGER}, - - #{followPeople,jdbcType=VARCHAR}, - #{schedule,jdbcType=VARCHAR}, @@ -450,9 +441,6 @@ step_total = #{record.stepTotal,jdbcType=INTEGER}, - - follow_people = #{record.followPeople,jdbcType=VARCHAR}, - schedule = #{record.schedule,jdbcType=VARCHAR}, @@ -543,7 +531,6 @@ `status` = #{record.status,jdbcType=VARCHAR}, principal = #{record.principal,jdbcType=VARCHAR}, step_total = #{record.stepTotal,jdbcType=INTEGER}, - follow_people = #{record.followPeople,jdbcType=VARCHAR}, schedule = #{record.schedule,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=BIGINT}, update_time = #{record.updateTime,jdbcType=BIGINT}, @@ -585,7 +572,6 @@ `status` = #{record.status,jdbcType=VARCHAR}, principal = #{record.principal,jdbcType=VARCHAR}, step_total = #{record.stepTotal,jdbcType=INTEGER}, - follow_people = #{record.followPeople,jdbcType=VARCHAR}, schedule = #{record.schedule,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=BIGINT}, update_time = #{record.updateTime,jdbcType=BIGINT}, @@ -643,9 +629,6 @@ step_total = #{stepTotal,jdbcType=INTEGER}, - - follow_people = #{followPeople,jdbcType=VARCHAR}, - schedule = #{schedule,jdbcType=VARCHAR}, @@ -733,7 +716,6 @@ `status` = #{status,jdbcType=VARCHAR}, principal = #{principal,jdbcType=VARCHAR}, step_total = #{stepTotal,jdbcType=INTEGER}, - follow_people = #{followPeople,jdbcType=VARCHAR}, schedule = #{schedule,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=BIGINT}, update_time = #{updateTime,jdbcType=BIGINT}, @@ -772,7 +754,6 @@ `status` = #{status,jdbcType=VARCHAR}, principal = #{principal,jdbcType=VARCHAR}, step_total = #{stepTotal,jdbcType=INTEGER}, - follow_people = #{followPeople,jdbcType=VARCHAR}, schedule = #{schedule,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=BIGINT}, update_time = #{updateTime,jdbcType=BIGINT},