From 24c569ff648712e809152b7c293ee6d8bd2b714c Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Wed, 26 Apr 2023 18:41:49 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=B1=95=E7=A4=BA=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1025573 --user=宋昌昌 【我的工作台】我的待办-功能用例数统计错误-用例状态是已完成，仍统计在我的待办中。 https://www.tapd.cn/55049933/s/1367288
---
 .../base/mapper/ext/ExtTestCaseMapper.xml           |  3 +++
 .../request/testcase/QueryTestCaseRequest.java      |  5 +++++
 .../base/mapper/ext/ExtTestCaseMapper.xml           |  1 -
 .../src/business/component/CaseTableList.vue        | 13 ++++++++-----
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index a587e0cc98..6a48409a7f 100644
--- a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -653,6 +653,9 @@
             <if test="request.notEqStatus != null">
                 and test_case.status != #{request.notEqStatus}
             </if>
+            <if test="request.unComing">
+                and (test_case.status is null or test_case.status not in ('Trash', 'Completed'))
+            </if>
             <if test="request.casePublic != null and request.casePublic == true">
                 and test_case.case_public = true
             </if>
diff --git a/test-track/backend/src/main/java/io/metersphere/request/testcase/QueryTestCaseRequest.java b/test-track/backend/src/main/java/io/metersphere/request/testcase/QueryTestCaseRequest.java
index eac4f6e564..04279ac5f5 100644
--- a/test-track/backend/src/main/java/io/metersphere/request/testcase/QueryTestCaseRequest.java
+++ b/test-track/backend/src/main/java/io/metersphere/request/testcase/QueryTestCaseRequest.java
@@ -68,4 +68,9 @@ public class QueryTestCaseRequest extends BaseQueryRequest {
      * 是否查询UI
      */
     private boolean queryUi;
+
+    /**
+     * 是否待办状态
+     */
+    private boolean unComing;
 }
diff --git a/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index 126a0f0a39..ab83427d20 100644
--- a/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -202,7 +202,6 @@
         <foreach collection="projectIds" item="projectId" separator="," open="(" close=")">
             #{projectId}
         </foreach>
-        and tc.review_status in ('Prepare','Pass','UnPass')
         and tc.create_user = #{userId,jdbcType=VARCHAR}
         and (tc.status is null or tc.status Not IN ('Trash','Completed'));
     </select>
diff --git a/workstation/frontend/src/business/component/CaseTableList.vue b/workstation/frontend/src/business/component/CaseTableList.vue
index a68d4de14f..362b656b4c 100644
--- a/workstation/frontend/src/business/component/CaseTableList.vue
+++ b/workstation/frontend/src/business/component/CaseTableList.vue
@@ -426,10 +426,10 @@ export default {
       }
     } else {
       if (this.condition.filters) {
-        this.condition.filters.review_status = ["Prepare", "Pass", "UnPass"];
+        this.condition.filters.review_status = ["Prepare", "Underway", "Pass", "UnPass"];
       } else {
         this.condition.filters = {
-          review_status: ["Prepare", "Pass", "UnPass"],
+          review_status: ["Prepare", "Underway", "Pass", "UnPass"],
         };
       }
     }
@@ -446,14 +446,17 @@ export default {
   activated() {
     this.getTemplateField();
     if (this.condition.filters) {
-      this.condition.filters.review_status = ["Prepare", "Pass", "UnPass"];
+      this.condition.filters.review_status = ["Prepare", "Underway", "Pass", "UnPass"];
     } else {
-      this.condition.filters = { review_status: ["Prepare", "Pass", "UnPass"] };
+      this.condition.filters = { review_status: ["Prepare", "Underway", "Pass", "UnPass"]};
     }
     let ids = this.$route.params.ids;
     if (ids) {
       this.condition.ids = ids;
     }
+    if (!this.isCreation && !this.isFocus) {
+      this.condition.unComing = true;
+    }
     this.initTableData();
     this.condition.ids = null;
   },
@@ -686,7 +689,7 @@ export default {
       this.condition.selectThisWeedData = false;
       this.condition.selectThisWeedRelevanceData = false;
       this.condition.caseCoverage = null;
-      this.condition.filters.review_status = ["Prepare", "Pass", "UnPass"];
+      this.condition.filters.review_status = ["Prepare", "Underway", "Pass", "UnPass"];
       switch (this.selectDataRange) {
         case "thisWeekCount":
           this.condition.selectThisWeedData = true;