diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCaseReview.java b/backend/src/main/java/io/metersphere/base/domain/TestCaseReview.java index 3bad1cb554..a9177d2baa 100644 --- a/backend/src/main/java/io/metersphere/base/domain/TestCaseReview.java +++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseReview.java @@ -1,8 +1,7 @@ package io.metersphere.base.domain; -import lombok.Data; - import java.io.Serializable; +import lombok.Data; @Data public class TestCaseReview implements Serializable { @@ -26,6 +25,8 @@ public class TestCaseReview implements Serializable { private String createUser; + private String followPeople; + private String description; private static final long serialVersionUID = 1L; diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewExample.java b/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewExample.java index a66db79941..8ef9e96ae6 100644 --- a/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewExample.java +++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseReviewExample.java @@ -773,6 +773,76 @@ public class TestCaseReviewExample { addCriterion("create_user not between", value1, value2, "createUser"); return (Criteria) this; } + + public Criteria andFollowPeopleIsNull() { + addCriterion("follow_people is null"); + return (Criteria) this; + } + + public Criteria andFollowPeopleIsNotNull() { + addCriterion("follow_people is not null"); + return (Criteria) this; + } + + public Criteria andFollowPeopleEqualTo(String value) { + addCriterion("follow_people =", value, "followPeople"); + return (Criteria) this; + } + + public Criteria andFollowPeopleNotEqualTo(String value) { + addCriterion("follow_people <>", value, "followPeople"); + return (Criteria) this; + } + + public Criteria andFollowPeopleGreaterThan(String value) { + addCriterion("follow_people >", value, "followPeople"); + return (Criteria) this; + } + + public Criteria andFollowPeopleGreaterThanOrEqualTo(String value) { + addCriterion("follow_people >=", value, "followPeople"); + return (Criteria) this; + } + + public Criteria andFollowPeopleLessThan(String value) { + addCriterion("follow_people <", value, "followPeople"); + return (Criteria) this; + } + + public Criteria andFollowPeopleLessThanOrEqualTo(String value) { + addCriterion("follow_people <=", value, "followPeople"); + return (Criteria) this; + } + + public Criteria andFollowPeopleLike(String value) { + addCriterion("follow_people like", value, "followPeople"); + return (Criteria) this; + } + + public Criteria andFollowPeopleNotLike(String value) { + addCriterion("follow_people not like", value, "followPeople"); + return (Criteria) this; + } + + public Criteria andFollowPeopleIn(List values) { + addCriterion("follow_people in", values, "followPeople"); + return (Criteria) this; + } + + public Criteria andFollowPeopleNotIn(List values) { + addCriterion("follow_people not in", values, "followPeople"); + return (Criteria) this; + } + + public Criteria andFollowPeopleBetween(String value1, String value2) { + addCriterion("follow_people between", value1, value2, "followPeople"); + return (Criteria) this; + } + + public Criteria andFollowPeopleNotBetween(String value1, String value2) { + addCriterion("follow_people not between", value1, value2, "followPeople"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewMapper.xml index 972f84d6d9..17519a5ac7 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewMapper.xml @@ -12,6 +12,7 @@ + @@ -76,7 +77,7 @@ id, `name`, creator, `status`, create_time, update_time, end_time, project_id, tags, - create_user + create_user, follow_people description @@ -133,11 +134,13 @@ insert into test_case_review (id, `name`, creator, `status`, create_time, update_time, end_time, project_id, tags, - create_user, description) + create_user, follow_people, description + ) values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{creator,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, #{projectId,jdbcType=VARCHAR}, #{tags,jdbcType=VARCHAR}, - #{createUser,jdbcType=VARCHAR}, #{description,jdbcType=LONGVARCHAR}) + #{createUser,jdbcType=VARCHAR}, #{followPeople,jdbcType=VARCHAR}, #{description,jdbcType=LONGVARCHAR} + ) insert into test_case_review @@ -172,6 +175,9 @@ create_user, + + follow_people, + description, @@ -207,6 +213,9 @@ #{createUser,jdbcType=VARCHAR}, + + #{followPeople,jdbcType=VARCHAR}, + #{description,jdbcType=LONGVARCHAR}, @@ -251,6 +260,9 @@ create_user = #{record.createUser,jdbcType=VARCHAR}, + + follow_people = #{record.followPeople,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=LONGVARCHAR}, @@ -271,6 +283,7 @@ project_id = #{record.projectId,jdbcType=VARCHAR}, tags = #{record.tags,jdbcType=VARCHAR}, create_user = #{record.createUser,jdbcType=VARCHAR}, + follow_people = #{record.followPeople,jdbcType=VARCHAR}, description = #{record.description,jdbcType=LONGVARCHAR} @@ -287,7 +300,8 @@ end_time = #{record.endTime,jdbcType=BIGINT}, project_id = #{record.projectId,jdbcType=VARCHAR}, tags = #{record.tags,jdbcType=VARCHAR}, - create_user = #{record.createUser,jdbcType=VARCHAR} + create_user = #{record.createUser,jdbcType=VARCHAR}, + follow_people = #{record.followPeople,jdbcType=VARCHAR} @@ -322,6 +336,9 @@ create_user = #{createUser,jdbcType=VARCHAR}, + + follow_people = #{followPeople,jdbcType=VARCHAR}, + description = #{description,jdbcType=LONGVARCHAR}, @@ -339,6 +356,7 @@ project_id = #{projectId,jdbcType=VARCHAR}, tags = #{tags,jdbcType=VARCHAR}, create_user = #{createUser,jdbcType=VARCHAR}, + follow_people = #{followPeople,jdbcType=VARCHAR}, description = #{description,jdbcType=LONGVARCHAR} where id = #{id,jdbcType=VARCHAR} @@ -352,7 +370,8 @@ end_time = #{endTime,jdbcType=BIGINT}, project_id = #{projectId,jdbcType=VARCHAR}, tags = #{tags,jdbcType=VARCHAR}, - create_user = #{createUser,jdbcType=VARCHAR} + create_user = #{createUser,jdbcType=VARCHAR}, + follow_people = #{followPeople,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml index 9c9ff74aea..718d272d55 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml @@ -7,7 +7,8 @@ select distinct test_case_review.id, test_case_review.name, test_case_review.creator, test_case_review.status, test_case_review.tags, test_case_review.create_time, test_case_review.update_time, test_case_review.end_time, - test_case_review.description, user.name as creatorName, project.name as projectName, test_case_review.project_id + test_case_review.description, user.name as creatorName, project.name as projectName, test_case_review.project_id, + test_case_review.follow_people from test_case_review join project on project.id = test_case_review.project_id left join user on test_case_review.creator = user.id diff --git a/backend/src/main/resources/db/migration/V97__v1.14_release.sql b/backend/src/main/resources/db/migration/V97__v1.14_release.sql index 662b3c4a49..88cda1142e 100644 --- a/backend/src/main/resources/db/migration/V97__v1.14_release.sql +++ b/backend/src/main/resources/db/migration/V97__v1.14_release.sql @@ -50,3 +50,6 @@ create table if not exists relationship_edge ( ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE utf8mb4_general_ci; + +ALTER TABLE test_case_review ADD COLUMN follow_people; + diff --git a/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue b/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue index b97370fdb5..ddca54d6a3 100644 --- a/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue +++ b/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue @@ -47,11 +47,11 @@ - + :placeholder="$t('test_track.review.review_follow_people')" filterable size="small"> + +