From 3aac1506a71388fcfe545224dd6999b50f35be1f Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Thu, 25 May 2023 11:54:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E7=94=A8=E4=BE=8B=E4=BB=AA=E8=A1=A8=E7=9B=98=E6=95=B0?=
 =?UTF-8?q?=E7=9B=AE=E4=B8=8E=E5=88=97=E8=A1=A8=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1026482 --user=宋昌昌 【工作台】我的仪表盘中的我创建的功能用例数量跟跳转到我创建的功能用例统计的数量不一致 https://www.tapd.cn/55049933/s/1375631
---
 .../workstation/service/WorkstationService.java    |  7 -------
 .../src/business/component/CaseTableList.vue       | 14 --------------
 .../business/othermodule/track/ReviewStatus.vue    |  2 ++
 .../track/TestCaseReviewStatusTableItem.vue        |  2 ++
 4 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/workstation/backend/src/main/java/io/metersphere/workstation/service/WorkstationService.java b/workstation/backend/src/main/java/io/metersphere/workstation/service/WorkstationService.java
index aab1b12fbe..7888e2db78 100644
--- a/workstation/backend/src/main/java/io/metersphere/workstation/service/WorkstationService.java
+++ b/workstation/backend/src/main/java/io/metersphere/workstation/service/WorkstationService.java
@@ -95,7 +95,6 @@ public class WorkstationService {
         operatorValue.put("operator", "current user");
         operatorValue.put("value", "current user");
         combine.put("creator", operatorValue);
-        Map<String, List<String>> filter = new HashMap<>(2);
         testPlanRequest.setCombine(combine);
         apiTestCaseRequest.setCombine(combine);
         ApiScenarioRequest apiScenarioRequest = new ApiScenarioRequest();
@@ -110,12 +109,6 @@ public class WorkstationService {
         if (isWeek) {
             testCaseRequest.setCreateTime(createTime);
         }
-        List<String> status = new ArrayList<>();
-        status.add("Prepare");
-        status.add("Pass");
-        status.add("UnPass");
-        filter.put("reviewStatus", status);
-        testCaseRequest.setFilters(filter);
         //query db
         int apiScenarioCaseCount = extApiScenarioMapper.listModule(apiScenarioRequest);
         int apiTestCaseCount = extApiTestCaseMapper.moduleCount(apiTestCaseRequest);
diff --git a/workstation/frontend/src/business/component/CaseTableList.vue b/workstation/frontend/src/business/component/CaseTableList.vue
index 0f7d390489..a555e364e8 100644
--- a/workstation/frontend/src/business/component/CaseTableList.vue
+++ b/workstation/frontend/src/business/component/CaseTableList.vue
@@ -424,14 +424,6 @@ export default {
       } else {
         this.condition.filters = { status: ["Trash"] };
       }
-    } else {
-      if (this.condition.filters) {
-        this.condition.filters.review_status = ["Prepare", "Underway", "Pass", "UnPass"];
-      } else {
-        this.condition.filters = {
-          review_status: ["Prepare", "Underway", "Pass", "UnPass"],
-        };
-      }
     }
     this.condition.versionId = this.currentVersion;
     this.initTableData();
@@ -445,11 +437,6 @@ export default {
   },
   activated() {
     this.getTemplateField();
-    if (this.condition.filters) {
-      this.condition.filters.review_status = ["Prepare", "Underway", "Pass", "UnPass"];
-    } else {
-      this.condition.filters = { review_status: ["Prepare", "Underway", "Pass", "UnPass"] };
-    }
     let ids = this.$route.params.ids;
     if (ids) {
       this.condition.ids = ids;
@@ -689,7 +676,6 @@ export default {
       this.condition.selectThisWeedData = false;
       this.condition.selectThisWeedRelevanceData = false;
       this.condition.caseCoverage = null;
-      this.condition.filters.review_status = ["Prepare", "Underway", "Pass", "UnPass"];
       switch (this.selectDataRange) {
         case "thisWeekCount":
           this.condition.selectThisWeedData = true;
diff --git a/workstation/frontend/src/business/othermodule/track/ReviewStatus.vue b/workstation/frontend/src/business/othermodule/track/ReviewStatus.vue
index 7c470d864b..4c0cffdb59 100644
--- a/workstation/frontend/src/business/othermodule/track/ReviewStatus.vue
+++ b/workstation/frontend/src/business/othermodule/track/ReviewStatus.vue
@@ -3,6 +3,8 @@
       <ms-tag v-if="value === 'Prepare'" type="info" :content="$t('test_track.review.prepare')"/>
       <ms-tag v-if="value === 'Pass'" type="success" :content="$t('test_track.review.pass')"/>
       <ms-tag v-if="value === 'UnPass'" type="danger" :content="$t('test_track.review.un_pass')"/>
+      <ms-tag v-if="value === 'Underway'" type="primary" :content="$t('test_track.review.underway')"/>
+      <ms-tag v-if="value === 'Again'" type="warning" :content="$t('test_track.review.again')"/>
     </span>
 </template>
 
diff --git a/workstation/frontend/src/business/othermodule/track/TestCaseReviewStatusTableItem.vue b/workstation/frontend/src/business/othermodule/track/TestCaseReviewStatusTableItem.vue
index b680f6637f..3e818faf93 100644
--- a/workstation/frontend/src/business/othermodule/track/TestCaseReviewStatusTableItem.vue
+++ b/workstation/frontend/src/business/othermodule/track/TestCaseReviewStatusTableItem.vue
@@ -39,8 +39,10 @@ export default {
     return {
       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'}
       ]
     }
   }