fix(测试跟踪): 测试计划关联功能用例添加评审结果列

test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml

@@ -113,6 +113,12 @@
                 <property name="object" value="${condition}.executor"/>
             </include>
         </if>
+        <if test="${condition}.reviewStatus != null">
+            and test_case.review_status
+            <include refid="condition">
+                <property name="object" value="${condition}.reviewStatus"/>
+            </include>
+        </if>
         <if test='${condition}.tags != null and ${objectKey}.value.size() > 0 and ${objectKey}.operator == "not like"'>
             and ( test_case.tags is null or
             <foreach collection="${objectKey}.value" item="tag" separator="and" open="(" close=")">
@@ -273,6 +279,10 @@
                                 #{value}
                             </foreach>
                         </when>
+                        <when test="key=='review_status'">
+                            and test_case.review_status in
+                            <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.filterInWrapper"/>
+                        </when>
                         <when test="key=='version_id'">
                             and test_case.version_id in
                             <foreach collection="values" item="value" separator="," open="(" close=")">

test-track/frontend/src/business/plan/view/comonents/functional/FunctionalTestCaseList.vue

@@ -198,7 +198,7 @@
                 <span class="el-dropdown-link">
                   <status-table-item :value="scope.row.status"/>
                 </span>
-                <el-dropdown-menu slot="dropdown" chang>
+                <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item :disabled="!hasEditPermission"
                                     :command="{id: scope.row.id, caseId: scope.row.caseId, status: 'Pass'}">
                     {{ $t('test_track.plan_view.pass') }}
@@ -221,6 +221,20 @@
           </template>
         </ms-table-column>
 
+        <ms-table-column
+            prop="reviewStatus"
+            :field="item"
+            :filters="reviewStatusFilters"
+            min-width="140px"
+            :fields-width="fieldsWidth"
+            :label="$t('test_track.case.status')">
+          <template v-slot:default="scope">
+              <span class="el-dropdown-link">
+                <review-status :value="scope.row.reviewStatus"/>
+              </span>
+          </template>
+        </ms-table-column>
+
         <ms-table-column
             sortable="custom"
             prop="updateTime"
@@ -341,10 +355,12 @@ import {
   testPlanTestCaseEdit
 } from "@/api/remote/plan/test-plan-test-case";
 import {getOriginIssuesByCaseId} from "@/api/issue";
+import ReviewStatus from "@/business/case/components/ReviewStatus.vue";
 
 export default {
   name: "FunctionalTestCaseList",
   components: {
+    ReviewStatus,
     TestPlanCaseIssueItem,
     MsTableColumn,
     MsTable,
@@ -404,6 +420,13 @@ export default {
         {text: this.$t('test_track.plan_view.skip'), value: 'Skip'}
       ],
       userFilters: [],
+      reviewStatusFilters: [
+        {text: this.$t('test_track.review.prepare'), value: 'Prepare'},
+        {text: this.$t('test_track.review.again'), value: 'Again'},
+        {text: this.$t('test_track.review.pass'), value: 'Pass'},
+        {text: this.$t('test_track.review.un_pass'), value: 'UnPass'},
+        {text: this.$t('test_track.review.underway'), value: 'Underway'}
+      ],
       showMore: false,
       typeArr: [
         {id: 'status', name: this.$t('test_track.plan_view.execute_result')},

test-track/frontend/src/business/utils/track-table-header.js

@@ -14,8 +14,9 @@ const TRACK_HEADER = {
     {id: 'executor', key: '7', label: 'test_track.plan_view.executor'},
     {id: 'maintainerName', key: 'c', label: 'test_track.plan.plan_principal'},
     {id: 'status', key: '8', label: 'test_track.plan_view.execute_result'},
-    {id: 'updateTime', key: '9', label: 'commons.update_time'},
+    {id: 'reviewStatus', key: '9', label: 'test_track.review_view.execute_result'},
-    {id: 'createTime', key: 'a', label: 'commons.create_time'},
+    {id: 'updateTime', key: 'a', label: 'commons.update_time'},
+    {id: 'createTime', key: 'e', label: 'commons.create_time'},
   ],
   //测试计划
   TEST_PLAN_LIST: [