diff --git a/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCase.java b/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCase.java index 4fa26c0f5a..88a7a50859 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCase.java +++ b/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCase.java @@ -22,11 +22,6 @@ public class FunctionalCase implements Serializable { @Size(min = 1, max = 10, message = "{functional_case.num.length_range}", groups = {Created.class, Updated.class}) private Integer num; - @Schema(description = "自定义业务ID", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{functional_case.custom_num.not_blank}", groups = {Created.class}) - @Size(min = 1, max = 64, message = "{functional_case.custom_num.length_range}", groups = {Created.class, Updated.class}) - private String customNum; - @Schema(description = "模块ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{functional_case.module_id.not_blank}", groups = {Created.class}) @Size(min = 1, max = 50, message = "{functional_case.module_id.length_range}", groups = {Created.class, Updated.class}) @@ -37,6 +32,11 @@ public class FunctionalCase implements Serializable { @Size(min = 1, max = 50, message = "{functional_case.project_id.length_range}", groups = {Created.class, Updated.class}) private String projectId; + @Schema(description = "模板ID", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{functional_case.template_id.not_blank}", groups = {Created.class}) + @Size(min = 1, max = 50, message = "{functional_case.template_id.length_range}", groups = {Created.class, Updated.class}) + private String templateId; + @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{functional_case.name.not_blank}", groups = {Created.class}) @Size(min = 1, max = 255, message = "{functional_case.name.length_range}", groups = {Created.class, Updated.class}) @@ -51,9 +51,9 @@ public class FunctionalCase implements Serializable { private String tags; @Schema(description = "编辑模式：步骤模式/文本模式", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{functional_case.case_model.not_blank}", groups = {Created.class}) - @Size(min = 1, max = 50, message = "{functional_case.case_model.length_range}", groups = {Created.class, Updated.class}) - private String caseModel; + @NotBlank(message = "{functional_case.case_edit_type.not_blank}", groups = {Created.class}) + @Size(min = 1, max = 50, message = "{functional_case.case_edit_type.length_range}", groups = {Created.class, Updated.class}) + private String caseEditType; @Schema(description = "自定义排序，间隔5000", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{functional_case.pos.not_blank}", groups = {Created.class}) @@ -113,13 +113,13 @@ public class FunctionalCase implements Serializable { public enum Column { id("id", "id", "VARCHAR", false), num("num", "num", "INTEGER", false), - customNum("custom_num", "customNum", "VARCHAR", false), moduleId("module_id", "moduleId", "VARCHAR", false), projectId("project_id", "projectId", "VARCHAR", false), + templateId("template_id", "templateId", "VARCHAR", false), name("name", "name", "VARCHAR", true), reviewStatus("review_status", "reviewStatus", "VARCHAR", false), tags("tags", "tags", "VARCHAR", false), - caseModel("case_model", "caseModel", "VARCHAR", false), + caseEditType("case_edit_type", "caseEditType", "VARCHAR", false), pos("pos", "pos", "BIGINT", false), versionId("version_id", "versionId", "VARCHAR", false), refId("ref_id", "refId", "VARCHAR", false), diff --git a/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseAttachment.java b/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseAttachment.java index 49eaaa8649..629ab703ad 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseAttachment.java +++ b/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseAttachment.java @@ -22,11 +22,43 @@ public class FunctionalCaseAttachment implements Serializable { @Size(min = 1, max = 50, message = "{functional_case_attachment.file_id.length_range}", groups = {Created.class, Updated.class}) private String fileId; + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{functional_case_attachment.id.not_blank}", groups = {Updated.class}) + @Size(min = 1, max = 50, message = "{functional_case_attachment.id.length_range}", groups = {Created.class, Updated.class}) + private String id; + + @Schema(description = "文件名称", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{functional_case_attachment.file_name.not_blank}", groups = {Created.class}) + @Size(min = 1, max = 255, message = "{functional_case_attachment.file_name.length_range}", groups = {Created.class, Updated.class}) + private String fileName; + + @Schema(description = "文件大小", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{functional_case_attachment.size.not_blank}", groups = {Created.class}) + @Size(min = 1, max = 19, message = "{functional_case_attachment.size.length_range}", groups = {Created.class, Updated.class}) + private Long size; + + @Schema(description = "是否本地", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{functional_case_attachment.local.not_blank}", groups = {Created.class}) + @Size(min = 1, max = 1, message = "{functional_case_attachment.local.length_range}", groups = {Created.class, Updated.class}) + private Boolean local; + + @Schema(description = "创建人") + private String createUser; + + @Schema(description = "创建时间") + private Long createTime; + private static final long serialVersionUID = 1L; public enum Column { caseId("case_id", "caseId", "VARCHAR", false), - fileId("file_id", "fileId", "VARCHAR", false); + fileId("file_id", "fileId", "VARCHAR", false), + id("id", "id", "VARCHAR", false), + fileName("file_name", "fileName", "VARCHAR", false), + size("size", "size", "BIGINT", true), + local("local", "local", "BIT", true), + createUser("create_user", "createUser", "VARCHAR", false), + createTime("create_time", "createTime", "BIGINT", false); private static final String BEGINNING_DELIMITER = "`"; diff --git a/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseAttachmentExample.java b/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseAttachmentExample.java index d705e33de2..5ae31977f6 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseAttachmentExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseAttachmentExample.java @@ -243,6 +243,396 @@ public class FunctionalCaseAttachmentExample { addCriterion("file_id not between", value1, value2, "fileId"); return (Criteria) this; } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(String value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(String value1, String value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andFileNameIsNull() { + addCriterion("file_name is null"); + return (Criteria) this; + } + + public Criteria andFileNameIsNotNull() { + addCriterion("file_name is not null"); + return (Criteria) this; + } + + public Criteria andFileNameEqualTo(String value) { + addCriterion("file_name =", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameNotEqualTo(String value) { + addCriterion("file_name <>", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameGreaterThan(String value) { + addCriterion("file_name >", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameGreaterThanOrEqualTo(String value) { + addCriterion("file_name >=", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameLessThan(String value) { + addCriterion("file_name <", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameLessThanOrEqualTo(String value) { + addCriterion("file_name <=", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameLike(String value) { + addCriterion("file_name like", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameNotLike(String value) { + addCriterion("file_name not like", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameIn(List values) { + addCriterion("file_name in", values, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameNotIn(List values) { + addCriterion("file_name not in", values, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameBetween(String value1, String value2) { + addCriterion("file_name between", value1, value2, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameNotBetween(String value1, String value2) { + addCriterion("file_name not between", value1, value2, "fileName"); + return (Criteria) this; + } + + public Criteria andSizeIsNull() { + addCriterion("`size` is null"); + return (Criteria) this; + } + + public Criteria andSizeIsNotNull() { + addCriterion("`size` is not null"); + return (Criteria) this; + } + + public Criteria andSizeEqualTo(Long value) { + addCriterion("`size` =", value, "size"); + return (Criteria) this; + } + + public Criteria andSizeNotEqualTo(Long value) { + addCriterion("`size` <>", value, "size"); + return (Criteria) this; + } + + public Criteria andSizeGreaterThan(Long value) { + addCriterion("`size` >", value, "size"); + return (Criteria) this; + } + + public Criteria andSizeGreaterThanOrEqualTo(Long value) { + addCriterion("`size` >=", value, "size"); + return (Criteria) this; + } + + public Criteria andSizeLessThan(Long value) { + addCriterion("`size` <", value, "size"); + return (Criteria) this; + } + + public Criteria andSizeLessThanOrEqualTo(Long value) { + addCriterion("`size` <=", value, "size"); + return (Criteria) this; + } + + public Criteria andSizeIn(List values) { + addCriterion("`size` in", values, "size"); + return (Criteria) this; + } + + public Criteria andSizeNotIn(List values) { + addCriterion("`size` not in", values, "size"); + return (Criteria) this; + } + + public Criteria andSizeBetween(Long value1, Long value2) { + addCriterion("`size` between", value1, value2, "size"); + return (Criteria) this; + } + + public Criteria andSizeNotBetween(Long value1, Long value2) { + addCriterion("`size` not between", value1, value2, "size"); + return (Criteria) this; + } + + public Criteria andLocalIsNull() { + addCriterion("`local` is null"); + return (Criteria) this; + } + + public Criteria andLocalIsNotNull() { + addCriterion("`local` is not null"); + return (Criteria) this; + } + + public Criteria andLocalEqualTo(Boolean value) { + addCriterion("`local` =", value, "local"); + return (Criteria) this; + } + + public Criteria andLocalNotEqualTo(Boolean value) { + addCriterion("`local` <>", value, "local"); + return (Criteria) this; + } + + public Criteria andLocalGreaterThan(Boolean value) { + addCriterion("`local` >", value, "local"); + return (Criteria) this; + } + + public Criteria andLocalGreaterThanOrEqualTo(Boolean value) { + addCriterion("`local` >=", value, "local"); + return (Criteria) this; + } + + public Criteria andLocalLessThan(Boolean value) { + addCriterion("`local` <", value, "local"); + return (Criteria) this; + } + + public Criteria andLocalLessThanOrEqualTo(Boolean value) { + addCriterion("`local` <=", value, "local"); + return (Criteria) this; + } + + public Criteria andLocalIn(List values) { + addCriterion("`local` in", values, "local"); + return (Criteria) this; + } + + public Criteria andLocalNotIn(List values) { + addCriterion("`local` not in", values, "local"); + return (Criteria) this; + } + + public Criteria andLocalBetween(Boolean value1, Boolean value2) { + addCriterion("`local` between", value1, value2, "local"); + return (Criteria) this; + } + + public Criteria andLocalNotBetween(Boolean value1, Boolean value2) { + addCriterion("`local` not between", value1, value2, "local"); + 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 Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Long value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Long value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Long value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Long value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Long value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Long value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Long value1, Long value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Long value1, Long value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseComment.java b/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseComment.java index e6f7680c04..acbb1ab24e 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseComment.java +++ b/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseComment.java @@ -33,8 +33,17 @@ public class FunctionalCaseComment implements Serializable { @Size(min = 1, max = 64, message = "{functional_case_comment.type.length_range}", groups = {Created.class, Updated.class}) private String type; - @Schema(description = "评审ID") - private String belongId; + @Schema(description = "父评论ID") + private String parentId; + + @Schema(description = "资源ID: 评审ID/测试计划ID") + private String resourceId; + + @Schema(description = "通知人") + private String notifier; + + @Schema(description = "回复人") + private String replyUser; @Schema(description = "创建时间") private Long createTime; @@ -42,16 +51,9 @@ public class FunctionalCaseComment implements Serializable { @Schema(description = "更新时间") private Long updateTime; - @Schema(description = "回复人") - private String replyUser; - - @Schema(description = "父评论id") - private String parentId; - @Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{functional_case_comment.description.not_blank}", groups = {Created.class}) - @Size(min = 1, max = 65535, message = "{functional_case_comment.description.length_range}", groups = {Created.class, Updated.class}) - private String description; + @NotBlank(message = "{functional_case_comment.content.not_blank}", groups = {Created.class}) + private String content; private static final long serialVersionUID = 1L; @@ -61,12 +63,13 @@ public class FunctionalCaseComment implements Serializable { createUser("create_user", "createUser", "VARCHAR", false), status("status", "status", "VARCHAR", true), type("type", "type", "VARCHAR", true), - belongId("belong_id", "belongId", "VARCHAR", false), + parentId("parent_id", "parentId", "VARCHAR", false), + resourceId("resource_id", "resourceId", "VARCHAR", false), + notifier("notifier", "notifier", "VARCHAR", false), + replyUser("reply_user", "replyUser", "VARCHAR", false), createTime("create_time", "createTime", "BIGINT", false), updateTime("update_time", "updateTime", "BIGINT", false), - replyUser("reply_user", "replyUser", "VARCHAR", false), - parentId("parent_id", "parentId", "VARCHAR", false), - description("description", "description", "LONGVARCHAR", false); + content("content", "content", "LONGVARCHAR", false); private static final String BEGINNING_DELIMITER = "`"; diff --git a/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseCommentExample.java b/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseCommentExample.java index 580c789606..1612bde850 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseCommentExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseCommentExample.java @@ -454,73 +454,283 @@ public class FunctionalCaseCommentExample { return (Criteria) this; } - public Criteria andBelongIdIsNull() { - addCriterion("belong_id is null"); + public Criteria andParentIdIsNull() { + addCriterion("parent_id is null"); return (Criteria) this; } - public Criteria andBelongIdIsNotNull() { - addCriterion("belong_id is not null"); + public Criteria andParentIdIsNotNull() { + addCriterion("parent_id is not null"); return (Criteria) this; } - public Criteria andBelongIdEqualTo(String value) { - addCriterion("belong_id =", value, "belongId"); + public Criteria andParentIdEqualTo(String value) { + addCriterion("parent_id =", value, "parentId"); return (Criteria) this; } - public Criteria andBelongIdNotEqualTo(String value) { - addCriterion("belong_id <>", value, "belongId"); + public Criteria andParentIdNotEqualTo(String value) { + addCriterion("parent_id <>", value, "parentId"); return (Criteria) this; } - public Criteria andBelongIdGreaterThan(String value) { - addCriterion("belong_id >", value, "belongId"); + public Criteria andParentIdGreaterThan(String value) { + addCriterion("parent_id >", value, "parentId"); return (Criteria) this; } - public Criteria andBelongIdGreaterThanOrEqualTo(String value) { - addCriterion("belong_id >=", value, "belongId"); + public Criteria andParentIdGreaterThanOrEqualTo(String value) { + addCriterion("parent_id >=", value, "parentId"); return (Criteria) this; } - public Criteria andBelongIdLessThan(String value) { - addCriterion("belong_id <", value, "belongId"); + public Criteria andParentIdLessThan(String value) { + addCriterion("parent_id <", value, "parentId"); return (Criteria) this; } - public Criteria andBelongIdLessThanOrEqualTo(String value) { - addCriterion("belong_id <=", value, "belongId"); + public Criteria andParentIdLessThanOrEqualTo(String value) { + addCriterion("parent_id <=", value, "parentId"); return (Criteria) this; } - public Criteria andBelongIdLike(String value) { - addCriterion("belong_id like", value, "belongId"); + public Criteria andParentIdLike(String value) { + addCriterion("parent_id like", value, "parentId"); return (Criteria) this; } - public Criteria andBelongIdNotLike(String value) { - addCriterion("belong_id not like", value, "belongId"); + public Criteria andParentIdNotLike(String value) { + addCriterion("parent_id not like", value, "parentId"); return (Criteria) this; } - public Criteria andBelongIdIn(List values) { - addCriterion("belong_id in", values, "belongId"); + public Criteria andParentIdIn(List values) { + addCriterion("parent_id in", values, "parentId"); return (Criteria) this; } - public Criteria andBelongIdNotIn(List values) { - addCriterion("belong_id not in", values, "belongId"); + public Criteria andParentIdNotIn(List values) { + addCriterion("parent_id not in", values, "parentId"); return (Criteria) this; } - public Criteria andBelongIdBetween(String value1, String value2) { - addCriterion("belong_id between", value1, value2, "belongId"); + public Criteria andParentIdBetween(String value1, String value2) { + addCriterion("parent_id between", value1, value2, "parentId"); return (Criteria) this; } - public Criteria andBelongIdNotBetween(String value1, String value2) { - addCriterion("belong_id not between", value1, value2, "belongId"); + public Criteria andParentIdNotBetween(String value1, String value2) { + addCriterion("parent_id not between", value1, value2, "parentId"); + return (Criteria) this; + } + + public Criteria andResourceIdIsNull() { + addCriterion("resource_id is null"); + return (Criteria) this; + } + + public Criteria andResourceIdIsNotNull() { + addCriterion("resource_id is not null"); + return (Criteria) this; + } + + public Criteria andResourceIdEqualTo(String value) { + addCriterion("resource_id =", value, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdNotEqualTo(String value) { + addCriterion("resource_id <>", value, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdGreaterThan(String value) { + addCriterion("resource_id >", value, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdGreaterThanOrEqualTo(String value) { + addCriterion("resource_id >=", value, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdLessThan(String value) { + addCriterion("resource_id <", value, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdLessThanOrEqualTo(String value) { + addCriterion("resource_id <=", value, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdLike(String value) { + addCriterion("resource_id like", value, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdNotLike(String value) { + addCriterion("resource_id not like", value, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdIn(List values) { + addCriterion("resource_id in", values, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdNotIn(List values) { + addCriterion("resource_id not in", values, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdBetween(String value1, String value2) { + addCriterion("resource_id between", value1, value2, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdNotBetween(String value1, String value2) { + addCriterion("resource_id not between", value1, value2, "resourceId"); + return (Criteria) this; + } + + public Criteria andNotifierIsNull() { + addCriterion("notifier is null"); + return (Criteria) this; + } + + public Criteria andNotifierIsNotNull() { + addCriterion("notifier is not null"); + return (Criteria) this; + } + + public Criteria andNotifierEqualTo(String value) { + addCriterion("notifier =", value, "notifier"); + return (Criteria) this; + } + + public Criteria andNotifierNotEqualTo(String value) { + addCriterion("notifier <>", value, "notifier"); + return (Criteria) this; + } + + public Criteria andNotifierGreaterThan(String value) { + addCriterion("notifier >", value, "notifier"); + return (Criteria) this; + } + + public Criteria andNotifierGreaterThanOrEqualTo(String value) { + addCriterion("notifier >=", value, "notifier"); + return (Criteria) this; + } + + public Criteria andNotifierLessThan(String value) { + addCriterion("notifier <", value, "notifier"); + return (Criteria) this; + } + + public Criteria andNotifierLessThanOrEqualTo(String value) { + addCriterion("notifier <=", value, "notifier"); + return (Criteria) this; + } + + public Criteria andNotifierLike(String value) { + addCriterion("notifier like", value, "notifier"); + return (Criteria) this; + } + + public Criteria andNotifierNotLike(String value) { + addCriterion("notifier not like", value, "notifier"); + return (Criteria) this; + } + + public Criteria andNotifierIn(List values) { + addCriterion("notifier in", values, "notifier"); + return (Criteria) this; + } + + public Criteria andNotifierNotIn(List values) { + addCriterion("notifier not in", values, "notifier"); + return (Criteria) this; + } + + public Criteria andNotifierBetween(String value1, String value2) { + addCriterion("notifier between", value1, value2, "notifier"); + return (Criteria) this; + } + + public Criteria andNotifierNotBetween(String value1, String value2) { + addCriterion("notifier not between", value1, value2, "notifier"); + return (Criteria) this; + } + + public Criteria andReplyUserIsNull() { + addCriterion("reply_user is null"); + return (Criteria) this; + } + + public Criteria andReplyUserIsNotNull() { + addCriterion("reply_user is not null"); + return (Criteria) this; + } + + public Criteria andReplyUserEqualTo(String value) { + addCriterion("reply_user =", value, "replyUser"); + return (Criteria) this; + } + + public Criteria andReplyUserNotEqualTo(String value) { + addCriterion("reply_user <>", value, "replyUser"); + return (Criteria) this; + } + + public Criteria andReplyUserGreaterThan(String value) { + addCriterion("reply_user >", value, "replyUser"); + return (Criteria) this; + } + + public Criteria andReplyUserGreaterThanOrEqualTo(String value) { + addCriterion("reply_user >=", value, "replyUser"); + return (Criteria) this; + } + + public Criteria andReplyUserLessThan(String value) { + addCriterion("reply_user <", value, "replyUser"); + return (Criteria) this; + } + + public Criteria andReplyUserLessThanOrEqualTo(String value) { + addCriterion("reply_user <=", value, "replyUser"); + return (Criteria) this; + } + + public Criteria andReplyUserLike(String value) { + addCriterion("reply_user like", value, "replyUser"); + return (Criteria) this; + } + + public Criteria andReplyUserNotLike(String value) { + addCriterion("reply_user not like", value, "replyUser"); + return (Criteria) this; + } + + public Criteria andReplyUserIn(List values) { + addCriterion("reply_user in", values, "replyUser"); + return (Criteria) this; + } + + public Criteria andReplyUserNotIn(List values) { + addCriterion("reply_user not in", values, "replyUser"); + return (Criteria) this; + } + + public Criteria andReplyUserBetween(String value1, String value2) { + addCriterion("reply_user between", value1, value2, "replyUser"); + return (Criteria) this; + } + + public Criteria andReplyUserNotBetween(String value1, String value2) { + addCriterion("reply_user not between", value1, value2, "replyUser"); return (Criteria) this; } @@ -643,146 +853,6 @@ public class FunctionalCaseCommentExample { addCriterion("update_time not between", value1, value2, "updateTime"); return (Criteria) this; } - - public Criteria andReplyUserIsNull() { - addCriterion("reply_user is null"); - return (Criteria) this; - } - - public Criteria andReplyUserIsNotNull() { - addCriterion("reply_user is not null"); - return (Criteria) this; - } - - public Criteria andReplyUserEqualTo(String value) { - addCriterion("reply_user =", value, "replyUser"); - return (Criteria) this; - } - - public Criteria andReplyUserNotEqualTo(String value) { - addCriterion("reply_user <>", value, "replyUser"); - return (Criteria) this; - } - - public Criteria andReplyUserGreaterThan(String value) { - addCriterion("reply_user >", value, "replyUser"); - return (Criteria) this; - } - - public Criteria andReplyUserGreaterThanOrEqualTo(String value) { - addCriterion("reply_user >=", value, "replyUser"); - return (Criteria) this; - } - - public Criteria andReplyUserLessThan(String value) { - addCriterion("reply_user <", value, "replyUser"); - return (Criteria) this; - } - - public Criteria andReplyUserLessThanOrEqualTo(String value) { - addCriterion("reply_user <=", value, "replyUser"); - return (Criteria) this; - } - - public Criteria andReplyUserLike(String value) { - addCriterion("reply_user like", value, "replyUser"); - return (Criteria) this; - } - - public Criteria andReplyUserNotLike(String value) { - addCriterion("reply_user not like", value, "replyUser"); - return (Criteria) this; - } - - public Criteria andReplyUserIn(List values) { - addCriterion("reply_user in", values, "replyUser"); - return (Criteria) this; - } - - public Criteria andReplyUserNotIn(List values) { - addCriterion("reply_user not in", values, "replyUser"); - return (Criteria) this; - } - - public Criteria andReplyUserBetween(String value1, String value2) { - addCriterion("reply_user between", value1, value2, "replyUser"); - return (Criteria) this; - } - - public Criteria andReplyUserNotBetween(String value1, String value2) { - addCriterion("reply_user not between", value1, value2, "replyUser"); - return (Criteria) this; - } - - public Criteria andParentIdIsNull() { - addCriterion("parent_id is null"); - return (Criteria) this; - } - - public Criteria andParentIdIsNotNull() { - addCriterion("parent_id is not null"); - return (Criteria) this; - } - - public Criteria andParentIdEqualTo(String value) { - addCriterion("parent_id =", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdNotEqualTo(String value) { - addCriterion("parent_id <>", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdGreaterThan(String value) { - addCriterion("parent_id >", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdGreaterThanOrEqualTo(String value) { - addCriterion("parent_id >=", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdLessThan(String value) { - addCriterion("parent_id <", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdLessThanOrEqualTo(String value) { - addCriterion("parent_id <=", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdLike(String value) { - addCriterion("parent_id like", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdNotLike(String value) { - addCriterion("parent_id not like", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdIn(List values) { - addCriterion("parent_id in", values, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdNotIn(List values) { - addCriterion("parent_id not in", values, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdBetween(String value1, String value2) { - addCriterion("parent_id between", value1, value2, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdNotBetween(String value1, String value2) { - addCriterion("parent_id not between", value1, value2, "parentId"); - return (Criteria) this; - } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseExample.java b/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseExample.java index 07964bd02b..25e5a4c6ba 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseExample.java @@ -234,76 +234,6 @@ public class FunctionalCaseExample { return (Criteria) this; } - public Criteria andCustomNumIsNull() { - addCriterion("custom_num is null"); - return (Criteria) this; - } - - public Criteria andCustomNumIsNotNull() { - addCriterion("custom_num is not null"); - return (Criteria) this; - } - - public Criteria andCustomNumEqualTo(String value) { - addCriterion("custom_num =", value, "customNum"); - return (Criteria) this; - } - - public Criteria andCustomNumNotEqualTo(String value) { - addCriterion("custom_num <>", value, "customNum"); - return (Criteria) this; - } - - public Criteria andCustomNumGreaterThan(String value) { - addCriterion("custom_num >", value, "customNum"); - return (Criteria) this; - } - - public Criteria andCustomNumGreaterThanOrEqualTo(String value) { - addCriterion("custom_num >=", value, "customNum"); - return (Criteria) this; - } - - public Criteria andCustomNumLessThan(String value) { - addCriterion("custom_num <", value, "customNum"); - return (Criteria) this; - } - - public Criteria andCustomNumLessThanOrEqualTo(String value) { - addCriterion("custom_num <=", value, "customNum"); - return (Criteria) this; - } - - public Criteria andCustomNumLike(String value) { - addCriterion("custom_num like", value, "customNum"); - return (Criteria) this; - } - - public Criteria andCustomNumNotLike(String value) { - addCriterion("custom_num not like", value, "customNum"); - return (Criteria) this; - } - - public Criteria andCustomNumIn(List values) { - addCriterion("custom_num in", values, "customNum"); - return (Criteria) this; - } - - public Criteria andCustomNumNotIn(List values) { - addCriterion("custom_num not in", values, "customNum"); - return (Criteria) this; - } - - public Criteria andCustomNumBetween(String value1, String value2) { - addCriterion("custom_num between", value1, value2, "customNum"); - return (Criteria) this; - } - - public Criteria andCustomNumNotBetween(String value1, String value2) { - addCriterion("custom_num not between", value1, value2, "customNum"); - return (Criteria) this; - } - public Criteria andModuleIdIsNull() { addCriterion("module_id is null"); return (Criteria) this; @@ -444,6 +374,76 @@ public class FunctionalCaseExample { return (Criteria) this; } + public Criteria andTemplateIdIsNull() { + addCriterion("template_id is null"); + return (Criteria) this; + } + + public Criteria andTemplateIdIsNotNull() { + addCriterion("template_id is not null"); + return (Criteria) this; + } + + public Criteria andTemplateIdEqualTo(String value) { + addCriterion("template_id =", value, "templateId"); + return (Criteria) this; + } + + public Criteria andTemplateIdNotEqualTo(String value) { + addCriterion("template_id <>", value, "templateId"); + return (Criteria) this; + } + + public Criteria andTemplateIdGreaterThan(String value) { + addCriterion("template_id >", value, "templateId"); + return (Criteria) this; + } + + public Criteria andTemplateIdGreaterThanOrEqualTo(String value) { + addCriterion("template_id >=", value, "templateId"); + return (Criteria) this; + } + + public Criteria andTemplateIdLessThan(String value) { + addCriterion("template_id <", value, "templateId"); + return (Criteria) this; + } + + public Criteria andTemplateIdLessThanOrEqualTo(String value) { + addCriterion("template_id <=", value, "templateId"); + return (Criteria) this; + } + + public Criteria andTemplateIdLike(String value) { + addCriterion("template_id like", value, "templateId"); + return (Criteria) this; + } + + public Criteria andTemplateIdNotLike(String value) { + addCriterion("template_id not like", value, "templateId"); + return (Criteria) this; + } + + public Criteria andTemplateIdIn(List values) { + addCriterion("template_id in", values, "templateId"); + return (Criteria) this; + } + + public Criteria andTemplateIdNotIn(List values) { + addCriterion("template_id not in", values, "templateId"); + return (Criteria) this; + } + + public Criteria andTemplateIdBetween(String value1, String value2) { + addCriterion("template_id between", value1, value2, "templateId"); + return (Criteria) this; + } + + public Criteria andTemplateIdNotBetween(String value1, String value2) { + addCriterion("template_id not between", value1, value2, "templateId"); + return (Criteria) this; + } + public Criteria andNameIsNull() { addCriterion("`name` is null"); return (Criteria) this; @@ -654,73 +654,73 @@ public class FunctionalCaseExample { return (Criteria) this; } - public Criteria andCaseModelIsNull() { - addCriterion("case_model is null"); + public Criteria andCaseEditTypeIsNull() { + addCriterion("case_edit_type is null"); return (Criteria) this; } - public Criteria andCaseModelIsNotNull() { - addCriterion("case_model is not null"); + public Criteria andCaseEditTypeIsNotNull() { + addCriterion("case_edit_type is not null"); return (Criteria) this; } - public Criteria andCaseModelEqualTo(String value) { - addCriterion("case_model =", value, "caseModel"); + public Criteria andCaseEditTypeEqualTo(String value) { + addCriterion("case_edit_type =", value, "caseEditType"); return (Criteria) this; } - public Criteria andCaseModelNotEqualTo(String value) { - addCriterion("case_model <>", value, "caseModel"); + public Criteria andCaseEditTypeNotEqualTo(String value) { + addCriterion("case_edit_type <>", value, "caseEditType"); return (Criteria) this; } - public Criteria andCaseModelGreaterThan(String value) { - addCriterion("case_model >", value, "caseModel"); + public Criteria andCaseEditTypeGreaterThan(String value) { + addCriterion("case_edit_type >", value, "caseEditType"); return (Criteria) this; } - public Criteria andCaseModelGreaterThanOrEqualTo(String value) { - addCriterion("case_model >=", value, "caseModel"); + public Criteria andCaseEditTypeGreaterThanOrEqualTo(String value) { + addCriterion("case_edit_type >=", value, "caseEditType"); return (Criteria) this; } - public Criteria andCaseModelLessThan(String value) { - addCriterion("case_model <", value, "caseModel"); + public Criteria andCaseEditTypeLessThan(String value) { + addCriterion("case_edit_type <", value, "caseEditType"); return (Criteria) this; } - public Criteria andCaseModelLessThanOrEqualTo(String value) { - addCriterion("case_model <=", value, "caseModel"); + public Criteria andCaseEditTypeLessThanOrEqualTo(String value) { + addCriterion("case_edit_type <=", value, "caseEditType"); return (Criteria) this; } - public Criteria andCaseModelLike(String value) { - addCriterion("case_model like", value, "caseModel"); + public Criteria andCaseEditTypeLike(String value) { + addCriterion("case_edit_type like", value, "caseEditType"); return (Criteria) this; } - public Criteria andCaseModelNotLike(String value) { - addCriterion("case_model not like", value, "caseModel"); + public Criteria andCaseEditTypeNotLike(String value) { + addCriterion("case_edit_type not like", value, "caseEditType"); return (Criteria) this; } - public Criteria andCaseModelIn(List values) { - addCriterion("case_model in", values, "caseModel"); + public Criteria andCaseEditTypeIn(List values) { + addCriterion("case_edit_type in", values, "caseEditType"); return (Criteria) this; } - public Criteria andCaseModelNotIn(List values) { - addCriterion("case_model not in", values, "caseModel"); + public Criteria andCaseEditTypeNotIn(List values) { + addCriterion("case_edit_type not in", values, "caseEditType"); return (Criteria) this; } - public Criteria andCaseModelBetween(String value1, String value2) { - addCriterion("case_model between", value1, value2, "caseModel"); + public Criteria andCaseEditTypeBetween(String value1, String value2) { + addCriterion("case_edit_type between", value1, value2, "caseEditType"); return (Criteria) this; } - public Criteria andCaseModelNotBetween(String value1, String value2) { - addCriterion("case_model not between", value1, value2, "caseModel"); + public Criteria andCaseEditTypeNotBetween(String value1, String value2) { + addCriterion("case_edit_type not between", value1, value2, "caseEditType"); return (Criteria) this; } diff --git a/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseHistory.java b/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseHistory.java new file mode 100644 index 0000000000..20c1d0c840 --- /dev/null +++ b/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseHistory.java @@ -0,0 +1,116 @@ +package io.metersphere.functional.domain; + +import io.metersphere.validation.groups.Created; +import io.metersphere.validation.groups.Updated; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Arrays; +import lombok.Data; + +@Data +public class FunctionalCaseHistory implements Serializable { + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{functional_case_history.id.not_blank}", groups = {Updated.class}) + @Size(min = 1, max = 50, message = "{functional_case_history.id.length_range}", groups = {Created.class, Updated.class}) + private String id; + + @Schema(description = "用例ID", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{functional_case_history.case_id.not_blank}", groups = {Created.class}) + @Size(min = 1, max = 50, message = "{functional_case_history.case_id.length_range}", groups = {Created.class, Updated.class}) + private String caseId; + + @Schema(description = "变更记录批次号", requiredMode = Schema.RequiredMode.REQUIRED) + private Integer num; + + @Schema(description = "操作人") + private String createUser; + + @Schema(description = "操作时间") + private Long createTime; + + @Schema(description = "修改内容", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{functional_case_history.content.not_blank}", groups = {Created.class}) + private byte[] content; + + private static final long serialVersionUID = 1L; + + public enum Column { + id("id", "id", "VARCHAR", false), + caseId("case_id", "caseId", "VARCHAR", false), + num("num", "num", "INTEGER", false), + createUser("create_user", "createUser", "VARCHAR", false), + createTime("create_time", "createTime", "BIGINT", false), + content("content", "content", "LONGVARBINARY", false); + + private static final String BEGINNING_DELIMITER = "`"; + + private static final String ENDING_DELIMITER = "`"; + + private final String column; + + private final boolean isColumnNameDelimited; + + private final String javaProperty; + + private final String jdbcType; + + public String value() { + return this.column; + } + + public String getValue() { + return this.column; + } + + public String getJavaProperty() { + return this.javaProperty; + } + + public String getJdbcType() { + return this.jdbcType; + } + + Column(String column, String javaProperty, String jdbcType, boolean isColumnNameDelimited) { + this.column = column; + this.javaProperty = javaProperty; + this.jdbcType = jdbcType; + this.isColumnNameDelimited = isColumnNameDelimited; + } + + public String desc() { + return this.getEscapedColumnName() + " DESC"; + } + + public String asc() { + return this.getEscapedColumnName() + " ASC"; + } + + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } + + public static Column[] all() { + return Column.values(); + } + + public String getEscapedColumnName() { + if (this.isColumnNameDelimited) { + return new StringBuilder().append(BEGINNING_DELIMITER).append(this.column).append(ENDING_DELIMITER).toString(); + } else { + return this.column; + } + } + + public String getAliasedEscapedColumnName() { + return this.getEscapedColumnName(); + } + } +} \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseHistoryExample.java b/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseHistoryExample.java new file mode 100644 index 0000000000..daa3b7fb3d --- /dev/null +++ b/backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseHistoryExample.java @@ -0,0 +1,530 @@ +package io.metersphere.functional.domain; + +import java.util.ArrayList; +import java.util.List; + +public class FunctionalCaseHistoryExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public FunctionalCaseHistoryExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(String value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(String value1, String value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andCaseIdIsNull() { + addCriterion("case_id is null"); + return (Criteria) this; + } + + public Criteria andCaseIdIsNotNull() { + addCriterion("case_id is not null"); + return (Criteria) this; + } + + public Criteria andCaseIdEqualTo(String value) { + addCriterion("case_id =", value, "caseId"); + return (Criteria) this; + } + + public Criteria andCaseIdNotEqualTo(String value) { + addCriterion("case_id <>", value, "caseId"); + return (Criteria) this; + } + + public Criteria andCaseIdGreaterThan(String value) { + addCriterion("case_id >", value, "caseId"); + return (Criteria) this; + } + + public Criteria andCaseIdGreaterThanOrEqualTo(String value) { + addCriterion("case_id >=", value, "caseId"); + return (Criteria) this; + } + + public Criteria andCaseIdLessThan(String value) { + addCriterion("case_id <", value, "caseId"); + return (Criteria) this; + } + + public Criteria andCaseIdLessThanOrEqualTo(String value) { + addCriterion("case_id <=", value, "caseId"); + return (Criteria) this; + } + + public Criteria andCaseIdLike(String value) { + addCriterion("case_id like", value, "caseId"); + return (Criteria) this; + } + + public Criteria andCaseIdNotLike(String value) { + addCriterion("case_id not like", value, "caseId"); + return (Criteria) this; + } + + public Criteria andCaseIdIn(List values) { + addCriterion("case_id in", values, "caseId"); + return (Criteria) this; + } + + public Criteria andCaseIdNotIn(List values) { + addCriterion("case_id not in", values, "caseId"); + return (Criteria) this; + } + + public Criteria andCaseIdBetween(String value1, String value2) { + addCriterion("case_id between", value1, value2, "caseId"); + return (Criteria) this; + } + + public Criteria andCaseIdNotBetween(String value1, String value2) { + addCriterion("case_id not between", value1, value2, "caseId"); + return (Criteria) this; + } + + public Criteria andNumIsNull() { + addCriterion("num is null"); + return (Criteria) this; + } + + public Criteria andNumIsNotNull() { + addCriterion("num is not null"); + return (Criteria) this; + } + + public Criteria andNumEqualTo(Integer value) { + addCriterion("num =", value, "num"); + return (Criteria) this; + } + + public Criteria andNumNotEqualTo(Integer value) { + addCriterion("num <>", value, "num"); + return (Criteria) this; + } + + public Criteria andNumGreaterThan(Integer value) { + addCriterion("num >", value, "num"); + return (Criteria) this; + } + + public Criteria andNumGreaterThanOrEqualTo(Integer value) { + addCriterion("num >=", value, "num"); + return (Criteria) this; + } + + public Criteria andNumLessThan(Integer value) { + addCriterion("num <", value, "num"); + return (Criteria) this; + } + + public Criteria andNumLessThanOrEqualTo(Integer value) { + addCriterion("num <=", value, "num"); + return (Criteria) this; + } + + public Criteria andNumIn(List values) { + addCriterion("num in", values, "num"); + return (Criteria) this; + } + + public Criteria andNumNotIn(List values) { + addCriterion("num not in", values, "num"); + return (Criteria) this; + } + + public Criteria andNumBetween(Integer value1, Integer value2) { + addCriterion("num between", value1, value2, "num"); + return (Criteria) this; + } + + public Criteria andNumNotBetween(Integer value1, Integer value2) { + addCriterion("num not between", value1, value2, "num"); + 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 Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Long value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Long value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Long value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Long value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Long value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Long value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Long value1, Long value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Long value1, Long value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseAttachmentMapper.java b/backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseAttachmentMapper.java index 39dbca52a8..e0d9b880ed 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseAttachmentMapper.java +++ b/backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseAttachmentMapper.java @@ -18,10 +18,16 @@ public interface FunctionalCaseAttachmentMapper { List selectByExample(FunctionalCaseAttachmentExample example); + FunctionalCaseAttachment selectByPrimaryKey(@Param("caseId") String caseId, @Param("fileId") String fileId); + int updateByExampleSelective(@Param("record") FunctionalCaseAttachment record, @Param("example") FunctionalCaseAttachmentExample example); int updateByExample(@Param("record") FunctionalCaseAttachment record, @Param("example") FunctionalCaseAttachmentExample example); + int updateByPrimaryKeySelective(FunctionalCaseAttachment record); + + int updateByPrimaryKey(FunctionalCaseAttachment record); + int batchInsert(@Param("list") List list); int batchInsertSelective(@Param("list") List list, @Param("selective") FunctionalCaseAttachment.Column ... selective); diff --git a/backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseAttachmentMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseAttachmentMapper.xml index 692ca9d81c..b1b4169374 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseAttachmentMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseAttachmentMapper.xml @@ -4,6 +4,12 @@ + + + + + + @@ -64,7 +70,7 @@ - case_id, file_id + case_id, file_id, id, file_name, `size`, `local`, create_user, create_time + delete from functional_case_attachment where case_id = #{caseId,jdbcType=VARCHAR} @@ -92,8 +105,12 @@ - insert into functional_case_attachment (case_id, file_id) - values (#{caseId,jdbcType=VARCHAR}, #{fileId,jdbcType=VARCHAR}) + insert into functional_case_attachment (case_id, file_id, id, + file_name, `size`, `local`, create_user, + create_time) + values (#{caseId,jdbcType=VARCHAR}, #{fileId,jdbcType=VARCHAR}, #{id,jdbcType=VARCHAR}, + #{fileName,jdbcType=VARCHAR}, #{size,jdbcType=BIGINT}, #{local,jdbcType=BIT}, #{createUser,jdbcType=VARCHAR}, + #{createTime,jdbcType=BIGINT}) insert into functional_case_attachment @@ -104,6 +121,24 @@ file_id, + + id, + + + file_name, + + + `size`, + + + `local`, + + + create_user, + + + create_time, + @@ -112,6 +147,24 @@ #{fileId,jdbcType=VARCHAR}, + + #{id,jdbcType=VARCHAR}, + + + #{fileName,jdbcType=VARCHAR}, + + + #{size,jdbcType=BIGINT}, + + + #{local,jdbcType=BIT}, + + + #{createUser,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=BIGINT}, + select @@ -131,13 +132,15 @@ insert into functional_case_comment (id, case_id, create_user, - `status`, `type`, belong_id, - create_time, update_time, reply_user, - parent_id, description) + `status`, `type`, parent_id, + resource_id, notifier, reply_user, + create_time, update_time, content + ) values (#{id,jdbcType=VARCHAR}, #{caseId,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, - #{status,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{belongId,jdbcType=VARCHAR}, - #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{replyUser,jdbcType=VARCHAR}, - #{parentId,jdbcType=VARCHAR}, #{description,jdbcType=LONGVARCHAR}) + #{status,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, + #{resourceId,jdbcType=VARCHAR}, #{notifier,jdbcType=VARCHAR}, #{replyUser,jdbcType=VARCHAR}, + #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{content,jdbcType=LONGVARCHAR} + ) insert into functional_case_comment @@ -157,8 +160,17 @@ `type`, - - belong_id, + + parent_id, + + + resource_id, + + + notifier, + + + reply_user, create_time, @@ -166,14 +178,8 @@ update_time, - - reply_user, - - - parent_id, - - - description, + + content, @@ -192,8 +198,17 @@ #{type,jdbcType=VARCHAR}, - - #{belongId,jdbcType=VARCHAR}, + + #{parentId,jdbcType=VARCHAR}, + + + #{resourceId,jdbcType=VARCHAR}, + + + #{notifier,jdbcType=VARCHAR}, + + + #{replyUser,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, @@ -201,14 +216,8 @@ #{updateTime,jdbcType=BIGINT}, - - #{replyUser,jdbcType=VARCHAR}, - - - #{parentId,jdbcType=VARCHAR}, - - - #{description,jdbcType=LONGVARCHAR}, + + #{content,jdbcType=LONGVARCHAR}, @@ -236,8 +245,17 @@ `type` = #{record.type,jdbcType=VARCHAR}, - - belong_id = #{record.belongId,jdbcType=VARCHAR}, + + parent_id = #{record.parentId,jdbcType=VARCHAR}, + + + resource_id = #{record.resourceId,jdbcType=VARCHAR}, + + + notifier = #{record.notifier,jdbcType=VARCHAR}, + + + reply_user = #{record.replyUser,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=BIGINT}, @@ -245,14 +263,8 @@ update_time = #{record.updateTime,jdbcType=BIGINT}, - - reply_user = #{record.replyUser,jdbcType=VARCHAR}, - - - parent_id = #{record.parentId,jdbcType=VARCHAR}, - - - description = #{record.description,jdbcType=LONGVARCHAR}, + + content = #{record.content,jdbcType=LONGVARCHAR}, @@ -266,12 +278,13 @@ create_user = #{record.createUser,jdbcType=VARCHAR}, `status` = #{record.status,jdbcType=VARCHAR}, `type` = #{record.type,jdbcType=VARCHAR}, - belong_id = #{record.belongId,jdbcType=VARCHAR}, + parent_id = #{record.parentId,jdbcType=VARCHAR}, + resource_id = #{record.resourceId,jdbcType=VARCHAR}, + notifier = #{record.notifier,jdbcType=VARCHAR}, + reply_user = #{record.replyUser,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=BIGINT}, update_time = #{record.updateTime,jdbcType=BIGINT}, - reply_user = #{record.replyUser,jdbcType=VARCHAR}, - parent_id = #{record.parentId,jdbcType=VARCHAR}, - description = #{record.description,jdbcType=LONGVARCHAR} + content = #{record.content,jdbcType=LONGVARCHAR} @@ -283,11 +296,12 @@ create_user = #{record.createUser,jdbcType=VARCHAR}, `status` = #{record.status,jdbcType=VARCHAR}, `type` = #{record.type,jdbcType=VARCHAR}, - belong_id = #{record.belongId,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=BIGINT}, - update_time = #{record.updateTime,jdbcType=BIGINT}, + parent_id = #{record.parentId,jdbcType=VARCHAR}, + resource_id = #{record.resourceId,jdbcType=VARCHAR}, + notifier = #{record.notifier,jdbcType=VARCHAR}, reply_user = #{record.replyUser,jdbcType=VARCHAR}, - parent_id = #{record.parentId,jdbcType=VARCHAR} + create_time = #{record.createTime,jdbcType=BIGINT}, + update_time = #{record.updateTime,jdbcType=BIGINT} @@ -307,8 +321,17 @@ `type` = #{type,jdbcType=VARCHAR}, - - belong_id = #{belongId,jdbcType=VARCHAR}, + + parent_id = #{parentId,jdbcType=VARCHAR}, + + + resource_id = #{resourceId,jdbcType=VARCHAR}, + + + notifier = #{notifier,jdbcType=VARCHAR}, + + + reply_user = #{replyUser,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=BIGINT}, @@ -316,14 +339,8 @@ update_time = #{updateTime,jdbcType=BIGINT}, - - reply_user = #{replyUser,jdbcType=VARCHAR}, - - - parent_id = #{parentId,jdbcType=VARCHAR}, - - - description = #{description,jdbcType=LONGVARCHAR}, + + content = #{content,jdbcType=LONGVARCHAR}, where id = #{id,jdbcType=VARCHAR} @@ -334,12 +351,13 @@ create_user = #{createUser,jdbcType=VARCHAR}, `status` = #{status,jdbcType=VARCHAR}, `type` = #{type,jdbcType=VARCHAR}, - belong_id = #{belongId,jdbcType=VARCHAR}, + parent_id = #{parentId,jdbcType=VARCHAR}, + resource_id = #{resourceId,jdbcType=VARCHAR}, + notifier = #{notifier,jdbcType=VARCHAR}, + reply_user = #{replyUser,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=BIGINT}, update_time = #{updateTime,jdbcType=BIGINT}, - reply_user = #{replyUser,jdbcType=VARCHAR}, - parent_id = #{parentId,jdbcType=VARCHAR}, - description = #{description,jdbcType=LONGVARCHAR} + content = #{content,jdbcType=LONGVARCHAR} where id = #{id,jdbcType=VARCHAR} @@ -348,23 +366,25 @@ create_user = #{createUser,jdbcType=VARCHAR}, `status` = #{status,jdbcType=VARCHAR}, `type` = #{type,jdbcType=VARCHAR}, - belong_id = #{belongId,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=BIGINT}, - update_time = #{updateTime,jdbcType=BIGINT}, + parent_id = #{parentId,jdbcType=VARCHAR}, + resource_id = #{resourceId,jdbcType=VARCHAR}, + notifier = #{notifier,jdbcType=VARCHAR}, reply_user = #{replyUser,jdbcType=VARCHAR}, - parent_id = #{parentId,jdbcType=VARCHAR} + create_time = #{createTime,jdbcType=BIGINT}, + update_time = #{updateTime,jdbcType=BIGINT} where id = #{id,jdbcType=VARCHAR} insert into functional_case_comment - (id, case_id, create_user, `status`, `type`, belong_id, create_time, update_time, - reply_user, parent_id, description) + (id, case_id, create_user, `status`, `type`, parent_id, resource_id, notifier, reply_user, + create_time, update_time, content) values (#{item.id,jdbcType=VARCHAR}, #{item.caseId,jdbcType=VARCHAR}, #{item.createUser,jdbcType=VARCHAR}, - #{item.status,jdbcType=VARCHAR}, #{item.type,jdbcType=VARCHAR}, #{item.belongId,jdbcType=VARCHAR}, - #{item.createTime,jdbcType=BIGINT}, #{item.updateTime,jdbcType=BIGINT}, #{item.replyUser,jdbcType=VARCHAR}, - #{item.parentId,jdbcType=VARCHAR}, #{item.description,jdbcType=LONGVARCHAR}) + #{item.status,jdbcType=VARCHAR}, #{item.type,jdbcType=VARCHAR}, #{item.parentId,jdbcType=VARCHAR}, + #{item.resourceId,jdbcType=VARCHAR}, #{item.notifier,jdbcType=VARCHAR}, #{item.replyUser,jdbcType=VARCHAR}, + #{item.createTime,jdbcType=BIGINT}, #{item.updateTime,jdbcType=BIGINT}, #{item.content,jdbcType=LONGVARCHAR} + ) @@ -392,8 +412,17 @@ #{item.type,jdbcType=VARCHAR} - - #{item.belongId,jdbcType=VARCHAR} + + #{item.parentId,jdbcType=VARCHAR} + + + #{item.resourceId,jdbcType=VARCHAR} + + + #{item.notifier,jdbcType=VARCHAR} + + + #{item.replyUser,jdbcType=VARCHAR} #{item.createTime,jdbcType=BIGINT} @@ -401,14 +430,8 @@ #{item.updateTime,jdbcType=BIGINT} - - #{item.replyUser,jdbcType=VARCHAR} - - - #{item.parentId,jdbcType=VARCHAR} - - - #{item.description,jdbcType=LONGVARCHAR} + + #{item.content,jdbcType=LONGVARCHAR} ) diff --git a/backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseHistoryMapper.java b/backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseHistoryMapper.java new file mode 100644 index 0000000000..15f1c9e99a --- /dev/null +++ b/backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseHistoryMapper.java @@ -0,0 +1,40 @@ +package io.metersphere.functional.mapper; + +import io.metersphere.functional.domain.FunctionalCaseHistory; +import io.metersphere.functional.domain.FunctionalCaseHistoryExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface FunctionalCaseHistoryMapper { + long countByExample(FunctionalCaseHistoryExample example); + + int deleteByExample(FunctionalCaseHistoryExample example); + + int deleteByPrimaryKey(String id); + + int insert(FunctionalCaseHistory record); + + int insertSelective(FunctionalCaseHistory record); + + List selectByExampleWithBLOBs(FunctionalCaseHistoryExample example); + + List selectByExample(FunctionalCaseHistoryExample example); + + FunctionalCaseHistory selectByPrimaryKey(String id); + + int updateByExampleSelective(@Param("record") FunctionalCaseHistory record, @Param("example") FunctionalCaseHistoryExample example); + + int updateByExampleWithBLOBs(@Param("record") FunctionalCaseHistory record, @Param("example") FunctionalCaseHistoryExample example); + + int updateByExample(@Param("record") FunctionalCaseHistory record, @Param("example") FunctionalCaseHistoryExample example); + + int updateByPrimaryKeySelective(FunctionalCaseHistory record); + + int updateByPrimaryKeyWithBLOBs(FunctionalCaseHistory record); + + int updateByPrimaryKey(FunctionalCaseHistory record); + + int batchInsert(@Param("list") List list); + + int batchInsertSelective(@Param("list") List list, @Param("selective") FunctionalCaseHistory.Column ... selective); +} \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseHistoryMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseHistoryMapper.xml new file mode 100644 index 0000000000..b47603e8ad --- /dev/null +++ b/backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseHistoryMapper.xml @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, case_id, num, create_user, create_time + + + content + + + + + + delete from functional_case_history + where id = #{id,jdbcType=VARCHAR} + + + delete from functional_case_history + + + + + + insert into functional_case_history (id, case_id, num, + create_user, create_time, content + ) + values (#{id,jdbcType=VARCHAR}, #{caseId,jdbcType=VARCHAR}, #{num,jdbcType=INTEGER}, + #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{content,jdbcType=LONGVARBINARY} + ) + + + insert into functional_case_history + + + id, + + + case_id, + + + num, + + + create_user, + + + create_time, + + + content, + + + + + #{id,jdbcType=VARCHAR}, + + + #{caseId,jdbcType=VARCHAR}, + + + #{num,jdbcType=INTEGER}, + + + #{createUser,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=BIGINT}, + + + #{content,jdbcType=LONGVARBINARY}, + + + + + + update functional_case_history + + + id = #{record.id,jdbcType=VARCHAR}, + + + case_id = #{record.caseId,jdbcType=VARCHAR}, + + + num = #{record.num,jdbcType=INTEGER}, + + + create_user = #{record.createUser,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=BIGINT}, + + + content = #{record.content,jdbcType=LONGVARBINARY}, + + + + + + + + update functional_case_history + set id = #{record.id,jdbcType=VARCHAR}, + case_id = #{record.caseId,jdbcType=VARCHAR}, + num = #{record.num,jdbcType=INTEGER}, + create_user = #{record.createUser,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=BIGINT}, + content = #{record.content,jdbcType=LONGVARBINARY} + + + + + + update functional_case_history + set id = #{record.id,jdbcType=VARCHAR}, + case_id = #{record.caseId,jdbcType=VARCHAR}, + num = #{record.num,jdbcType=INTEGER}, + create_user = #{record.createUser,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=BIGINT} + + + + + + update functional_case_history + + + case_id = #{caseId,jdbcType=VARCHAR}, + + + num = #{num,jdbcType=INTEGER}, + + + create_user = #{createUser,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=BIGINT}, + + + content = #{content,jdbcType=LONGVARBINARY}, + + + where id = #{id,jdbcType=VARCHAR} + + + update functional_case_history + set case_id = #{caseId,jdbcType=VARCHAR}, + num = #{num,jdbcType=INTEGER}, + create_user = #{createUser,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=BIGINT}, + content = #{content,jdbcType=LONGVARBINARY} + where id = #{id,jdbcType=VARCHAR} + + + update functional_case_history + set case_id = #{caseId,jdbcType=VARCHAR}, + num = #{num,jdbcType=INTEGER}, + create_user = #{createUser,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} + + + insert into functional_case_history + (id, case_id, num, create_user, create_time, content) + values + + (#{item.id,jdbcType=VARCHAR}, #{item.caseId,jdbcType=VARCHAR}, #{item.num,jdbcType=INTEGER}, + #{item.createUser,jdbcType=VARCHAR}, #{item.createTime,jdbcType=BIGINT}, #{item.content,jdbcType=LONGVARBINARY} + ) + + + + insert into functional_case_history ( + + ${column.escapedColumnName} + + ) + values + + ( + + + #{item.id,jdbcType=VARCHAR} + + + #{item.caseId,jdbcType=VARCHAR} + + + #{item.num,jdbcType=INTEGER} + + + #{item.createUser,jdbcType=VARCHAR} + + + #{item.createTime,jdbcType=BIGINT} + + + #{item.content,jdbcType=LONGVARBINARY} + + + ) + + + \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseMapper.xml index 59ee4ba52c..4c893b1462 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseMapper.xml @@ -4,13 +4,13 @@ - + - + @@ -84,7 +84,7 @@ - id, num, custom_num, module_id, project_id, `name`, review_status, tags, case_model, + id, num, module_id, project_id, template_id, `name`, review_status, tags, case_edit_type, pos, version_id, ref_id, last_execute_result, deleted, public_case, latest, create_user, update_user, delete_user, create_time, update_time, delete_time @@ -119,17 +119,17 @@ - insert into functional_case (id, num, custom_num, - module_id, project_id, `name`, - review_status, tags, case_model, + insert into functional_case (id, num, module_id, + project_id, template_id, `name`, + review_status, tags, case_edit_type, pos, version_id, ref_id, last_execute_result, deleted, public_case, latest, create_user, update_user, delete_user, create_time, update_time, delete_time) - values (#{id,jdbcType=VARCHAR}, #{num,jdbcType=INTEGER}, #{customNum,jdbcType=VARCHAR}, - #{moduleId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, - #{reviewStatus,jdbcType=VARCHAR}, #{tags,jdbcType=VARCHAR}, #{caseModel,jdbcType=VARCHAR}, + values (#{id,jdbcType=VARCHAR}, #{num,jdbcType=INTEGER}, #{moduleId,jdbcType=VARCHAR}, + #{projectId,jdbcType=VARCHAR}, #{templateId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, + #{reviewStatus,jdbcType=VARCHAR}, #{tags,jdbcType=VARCHAR}, #{caseEditType,jdbcType=VARCHAR}, #{pos,jdbcType=BIGINT}, #{versionId,jdbcType=VARCHAR}, #{refId,jdbcType=VARCHAR}, #{lastExecuteResult,jdbcType=VARCHAR}, #{deleted,jdbcType=BIT}, #{publicCase,jdbcType=BIT}, #{latest,jdbcType=BIT}, #{createUser,jdbcType=VARCHAR}, #{updateUser,jdbcType=VARCHAR}, @@ -145,15 +145,15 @@ num, - - custom_num, - module_id, project_id, + + template_id, + `name`, @@ -163,8 +163,8 @@ tags, - - case_model, + + case_edit_type, pos, @@ -213,15 +213,15 @@ #{num,jdbcType=INTEGER}, - - #{customNum,jdbcType=VARCHAR}, - #{moduleId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, + + #{templateId,jdbcType=VARCHAR}, + #{name,jdbcType=VARCHAR}, @@ -231,8 +231,8 @@ #{tags,jdbcType=VARCHAR}, - - #{caseModel,jdbcType=VARCHAR}, + + #{caseEditType,jdbcType=VARCHAR}, #{pos,jdbcType=BIGINT}, @@ -290,15 +290,15 @@ num = #{record.num,jdbcType=INTEGER}, - - custom_num = #{record.customNum,jdbcType=VARCHAR}, - module_id = #{record.moduleId,jdbcType=VARCHAR}, project_id = #{record.projectId,jdbcType=VARCHAR}, + + template_id = #{record.templateId,jdbcType=VARCHAR}, + `name` = #{record.name,jdbcType=VARCHAR}, @@ -308,8 +308,8 @@ tags = #{record.tags,jdbcType=VARCHAR}, - - case_model = #{record.caseModel,jdbcType=VARCHAR}, + + case_edit_type = #{record.caseEditType,jdbcType=VARCHAR}, pos = #{record.pos,jdbcType=BIGINT}, @@ -359,13 +359,13 @@ update functional_case set id = #{record.id,jdbcType=VARCHAR}, num = #{record.num,jdbcType=INTEGER}, - custom_num = #{record.customNum,jdbcType=VARCHAR}, module_id = #{record.moduleId,jdbcType=VARCHAR}, project_id = #{record.projectId,jdbcType=VARCHAR}, + template_id = #{record.templateId,jdbcType=VARCHAR}, `name` = #{record.name,jdbcType=VARCHAR}, review_status = #{record.reviewStatus,jdbcType=VARCHAR}, tags = #{record.tags,jdbcType=VARCHAR}, - case_model = #{record.caseModel,jdbcType=VARCHAR}, + case_edit_type = #{record.caseEditType,jdbcType=VARCHAR}, pos = #{record.pos,jdbcType=BIGINT}, version_id = #{record.versionId,jdbcType=VARCHAR}, ref_id = #{record.refId,jdbcType=VARCHAR}, @@ -389,15 +389,15 @@ num = #{num,jdbcType=INTEGER}, - - custom_num = #{customNum,jdbcType=VARCHAR}, - module_id = #{moduleId,jdbcType=VARCHAR}, project_id = #{projectId,jdbcType=VARCHAR}, + + template_id = #{templateId,jdbcType=VARCHAR}, + `name` = #{name,jdbcType=VARCHAR}, @@ -407,8 +407,8 @@ tags = #{tags,jdbcType=VARCHAR}, - - case_model = #{caseModel,jdbcType=VARCHAR}, + + case_edit_type = #{caseEditType,jdbcType=VARCHAR}, pos = #{pos,jdbcType=BIGINT}, @@ -455,13 +455,13 @@ update functional_case set num = #{num,jdbcType=INTEGER}, - custom_num = #{customNum,jdbcType=VARCHAR}, module_id = #{moduleId,jdbcType=VARCHAR}, project_id = #{projectId,jdbcType=VARCHAR}, + template_id = #{templateId,jdbcType=VARCHAR}, `name` = #{name,jdbcType=VARCHAR}, review_status = #{reviewStatus,jdbcType=VARCHAR}, tags = #{tags,jdbcType=VARCHAR}, - case_model = #{caseModel,jdbcType=VARCHAR}, + case_edit_type = #{caseEditType,jdbcType=VARCHAR}, pos = #{pos,jdbcType=BIGINT}, version_id = #{versionId,jdbcType=VARCHAR}, ref_id = #{refId,jdbcType=VARCHAR}, @@ -479,14 +479,14 @@ insert into functional_case - (id, num, custom_num, module_id, project_id, `name`, review_status, tags, case_model, + (id, num, module_id, project_id, template_id, `name`, review_status, tags, case_edit_type, pos, version_id, ref_id, last_execute_result, deleted, public_case, latest, create_user, update_user, delete_user, create_time, update_time, delete_time) values - (#{item.id,jdbcType=VARCHAR}, #{item.num,jdbcType=INTEGER}, #{item.customNum,jdbcType=VARCHAR}, - #{item.moduleId,jdbcType=VARCHAR}, #{item.projectId,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR}, - #{item.reviewStatus,jdbcType=VARCHAR}, #{item.tags,jdbcType=VARCHAR}, #{item.caseModel,jdbcType=VARCHAR}, + (#{item.id,jdbcType=VARCHAR}, #{item.num,jdbcType=INTEGER}, #{item.moduleId,jdbcType=VARCHAR}, + #{item.projectId,jdbcType=VARCHAR}, #{item.templateId,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR}, + #{item.reviewStatus,jdbcType=VARCHAR}, #{item.tags,jdbcType=VARCHAR}, #{item.caseEditType,jdbcType=VARCHAR}, #{item.pos,jdbcType=BIGINT}, #{item.versionId,jdbcType=VARCHAR}, #{item.refId,jdbcType=VARCHAR}, #{item.lastExecuteResult,jdbcType=VARCHAR}, #{item.deleted,jdbcType=BIT}, #{item.publicCase,jdbcType=BIT}, #{item.latest,jdbcType=BIT}, #{item.createUser,jdbcType=VARCHAR}, #{item.updateUser,jdbcType=VARCHAR}, @@ -510,15 +510,15 @@ #{item.num,jdbcType=INTEGER} - - #{item.customNum,jdbcType=VARCHAR} - #{item.moduleId,jdbcType=VARCHAR} #{item.projectId,jdbcType=VARCHAR} + + #{item.templateId,jdbcType=VARCHAR} + #{item.name,jdbcType=VARCHAR} @@ -528,8 +528,8 @@ #{item.tags,jdbcType=VARCHAR} - - #{item.caseModel,jdbcType=VARCHAR} + + #{item.caseEditType,jdbcType=VARCHAR} #{item.pos,jdbcType=BIGINT} diff --git a/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_10__functional_case.sql b/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_10__functional_case.sql index c9668758bf..b2ae75b5a2 100644 --- a/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_10__functional_case.sql +++ b/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_10__functional_case.sql @@ -4,13 +4,13 @@ SET SESSION innodb_lock_wait_timeout = 7200; CREATE TABLE IF NOT EXISTS functional_case( `id` VARCHAR(50) NOT NULL COMMENT 'ID' , `num` INT NOT NULL COMMENT '业务ID' , - `custom_num` VARCHAR(64) NOT NULL COMMENT '自定义业务ID' , `module_id` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '模块ID' , `project_id` VARCHAR(50) NOT NULL COMMENT '项目ID' , + `template_id` VARCHAR(50) NOT NULL COMMENT '模板ID' , `name` VARCHAR(255) NOT NULL COMMENT '名称' , `review_status` VARCHAR(64) NOT NULL DEFAULT 'PREPARE' COMMENT '评审状态：未开始/进行中/已完成/已结束' , `tags` VARCHAR(1000) COMMENT '标签（JSON)' , - `case_model` VARCHAR(50) NOT NULL DEFAULT 'STEP' COMMENT '编辑模式：步骤模式/文本模式' , + `case_edit_type` VARCHAR(50) NOT NULL DEFAULT 'STEP' COMMENT '编辑模式：步骤模式/文本模式' , `pos` BIGINT NOT NULL DEFAULT 0 COMMENT '自定义排序，间隔5000' , `version_id` VARCHAR(50) NOT NULL COMMENT '版本ID' , `ref_id` VARCHAR(50) NOT NULL COMMENT '指向初始版本ID' , @@ -35,6 +35,9 @@ CREATE INDEX idx_project_id_pos ON functional_case(project_id,pos); CREATE INDEX idx_public_case_pos ON functional_case(public_case,pos); CREATE INDEX idx_ref_id ON functional_case(ref_id); CREATE INDEX idx_version_id ON functional_case(version_id); +CREATE INDEX idx_create_time ON functional_case(create_time); +CREATE INDEX idx_delete_time ON functional_case(delete_time); +CREATE INDEX idx_update_time ON functional_case(update_time); CREATE TABLE IF NOT EXISTS functional_case_blob( @@ -56,12 +59,13 @@ CREATE TABLE IF NOT EXISTS functional_case_comment( `create_user` VARCHAR(50) NOT NULL COMMENT '评论人' , `status` VARCHAR(64) COMMENT '评审/测试计划执行状态:通过/不通过/重新提审/通过标准变更标记/强制通过标记/强制不通过标记/状态变更标记' , `type` VARCHAR(64) NOT NULL DEFAULT 'CASE' COMMENT '评论类型：用例评论/测试计划用例评论/评审用例评论' , - `belong_id` VARCHAR(50) COMMENT '评审ID' , + `parent_id` VARCHAR(50) COMMENT '父评论ID' , + `resource_id` VARCHAR(50) COMMENT '资源ID: 评审ID/测试计划ID' , + `notifier` VARCHAR(1000) COMMENT '通知人' , + `content` TEXT NOT NULL COMMENT '内容' , + `reply_user` VARCHAR(50) COMMENT '回复人' , `create_time` BIGINT NOT NULL COMMENT '创建时间' , `update_time` BIGINT NOT NULL COMMENT '更新时间' , - `description` TEXT NOT NULL COMMENT '内容' , - `reply_user` VARCHAR(50) COMMENT '回复人' , - `parent_id` VARCHAR(50) DEFAULT '' COMMENT '父评论id' , PRIMARY KEY (id) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 @@ -72,7 +76,7 @@ CREATE INDEX idx_create_time ON functional_case_comment(create_time); CREATE INDEX idx_case_id ON functional_case_comment(case_id); CREATE INDEX idx_status ON functional_case_comment(status); CREATE INDEX idx_type ON functional_case_comment(type); -CREATE INDEX idx_belong_id ON functional_case_comment(belong_id); +CREATE INDEX idx_resource_id ON functional_case_comment(resource_id); CREATE TABLE IF NOT EXISTS functional_case_module( @@ -96,14 +100,26 @@ CREATE INDEX idx_name ON functional_case_module(name); CREATE TABLE IF NOT EXISTS functional_case_attachment( + `id` VARCHAR(50) NOT NULL COMMENT 'id' , `case_id` VARCHAR(50) NOT NULL COMMENT '功能用例ID' , `file_id` VARCHAR(50) NOT NULL COMMENT '文件的ID' , + `file_name` VARCHAR(255) NOT NULL COMMENT '文件名称' , + `size` BIGINT NOT NULL COMMENT '文件大小' , + `local` BIT(1) NOT NULL COMMENT '是否本地' , + `create_user` VARCHAR(50) NOT NULL COMMENT '创建人' , + `create_time` BIGINT NOT NULL COMMENT '创建时间' , PRIMARY KEY (case_id,file_id) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '功能用例和附件的中间表'; +CREATE INDEX idx_case_id ON functional_case_attachment(case_id); +CREATE INDEX idx_local ON functional_case_attachment(local); +CREATE INDEX idx_file_id ON functional_case_attachment(file_id); +CREATE INDEX idx_file_name ON functional_case_attachment(file_name); + + CREATE TABLE IF NOT EXISTS functional_case_follower( `case_id` VARCHAR(50) NOT NULL COMMENT '功能用例ID' , `user_id` VARCHAR(50) NOT NULL COMMENT '关注人ID' , @@ -144,7 +160,7 @@ CREATE TABLE IF NOT EXISTS functional_case_test( COLLATE = utf8mb4_general_ci COMMENT = '功能用例和其他用例的中间表'; -CREATE UNIQUE INDEX uk_functional_case_id_test_id ON functional_case_test(case_id,test_id); +CREATE UNIQUE INDEX uk_case_id_test_id ON functional_case_test(case_id,test_id); CREATE INDEX idx_test_id ON functional_case_test(test_id); @@ -166,13 +182,28 @@ CREATE TABLE IF NOT EXISTS functional_case_custom_field( `case_id` VARCHAR(50) NOT NULL COMMENT '资源ID' , `field_id` VARCHAR(50) NOT NULL COMMENT '字段ID' , `value` VARCHAR(1000) COMMENT '字段值' , - `text_value` LONGTEXT COMMENT '富文本类型字段值' , PRIMARY KEY (case_id,field_id) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '自定义字段功能用例关系'; +CREATE TABLE IF NOT EXISTS functional_case_history( + `id` VARCHAR(50) NOT NULL COMMENT 'ID' , + `case_id` VARCHAR(50) NOT NULL COMMENT '用例ID' , + `num` INT NOT NULL COMMENT '变更记录批次号' , + `content` BLOB NOT NULL COMMENT '修改内容' , + `create_user` VARCHAR(50) NOT NULL COMMENT '操作人' , + `create_time` BIGINT NOT NULL COMMENT '操作时间' , + PRIMARY KEY (id) + ) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_general_ci COMMENT = '用例变更记录'; + + +CREATE INDEX idx_case_id ON functional_case_history(case_id); + + CREATE TABLE IF NOT EXISTS case_review( `id` VARCHAR(50) NOT NULL COMMENT 'ID' , `name` VARCHAR(200) NOT NULL COMMENT '名称' , diff --git a/backend/framework/domain/src/main/resources/migration/3.0.0/dml/V3.0.0_11_1__data.sql b/backend/framework/domain/src/main/resources/migration/3.0.0/dml/V3.0.0_11_1__data.sql index 987162f65e..f2ba54b0b2 100644 --- a/backend/framework/domain/src/main/resources/migration/3.0.0/dml/V3.0.0_11_1__data.sql +++ b/backend/framework/domain/src/main/resources/migration/3.0.0/dml/V3.0.0_11_1__data.sql @@ -482,5 +482,9 @@ VALUES (@schedule_close_id, 'CLOSE', 'CREATE_USER', @robot_in_site_id, 'SCHEDULE INSERT INTO message_task_blob(id, template) VALUES (@schedule_close_id, 'message.schedule_task_close'); +-- 初始化定时任务数据 +SET @load_report_id = UUID_SHORT(); +INSERT INTO schedule(`id`, `key`, `type`, `value`, `job`, `enable`, `resource_id`, `create_user`, `create_time`, `update_time`, `project_id`, `name`, `config`) +VALUES (@load_report_id, '100001100001', 'CRON', '0 0 2 * * ?', 'io.metersphere.project.job.CleanUpReportJob', true, '100001100001', 'admin', unix_timestamp() * 1000, unix_timestamp() * 1000, '100001100001', 'Clean Report Job', NULL); -- set innodb lock wait timeout to default SET SESSION innodb_lock_wait_timeout = DEFAULT; diff --git a/backend/framework/sdk/src/main/resources/i18n/case_en_US.properties b/backend/framework/sdk/src/main/resources/i18n/case_en_US.properties index 4b453b0699..85dd5a0cdd 100644 --- a/backend/framework/sdk/src/main/resources/i18n/case_en_US.properties +++ b/backend/framework/sdk/src/main/resources/i18n/case_en_US.properties @@ -7,12 +7,13 @@ functional_case.module_id.length_range=Module ID length must be between 1 and 50 functional_case.module_id.not_blank=Module ID cannot be empty functional_case.project_id.length_range=The length of the project ID must be between 1 and 50 functional_case.project_id.not_blank=Project ID cannot be empty +functional_case.template_id.not_blank=Template ID cannot be empty functional_case.name.length_range=The name length must be between 1 and 255 functional_case.name.not_blank=Name cannot be empty functional_case.review_status.length_range=The length of the review status must be between 1 and 64 functional_case.review_status.not_blank=Review status cannot be empty -functional_case.step_model.length_range=The length of the editing mode must be between 1 and 64 -functional_case.step_model.not_blank=Edit mode cannot be empty +functional_case.case_edit_type.length_range=The length of the editing type must be between 1 and 64 +functional_case.case_edit_type.not_blank=Edit type cannot be empty functional_case.version_id.length_range=Version ID length must be between 1 and 50 functional_case.version_id.not_blank=Version ID cannot be empty functional_case.ref_id.length_range=Pointing to the initial version ID must be between 1 and 50 @@ -48,8 +49,16 @@ functional_case_module.pos.not_blank=The order under the same node cannot be emp functional_case_module.create_user.length_range=Creator length must be between 1 and 50 functional_case_module.create_user.not_blank=Creator cannot be empty #module：FunctionalCaseAttachment -functional_case_attachment.functional_case_id.not_blank=Function case ID cannot be empty +functional_case_attachment.case_id.not_blank=Case ID cannot be empty +functional_case_attachment.case_id.length_range=The length of the case ID must be between 1 and 50 functional_case_attachment.file_id.not_blank=File ID cannot be empty +functional_case_attachment.file_id.length_range=The length of the file ID must be between 1 and 50 +functional_case_attachment.id.not_blank=ID cannot be empty +functional_case_attachment.id.length_range=The length of the ID must be between 1 and 50 +functional_case_attachment.file_name.not_blank=File name cannot be empty +functional_case_attachment.file_name.length_range=The length of the file name must be between 1 and 255 +functional_case_attachment.size.not_blank=File size cannot be empty +functional_case_attachment.association.not_blank=Association cannot be empty #module：FunctionalCaseFollow functional_case_follow.case_id.not_blank=Function case ID cannot be empty functional_case_follow.follow_id.not_blank=Follow ID cannot be empty @@ -71,6 +80,10 @@ functional_case_test.test_id.length_range=The length of the test ID must be betw functional_case_test.test_id.not_blank=Test ID cannot be empty functional_case_test.test_type.length_range=The length of the test type must be between 1 and 64 functional_case_test.test_type.not_blank=Test type cannot be empty +#module：FunctionalCaseHistory +functional_case_history.id.not_blank=ID cannot be empty +functional_case_history.case_id.not_blank=Case ID cannot be empty +functional_case_history.content.not_blank=Content cannot be empty #module：MinderExtraNode minder_extra_node.id.not_blank=ID cannot be empty minder_extra_node.parent_id.length_range=The length of the parent node ID must be between 1 and 50 diff --git a/backend/framework/sdk/src/main/resources/i18n/case_zh_CN.properties b/backend/framework/sdk/src/main/resources/i18n/case_zh_CN.properties index d18ad0c13c..f9b54a9b30 100644 --- a/backend/framework/sdk/src/main/resources/i18n/case_zh_CN.properties +++ b/backend/framework/sdk/src/main/resources/i18n/case_zh_CN.properties @@ -7,12 +7,13 @@ functional_case.module_id.length_range=模块ID长度必须在1-50之间 functional_case.module_id.not_blank=模块ID不能为空 functional_case.project_id.length_range=项目ID长度必须在1-50之间 functional_case.project_id.not_blank=项目ID不能为空 +functional_case.template_id.not_blank=模板ID不能为空 functional_case.name.length_range=名称长度必须在1-255之间 functional_case.name.not_blank=名称不能为空 functional_case.review_status.length_range=评审状态长度必须在1-64之间 functional_case.review_status.not_blank=评审状态不能为空 -functional_case.step_model.length_range=编辑模式长度必须在1-64之间 -functional_case.step_model.not_blank=编辑模式不能为空 +functional_case.case_edit_type.length_range=编辑模式长度必须在1-64之间 +functional_case.case_edit_type.not_blank=编辑模式不能为空 functional_case.version_id.length_range=版本ID长度必须在1-50之间 functional_case.version_id.not_blank=版本ID不能为空 functional_case.ref_id.length_range=指向初始版本ID必须在1-50之间 @@ -48,8 +49,16 @@ functional_case_module.pos.not_blank=同一节点下的顺序不能为空 functional_case_module.create_user.length_range=创建人长度必须在1-50之间 functional_case_module.create_user.not_blank=创建人不能为空 #module：FunctionalCaseAttachment -functional_case_attachment.functional_case_id.not_blank=功能用例ID不能为空 +functional_case_attachment.case_id.not_blank=功能用例ID不能为空 +functional_case_attachment.case_id.length_range=功能用例ID长度必须在1-50之间 functional_case_attachment.file_id.not_blank=文件的ID不能为空 +functional_case_attachment.file_id.length_range=文件的ID长度必须在1-50之间 +functional_case_attachment.id.not_blank=ID不能为空 +functional_case_attachment.id.length_range=ID长度必须在1-50之间 +functional_case_attachment.file_name.not_blank=文件名称不能为空 +functional_case_attachment.file_name.length_range=文件名称长度必须在1-255之间 +functional_case_attachment.size.not_blank=文件大小不能为空 +functional_case_attachment.association.not_blank=关联类型不能为空 #module：FunctionalCaseFollow functional_case_follow.case_id.not_blank=功能用例ID不能为空 functional_case_follow.follow_id.not_blank=关注人ID不能为空 @@ -71,6 +80,10 @@ functional_case_test.test_id.length_range=其他类型用例ID长度必须在1-5 functional_case_test.test_id.not_blank=其他类型用例ID不能为空 functional_case_test.test_type.length_range=用例类型长度必须在1-64之间 functional_case_test.test_type.not_blank=用例类型不能为空 +#module：FunctionalCaseHistory +functional_case_history.id.not_blank=ID不能为空 +functional_case_history.case_id.not_blank=功能用例ID不能为空 +functional_case_history.content.not_blank=内容不能为空 #module：MinderExtraNode minder_extra_node.id.not_blank=ID不能为空 minder_extra_node.parent_id.length_range=父节点的ID长度必须在1-50之间 diff --git a/backend/framework/sdk/src/main/resources/i18n/case_zh_TW.properties b/backend/framework/sdk/src/main/resources/i18n/case_zh_TW.properties index 081165dab2..26b1157e3b 100644 --- a/backend/framework/sdk/src/main/resources/i18n/case_zh_TW.properties +++ b/backend/framework/sdk/src/main/resources/i18n/case_zh_TW.properties @@ -7,12 +7,13 @@ functional_case.module_id.length_range=模塊ID長度必須在1-50之間 functional_case.module_id.not_blank=模塊ID不能為空 functional_case.project_id.length_range=項目ID長度必須在1-50之間 functional_case.project_id.not_blank=項目ID不能為空 +functional_case.template_id.not_blank=模板ID不能為空 functional_case.name.length_range=名稱長度必須在1-255之間 functional_case.name.not_blank=名稱不能為空 functional_case.review_status.length_range=評審狀態長度必須在1-64之間 functional_case.review_status.not_blank=評審狀態不能為空 -functional_case.step_model.length_range=編輯模式長度必須在1-64之間 -functional_case.step_model.not_blank=編輯模式不能為空 +functional_case.case_edit_type.length_range=編輯模式長度必須在1-64之間 +functional_case.case_edit_type.not_blank=編輯模式不能為空 functional_case.version_id.length_range=版本ID長度必須在1-50之間 functional_case.version_id.not_blank=版本ID不能為空 functional_case.ref_id.length_range=指向初始版本ID必须在1-50之間 @@ -48,8 +49,16 @@ functional_case_module.pos.not_blank=同一節點下的順序不能為空 functional_case_module.create_user.length_range=創建人長度必須在1-50之間 functional_case_module.create_user.not_blank=創建人不能為空 #module：FunctionalCaseAttachment -functional_case_attachment.functional_case_id.not_blank=功能用例ID不能爲空 +functional_case_attachment.case_id.not_blank=功能用例ID不能爲空 +functional_case_attachment.case_id.length_range=功能用例ID長度必須在1-50之間 functional_case_attachment.file_id.not_blank=文件ID不能爲空 +functional_case_attachment.file_id.length_range=文件ID長度必須在1-50之間 +functional_case_attachment.id.not_blank=ID不能爲空 +functional_case_attachment.id.length_range=ID長度必須在1-50之間 +functional_case_attachment.file_name.not_blank=文件名不能爲空 +functional_case_attachment.file_name.length_range=文件名長度必須在1-255之間 +functional_case_attachment.size.not_blank=文件大小不能爲空 +functional_case_attachment.association.not_blank=關聯類型不能爲空 #module：FunctionalCaseFollow functional_case_follow.case_id.not_blank=功能用例ID不能爲空 functional_case_follow.follow_id.not_blank=關注人ID不能爲空 @@ -71,6 +80,10 @@ functional_case_test.test_id.length_range=其他類型用例ID長度必須在1-5 functional_case_test.test_id.not_blank=其他類型用例ID不能為空 functional_case_test.test_type.length_range=用例類型長度必須在1-64之間 functional_case_test.test_type.not_blank=用例類型不能為空 +#module：FunctionalCaseHistory +functional_case_history.id.not_blank=ID不能為空 +functional_case_history.case_id.not_blank=功能用例ID不能爲空 +functional_case_history.content.not_blank=內容不能爲空 #module：MinderExtraNode minder_extra_node.id.not_blank=ID不能為空 minder_extra_node.parent_id.length_range=父節點的ID長度必須在1-50之間