feat: 测试评审关联测试用例时增加状态列

backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml

@@ -99,7 +99,7 @@
 
 
     <select id="getTestCaseNames" resultType="io.metersphere.base.domain.TestCase">
-        select test_case.id, test_case.name, test_case.priority, test_case.type
+        select test_case.id, test_case.name, test_case.priority, test_case.type, test_case.review_status
         from test_case
         <where>
             <if test="request.combine != null">
@@ -130,6 +130,12 @@
                                     #{value}
                                 </foreach>
                             </when>
+                            <when test="key=='status'">
+                                and test_case.review_status in
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
                             <otherwise>
                                 and test_case.type in
                                 <foreach collection="values" item="value" separator="," open="(" close=")">
@@ -181,6 +187,12 @@
                                     #{value}
                                 </foreach>
                             </when>
+                            <when test="key=='status'">
+                                and test_case.review_status in
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
                             <otherwise>
                                 and test_case.method in
                                 <foreach collection="values" item="value" separator="," open="(" close=")">

frontend/src/business/components/track/case/components/TestCaseList.vue

@@ -90,7 +90,7 @@
         <el-table-column
           :filters="statusFilters"
           column-key="status"
-          :label="$t('test_track.review_view.execute_result')">
+          :label="$t('test_track.case.status')">
           <template v-slot:default="scope">
             <span class="el-dropdown-link">
               <status-table-item :value="scope.row.reviewStatus"/>

frontend/src/business/components/track/home/components/ReviewList.vue

@@ -43,24 +43,24 @@
         </template>
       </el-table-column>
 
-      <el-table-column
-        prop="projectName"
-        :label="$t('test_track.review.done')"
-        show-overflow-tooltip>
-        <template v-slot:default="scope">
-          {{scope.row.reviewed}}/{{scope.row.total}}
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--        prop="projectName"-->
+<!--        :label="$t('test_track.review.done')"-->
+<!--        show-overflow-tooltip>-->
+<!--        <template v-slot:default="scope">-->
+<!--          {{scope.row.reviewed}}/{{scope.row.total}}-->
+<!--        </template>-->
+<!--      </el-table-column>-->
 
-      <el-table-column
-        prop="projectName"
-        :label="$t('test_track.home.review_progress')"
-        min-width="100"
-        show-overflow-tooltip>
-        <template v-slot:default="scope">
-          <el-progress :percentage="scope.row.testRate"></el-progress>
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--        prop="projectName"-->
+<!--        :label="$t('test_track.home.review_progress')"-->
+<!--        min-width="100"-->
+<!--        show-overflow-tooltip>-->
+<!--        <template v-slot:default="scope">-->
+<!--          <el-progress :percentage="scope.row.testRate"></el-progress>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
 
       <el-table-column
         prop="projectName"

frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue

@@ -62,6 +62,15 @@
                   <type-table-item :value="scope.row.type"/>
                 </template>
               </el-table-column>
+              <el-table-column
+                :filters="statusFilters"
+                column-key="status"
+                :label="$t('test_track.case.status')"
+                show-overflow-tooltip>
+                <template v-slot:default="scope">
+                  <status-table-item :value="scope.row.reviewStatus"/>
+                </template>
+              </el-table-column>
             </el-table>
             <div style="text-align: center">共 {{testReviews.length}} 条</div>
           </el-main>
@@ -91,6 +100,7 @@ import MsTableHeader from "../../../../common/components/MsTableHeader";
 import SwitchProject from "../../../case/components/SwitchProject";
 import {TEST_CASE_CONFIGS} from "../../../../common/components/search/search-components";
 import {_filter} from "../../../../../../common/js/utils";
+import StatusTableItem from "@/business/components/track/common/tableItems/planview/StatusTableItem";
 
 export default {
   name: "TestReviewRelevance",
@@ -102,7 +112,8 @@ export default {
     MsTableSearchBar,
     MsTableAdvSearchBar,
     MsTableHeader,
-    SwitchProject
+    SwitchProject,
+    StatusTableItem
   },
   data() {
     return {
@@ -130,7 +141,12 @@ export default {
         {text: this.$t('commons.functional'), value: 'functional'},
         {text: this.$t('commons.performance'), value: 'performance'},
         {text: this.$t('commons.api'), value: 'api'}
-      ]
+      ],
+      statusFilters: [
+        {text: this.$t('test_track.case.status_prepare'), value: 'Prepare'},
+        {text: this.$t('test_track.case.status_pass'), value: 'Pass'},
+        {text: this.$t('test_track.case.status_un_pass'), value: 'UnPass'},
+      ],
     };
   },
   props: {

frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue

@@ -206,9 +206,9 @@ export default {
         {text: this.$t('commons.api'), value: 'api'}
       ],
       statusFilters: [
-        {text: this.$t('test_track.plan.plan_status_prepare'), value: 'Prepare'},
-        {text: this.$t('test_track.plan_view.pass'), value: 'Pass'},
-        {text: '未通过', value: 'UnPass'},
+        {text: this.$t('test_track.case.status_prepare'), value: 'Prepare'},
+        {text: this.$t('test_track.case.status_pass'), value: 'Pass'},
+        {text: this.$t('test_track.case.status_un_pass'), value: 'UnPass'},
       ],
       showMore: false,
       buttons: [

frontend/src/i18n/en-US.js

@@ -695,6 +695,10 @@ export default {
       batch_delete_case: 'Batch delete',
       batch_unlink: 'Batch Unlink',
       project_name: "Project",
+      status: 'Status',
+      status_prepare: 'Prepare',
+      status_pass: 'Pass',
+      status_un_pass: 'UnPass',
       import: {
         import: "Import test case",
         case_import: "Import test case",

frontend/src/i18n/zh-CN.js

@@ -697,6 +697,10 @@ export default {
       batch_delete_case: '批量删除用例',
       batch_unlink: '批量取消关联',
       project_name: '所属项目',
+      status: '状态',
+      status_prepare: '未开始',
+      status_pass: '通过',
+      status_un_pass: '未通过',
       import: {
         import: "导入用例",
         case_import: "导入测试用例",

frontend/src/i18n/zh-TW.js

@@ -697,6 +697,10 @@ export default {
       batch_delete_case: '批量刪除用例',
       batch_unlink: '批量取消關聯',
       project_name: '所屬項目',
+      status: '狀態',
+      status_prepare: '未開始',
+      status_pass: '通過',
+      status_un_pass: '未通過',
       import: {
         import: "導入用例",
         case_import: "導入測試用例",