From 281d52b82112e88d20824f016f47884b0071c721 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Fri, 17 Mar 2023 20:07:13 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=88=91=E7=9A=84=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=B8=AD=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=9C=89=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1024013 --user=郭雨琦
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001024013
---
 .../base/mapper/ext/ExtTestCaseMapper.xml     | 65 ++++++++++---------
 .../src/business/component/CaseTableList.vue  | 10 +--
 2 files changed, 41 insertions(+), 34 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 2a5136537d..3ebbaf71a0 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
@@ -422,7 +422,8 @@
         from test_case
         left join (select id,workspace_id,NAME from project where workspace_id =#{request.workspaceId})
         project on test_case.project_id = project.id
-        where test_case.STATUS != 'Trash' and test_case.case_public = true GROUP BY ref_id)
+        where test_case.case_public = true and (test_case.status != 'Trash' or test_case.status is null) GROUP BY
+        ref_id)
         tmp on test_case.update_time = tmp.update_time and test_case.ref_id = tmp.ref_id
         <where>
             <if test="request.combine != null">
@@ -555,8 +556,10 @@
                             <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.filterInWrapper"/>
                         </when>
                         <when test="key=='last_execute_result'">
-                            and test_case.last_execute_result in
+                            and (test_case.last_execute_result in
                             <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.filterInWrapper"/>
+                            or test_case.last_execute_result is null)
+
                         </when>
                         <when test="key=='status'">
                             and test_case.status in
@@ -601,12 +604,12 @@
                     </choose>
                 </if>
                 <if test="key=='status' and (values == null || values.size() == 0)">
-                    and test_case.status != 'Trash'
+                    and (test_case.status != 'Trash' or test_case.status is null)
                 </if>
             </foreach>
         </if>
         <if test="request.filters == null || request.filters.size() == 0 || !request.filters.containsKey('status')">
-            and test_case.status != 'Trash'
+            and (test_case.status != 'Trash' or test_case.status is null)
         </if>
     </sql>
 
@@ -806,7 +809,7 @@
         SELECT test_case.priority as groupField, count(id) AS countNumber
         FROM test_case
         WHERE project_id = #{projectId}
-          AND test_case.status != 'Trash'
+          and (test_case.status != 'Trash' or test_case.status is null)
           and latest = true
         GROUP BY test_case.priority
     </select>
@@ -815,15 +818,17 @@
         SELECT count(DISTINCT ref_id) AS countNumber
         FROM test_case
         WHERE test_case.project_id = #{projectId}
-          and test_case.status != 'Trash' and latest = 1
+          and (test_case.status != 'Trash' or test_case.status is null)
+          and latest = 1
           AND create_time BETWEEN #{firstDayTimestamp}
-          AND #{lastDayTimestamp}
+            AND #{lastDayTimestamp}
     </select>
     <select id="countStatus" resultType="io.metersphere.dto.TrackCountResult">
         SELECT review_status AS groupField, count(id) AS countNumber
         FROM test_case
         WHERE project_id = #{projectId}
-          and test_case.status != 'Trash' and latest = 1
+          and (test_case.status != 'Trash' or test_case.status is null)
+          and latest = 1
         GROUP BY test_case.review_status
     </select>
 
@@ -853,39 +858,41 @@
           and test_id IN (select id FROM ui_scenario WHERE `STATUS` != 'Trash')
         </if>
         )
-            test_case_test
+        test_case_test
         ON test_case.id = test_case_test.test_case_id
         WHERE
-            test_case.project_id = #{projectId}
-          AND test_case.STATUS != 'Trash'
-          AND latest = 1
+        test_case.project_id = #{projectId}
+        and (test_case.status != 'Trash' or test_case.status is null)
+        AND latest = 1
         GROUP BY
-            test_case_test.test_type
+        test_case_test.test_type
     </select>
     <select id="countRelevanceCreatedThisWeek" resultType="java.lang.Long">
         SELECT count(distinct test_case.ref_id) AS countNumber
         FROM test_case
                  join test_case_test on test_case.id = test_case_test.test_case_id
         WHERE test_case.project_id = #{projectId}
-          and test_case.status != 'Trash' and latest = 1
-        AND test_case_test.create_time BETWEEN #{firstDayTimestamp}
-          AND #{lastDayTimestamp}
+          and (test_case.status != 'Trash' or test_case.status is null)
+          and latest = 1
+          AND test_case_test.create_time BETWEEN #{firstDayTimestamp}
+            AND #{lastDayTimestamp}
     </select>
 
     <select id="countCoverage" resultType="int">
         select count(test_case.id)
         from test_case
         where test_case.project_id = #{projectId}
-          and test_case.status != 'Trash' and latest = 1
+        and (test_case.status != 'Trash' or test_case.status is null) and latest = 1
         and test_case.id in (
-                SELECT test_case_id FROM test_case_test WHERE test_type = 'testCase' and test_id IN (select id FROM
-                api_test_case WHERE `STATUS` is null or status != 'Trash')
-                UNION
-                SELECT test_case_id FROM test_case_test WHERE test_type = 'performance' and test_id IN (select id from load_test)
-                UNION
-                SELECT test_case_id FROM test_case_test WHERE test_type = 'automation' and test_id IN (select id FROM
-                api_scenario WHERE `STATUS` != 'Trash')
-                <if test="queryUi">
+        SELECT test_case_id FROM test_case_test WHERE test_type = 'testCase' and test_id IN (select id FROM
+        api_test_case WHERE `STATUS` is null or status != 'Trash')
+        UNION
+        SELECT test_case_id FROM test_case_test WHERE test_type = 'performance' and test_id IN (select id from
+        load_test)
+        UNION
+        SELECT test_case_id FROM test_case_test WHERE test_type = 'automation' and test_id IN (select id FROM
+        api_scenario WHERE `STATUS` != 'Trash')
+        <if test="queryUi">
                     UNION
                     SELECT test_case_id FROM test_case_test WHERE test_type = 'uiAutomation' and test_id IN (select id FROM
                     ui_scenario WHERE `STATUS` != 'Trash')
@@ -1009,7 +1016,7 @@
             <foreach collection="ids" item="id" separator="," open="(" close=")">
                 #{id}
             </foreach>
-            and test_case.status != 'Trash'
+            and (test_case.status != 'Trash' or test_case.status is null)
         </where>
     </select>
     <select id="selectRelateIdsByQuery" resultType="java.lang.String">
@@ -1100,7 +1107,7 @@
         <foreach collection="ids" item="id" separator="," open="(" close=")">
             #{id}
         </foreach>
-        and test_case.status != 'Trash';
+        and (test_case.status != 'Trash' or test_case.status is null);
     </select>
     <select id="countByIds" resultType="java.lang.Integer">
         select count(id)
@@ -1109,7 +1116,7 @@
         <foreach collection="ids" item="id" separator="," open="(" close=")">
             #{id}
         </foreach>
-        and test_case.status != 'Trash';
+        and (test_case.status != 'Trash' or test_case.status is null);
     </select>
 
     <update id="deleteToGc">
@@ -1185,7 +1192,7 @@
                              from project
                              where workspace_id = #{workSpaceId})
           and case_public = true
-          and test_case.status != 'Trash'
+          and (test_case.status != 'Trash' or test_case.status is null)
     </select>
 
     <select id="trashCount" resultType="java.lang.Long">
diff --git a/workstation/frontend/src/business/component/CaseTableList.vue b/workstation/frontend/src/business/component/CaseTableList.vue
index 9436c9b474..7e5e36f717 100644
--- a/workstation/frontend/src/business/component/CaseTableList.vue
+++ b/workstation/frontend/src/business/component/CaseTableList.vue
@@ -371,9 +371,9 @@ export default {
       }
     } else {
       if (this.condition.filters) {
-        this.condition.filters.reviewStatus = ["Prepare", "Pass", "UnPass"];
+        this.condition.filters.review_status = ["Prepare", "Pass", "UnPass"];
       } else {
-        this.condition.filters = {reviewStatus: ["Prepare", "Pass", "UnPass"]};
+        this.condition.filters = {review_status: ["Prepare", "Pass", "UnPass"]};
       }
 
     }
@@ -390,9 +390,9 @@ export default {
   activated() {
     this.getTemplateField();
     if (this.condition.filters) {
-      this.condition.filters.reviewStatus = ["Prepare", "Pass", "UnPass"];
+      this.condition.filters.review_status = ["Prepare", "Pass", "UnPass"];
     } else {
-      this.condition.filters = {reviewStatus: ["Prepare", "Pass", "UnPass"]};
+      this.condition.filters = {review_status: ["Prepare", "Pass", "UnPass"]};
     }
     let ids = this.$route.params.ids;
     if (ids) {
@@ -594,7 +594,7 @@ export default {
       this.condition.selectThisWeedData = false;
       this.condition.selectThisWeedRelevanceData = false;
       this.condition.caseCoverage = null;
-      this.condition.filters.reviewStatus = ["Prepare", "Pass", "UnPass"];
+      this.condition.filters.review_status = ["Prepare", "Pass", "UnPass"];
       switch (this.selectDataRange) {
         case 'thisWeekCount':
           this.condition.selectThisWeedData = true;