diff --git a/backend/src/main/java/io/metersphere/base/domain/Project.java b/backend/src/main/java/io/metersphere/base/domain/Project.java index a83a00ebcb..36e46446d8 100644 --- a/backend/src/main/java/io/metersphere/base/domain/Project.java +++ b/backend/src/main/java/io/metersphere/base/domain/Project.java @@ -33,7 +33,7 @@ public class Project implements Serializable { private Boolean scenarioCustomNum; - private static final long serialVersionUID = 1L; + private String createUser; - private String protocal; + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/domain/ProjectExample.java b/backend/src/main/java/io/metersphere/base/domain/ProjectExample.java index 304be7d6e6..5df1d43561 100644 --- a/backend/src/main/java/io/metersphere/base/domain/ProjectExample.java +++ b/backend/src/main/java/io/metersphere/base/domain/ProjectExample.java @@ -1033,6 +1033,76 @@ public class ProjectExample { addCriterion("scenario_custom_num not between", value1, value2, "scenarioCustomNum"); return (Criteria) this; } + + public Criteria andCreateUserIsNull() { + addCriterion("create_user is null"); + return (Criteria) this; + } + + public Criteria andCreateUserIsNotNull() { + addCriterion("create_user is not null"); + return (Criteria) this; + } + + public Criteria andCreateUserEqualTo(String value) { + addCriterion("create_user =", value, "createUser"); + return (Criteria) this; + } + + public Criteria andCreateUserNotEqualTo(String value) { + addCriterion("create_user <>", value, "createUser"); + return (Criteria) this; + } + + public Criteria andCreateUserGreaterThan(String value) { + addCriterion("create_user >", value, "createUser"); + return (Criteria) this; + } + + public Criteria andCreateUserGreaterThanOrEqualTo(String value) { + addCriterion("create_user >=", value, "createUser"); + return (Criteria) this; + } + + public Criteria andCreateUserLessThan(String value) { + addCriterion("create_user <", value, "createUser"); + return (Criteria) this; + } + + public Criteria andCreateUserLessThanOrEqualTo(String value) { + addCriterion("create_user <=", value, "createUser"); + return (Criteria) this; + } + + public Criteria andCreateUserLike(String value) { + addCriterion("create_user like", value, "createUser"); + return (Criteria) this; + } + + public Criteria andCreateUserNotLike(String value) { + addCriterion("create_user not like", value, "createUser"); + return (Criteria) this; + } + + public Criteria andCreateUserIn(List values) { + addCriterion("create_user in", values, "createUser"); + return (Criteria) this; + } + + public Criteria andCreateUserNotIn(List values) { + addCriterion("create_user not in", values, "createUser"); + return (Criteria) this; + } + + public Criteria andCreateUserBetween(String value1, String value2) { + addCriterion("create_user between", value1, value2, "createUser"); + return (Criteria) this; + } + + public Criteria andCreateUserNotBetween(String value1, String value2) { + addCriterion("create_user not between", value1, value2, "createUser"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/src/main/java/io/metersphere/base/mapper/ProjectMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ProjectMapper.xml index 8e3c257961..2db25249ac 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ProjectMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ProjectMapper.xml @@ -16,6 +16,7 @@ + @@ -77,7 +78,8 @@ id, workspace_id, `name`, description, create_time, update_time, tapd_id, jira_key, - zentao_id, `repeatable`, case_template_id, issue_template_id, custom_num, scenario_custom_num + zentao_id, `repeatable`, case_template_id, issue_template_id, custom_num, scenario_custom_num, + create_user @@ -263,6 +273,9 @@ scenario_custom_num = #{record.scenarioCustomNum,jdbcType=BIT}, + + create_user = #{record.createUser,jdbcType=VARCHAR}, + @@ -283,7 +296,8 @@ case_template_id = #{record.caseTemplateId,jdbcType=VARCHAR}, issue_template_id = #{record.issueTemplateId,jdbcType=VARCHAR}, custom_num = #{record.customNum,jdbcType=BIT}, - scenario_custom_num = #{record.scenarioCustomNum,jdbcType=BIT} + scenario_custom_num = #{record.scenarioCustomNum,jdbcType=BIT}, + create_user = #{record.createUser,jdbcType=VARCHAR} @@ -330,6 +344,9 @@ scenario_custom_num = #{scenarioCustomNum,jdbcType=BIT}, + + create_user = #{createUser,jdbcType=VARCHAR}, + where id = #{id,jdbcType=VARCHAR} @@ -347,7 +364,8 @@ case_template_id = #{caseTemplateId,jdbcType=VARCHAR}, issue_template_id = #{issueTemplateId,jdbcType=VARCHAR}, custom_num = #{customNum,jdbcType=BIT}, - scenario_custom_num = #{scenarioCustomNum,jdbcType=BIT} + scenario_custom_num = #{scenarioCustomNum,jdbcType=BIT}, + create_user = #{createUser,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml index 2da6d2e5f2..3649e5836d 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml @@ -1,14 +1,65 @@ + + + + + + AND p.name + + + + + + AND p.update_time + + + + + + AND p.create_time + + + + + + AND p.create_user + + + + +