feat_测试跟踪_评审添加关注人

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;

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<String> values) {
+            addCriterion("follow_people in", values, "followPeople");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowPeopleNotIn(List<String> 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 {

backend/src/main/java/io/metersphere/base/mapper/TestCaseReviewMapper.xml

@@ -12,6 +12,7 @@
     <result column="project_id" jdbcType="VARCHAR" property="projectId" />
     <result column="tags" jdbcType="VARCHAR" property="tags" />
     <result column="create_user" jdbcType="VARCHAR" property="createUser" />
+    <result column="follow_people" jdbcType="VARCHAR" property="followPeople" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.TestCaseReview">
     <result column="description" jdbcType="LONGVARCHAR" property="description" />
@@ -76,7 +77,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, `name`, creator, `status`, create_time, update_time, end_time, project_id, tags, 
-    create_user
+    create_user, follow_people
   </sql>
   <sql id="Blob_Column_List">
     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>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.TestCaseReview">
     insert into test_case_review
@@ -172,6 +175,9 @@
       <if test="createUser != null">
         create_user,
       </if>
+      <if test="followPeople != null">
+        follow_people,
+      </if>
       <if test="description != null">
         description,
       </if>
@@ -207,6 +213,9 @@
       <if test="createUser != null">
         #{createUser,jdbcType=VARCHAR},
       </if>
+      <if test="followPeople != null">
+        #{followPeople,jdbcType=VARCHAR},
+      </if>
       <if test="description != null">
         #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -251,6 +260,9 @@
       <if test="record.createUser != null">
         create_user = #{record.createUser,jdbcType=VARCHAR},
       </if>
+      <if test="record.followPeople != null">
+        follow_people = #{record.followPeople,jdbcType=VARCHAR},
+      </if>
       <if test="record.description != null">
         description = #{record.description,jdbcType=LONGVARCHAR},
       </if>
@@ -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}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -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}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -322,6 +336,9 @@
       <if test="createUser != null">
         create_user = #{createUser,jdbcType=VARCHAR},
       </if>
+      <if test="followPeople != null">
+        follow_people = #{followPeople,jdbcType=VARCHAR},
+      </if>
       <if test="description != null">
         description = #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -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}
   </update>
@@ -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}
   </update>
 </mapper>

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

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;
+

frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue

@@ -47,11 +47,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" :offset="1">
-            <el-form-item :label="$t('api_test.automation.follow_people')" :label-width="formLabelWidth"
+            <el-form-item :label="$t('test_track.review.review_follow_people')" :label-width="formLabelWidth"
                           prop="followPeople">
               <el-select v-model="form.followPeople"
                          clearable
-                         :placeholder="$t('api_test.automation.follow_people')" filterable size="small">
+                         :placeholder="$t('test_track.review.review_follow_people')" filterable size="small">
                 <el-option
                   v-for="item in maintainerOptions"
                   :key="item.id"

frontend/src/business/components/track/review/components/TestCaseReviewList.vue

@@ -65,6 +65,14 @@
                     :content="itemName" style="margin-left: 0px; margin-right: 2px"></ms-tag>
           </template>
         </el-table-column>
+        <el-table-column
+          v-if="item.id=='followPeople'"
+          prop="followPeople"
+          :label="$t('test_track.review.review_follow_people')"
+          show-overflow-tooltip
+          :key="index"
+        >
+        </el-table-column>
         <el-table-column
           v-if="item.id=='createTime'"
           prop="createTime"

frontend/src/i18n/en-US.js

@@ -1639,6 +1639,7 @@ export default {
       reviewer: "Reviewer",
       review_project: "Project",
       review_creator: "Creator",
+      review_follow_people: "Follow",
       review_status: "Status",
       related_project: "Related Project",
       related_tip: "After the project is associated, you can add test cases under the associated project to the review list",

frontend/src/i18n/zh-CN.js

@@ -1649,6 +1649,7 @@ export default {
       related_project: "关联项目",
       related_tip: "关联项目后可以添加关联项目下的测试用例到评审列表",
       review_creator: "发起人",
+      review_follow_people: "关注人",
       review_status: "当前状态",
       end_time: "截止时间",
       delete: "删除评审",

frontend/src/i18n/zh-TW.js

@@ -1650,6 +1650,7 @@ export default {
       related_project: "關聯項目",
       related_tip: "關聯項目後可以添加關聯項目下的測試用例到評審列表",
       review_creator: "發起人",
+      review_follow_people: "關註人",
       review_status: "當前狀態",
       end_time: "截止時間",
       delete: "刪除評審",