diff --git a/backend/framework/domain/src/main/java/io/metersphere/bug/domain/Bug.java b/backend/framework/domain/src/main/java/io/metersphere/bug/domain/Bug.java index bb2201aa4a..9ed6b7a85b 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/bug/domain/Bug.java +++ b/backend/framework/domain/src/main/java/io/metersphere/bug/domain/Bug.java @@ -14,64 +14,67 @@ import java.util.Arrays; @Data public class Bug implements Serializable { - @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{bug.id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{bug.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "业务ID") + @Schema(description = "业务ID") private Integer num; - @Schema(title = "缺陷标题", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "缺陷标题", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{bug.title.not_blank}", groups = {Created.class}) @Size(min = 1, max = 300, message = "{bug.title.length_range}", groups = {Created.class, Updated.class}) private String title; - @Schema(title = "指派人", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "指派人", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{bug.assign_user.not_blank}", groups = {Created.class}) @Size(min = 1, max = 50, message = "{bug.assign_user.length_range}", groups = {Created.class, Updated.class}) private String assignUser; - @Schema(title = "创建人") + @Schema(description = "创建人") private String createUser; - @Schema(title = "创建时间") + @Schema(description = "创建时间") private Long createTime; - @Schema(title = "更新时间") + @Schema(description = "更新人") + private String updateUser; + + @Schema(description = "更新时间") private Long updateTime; - @Schema(title = "删除人") + @Schema(description = "删除人") private String deleteUser; - @Schema(title = "删除时间") + @Schema(description = "删除时间") private Long deleteTime; - @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{bug.project_id.not_blank}", groups = {Created.class}) @Size(min = 1, max = 50, message = "{bug.project_id.length_range}", groups = {Created.class, Updated.class}) private String projectId; - @Schema(title = "模板ID") + @Schema(description = "模板ID") private String templateId; - @Schema(title = "缺陷平台", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "缺陷平台", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{bug.platform.not_blank}", groups = {Created.class}) @Size(min = 1, max = 50, message = "{bug.platform.length_range}", groups = {Created.class, Updated.class}) private String platform; - @Schema(title = "状态", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{bug.status.not_blank}", groups = {Created.class}) @Size(min = 1, max = 50, message = "{bug.status.length_range}", groups = {Created.class, Updated.class}) private String status; - @Schema(title = "标签") + @Schema(description = "标签") private String tag; - @Schema(title = "第三方平台缺陷ID") + @Schema(description = "第三方平台缺陷ID") private String platformBugId; - @Schema(title = "是否回收站", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "是否回收站", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "{bug.trash.not_blank}", groups = {Created.class}) private Boolean trash; @@ -84,6 +87,7 @@ public class Bug implements Serializable { assignUser("assign_user", "assignUser", "VARCHAR", false), createUser("create_user", "createUser", "VARCHAR", false), createTime("create_time", "createTime", "BIGINT", false), + updateUser("update_user", "updateUser", "VARCHAR", false), updateTime("update_time", "updateTime", "BIGINT", false), deleteUser("delete_user", "deleteUser", "VARCHAR", false), deleteTime("delete_time", "deleteTime", "BIGINT", false), diff --git a/backend/framework/domain/src/main/java/io/metersphere/bug/domain/BugExample.java b/backend/framework/domain/src/main/java/io/metersphere/bug/domain/BugExample.java index ba71289126..56a3932d9f 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/bug/domain/BugExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/bug/domain/BugExample.java @@ -504,6 +504,76 @@ public class BugExample { return (Criteria) this; } + public Criteria andUpdateUserIsNull() { + addCriterion("update_user is null"); + return (Criteria) this; + } + + public Criteria andUpdateUserIsNotNull() { + addCriterion("update_user is not null"); + return (Criteria) this; + } + + public Criteria andUpdateUserEqualTo(String value) { + addCriterion("update_user =", value, "updateUser"); + return (Criteria) this; + } + + public Criteria andUpdateUserNotEqualTo(String value) { + addCriterion("update_user <>", value, "updateUser"); + return (Criteria) this; + } + + public Criteria andUpdateUserGreaterThan(String value) { + addCriterion("update_user >", value, "updateUser"); + return (Criteria) this; + } + + public Criteria andUpdateUserGreaterThanOrEqualTo(String value) { + addCriterion("update_user >=", value, "updateUser"); + return (Criteria) this; + } + + public Criteria andUpdateUserLessThan(String value) { + addCriterion("update_user <", value, "updateUser"); + return (Criteria) this; + } + + public Criteria andUpdateUserLessThanOrEqualTo(String value) { + addCriterion("update_user <=", value, "updateUser"); + return (Criteria) this; + } + + public Criteria andUpdateUserLike(String value) { + addCriterion("update_user like", value, "updateUser"); + return (Criteria) this; + } + + public Criteria andUpdateUserNotLike(String value) { + addCriterion("update_user not like", value, "updateUser"); + return (Criteria) this; + } + + public Criteria andUpdateUserIn(List values) { + addCriterion("update_user in", values, "updateUser"); + return (Criteria) this; + } + + public Criteria andUpdateUserNotIn(List values) { + addCriterion("update_user not in", values, "updateUser"); + return (Criteria) this; + } + + public Criteria andUpdateUserBetween(String value1, String value2) { + addCriterion("update_user between", value1, value2, "updateUser"); + return (Criteria) this; + } + + public Criteria andUpdateUserNotBetween(String value1, String value2) { + addCriterion("update_user not between", value1, value2, "updateUser"); + return (Criteria) this; + } + public Criteria andUpdateTimeIsNull() { addCriterion("update_time is null"); return (Criteria) this; diff --git a/backend/framework/domain/src/main/java/io/metersphere/bug/mapper/BugMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/bug/mapper/BugMapper.xml index 6592c3a2e1..711a892d47 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/bug/mapper/BugMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/bug/mapper/BugMapper.xml @@ -8,6 +8,7 @@ + @@ -78,8 +79,9 @@ - id, num, title, assign_user, create_user, create_time, update_time, delete_user, - delete_time, project_id, template_id, platform, `status`, tag, platform_bug_id, trash + id, num, title, assign_user, create_user, create_time, update_user, update_time, + delete_user, delete_time, project_id, template_id, platform, `status`, tag, platform_bug_id, + trash