From c63d9ac722fa2f4c7247e62a812bcc2012017aec Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 18 Apr 2023 19:38:19 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=B7=A5=E4=BD=9C=E5=8F=B0=E4=B8=AD=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=9F=A5=E5=88=B0=E4=BA=86=E5=B7=B2=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E7=9A=84=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1025573 --user=宋天阳 【我的工作台】我的待办-功能用例数统计错误-用例状态是已完成，仍统计在我的待办中。
https://www.tapd.cn/55049933/s/1364029
---
 .../base/mapper/ext/ExtTestCaseMapper.xml     | 64 ++++++++++---------
 1 file changed, 33 insertions(+), 31 deletions(-)

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 a24fe8027d..9b73a381be 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
@@ -115,30 +115,30 @@
         <if test="${condition}.customs != null and ${condition}.customs.size() > 0">
             <foreach collection="${condition}.customs" item="custom" separator="" open="" close="">
                 and test_case.id ${custom.operator} (
-                    select resource_id from custom_field_test_case where field_id = #{custom.id}
-                    <choose>
-                        <when test="custom.type == 'multipleMember' or custom.type == 'checkbox' or custom.type == 'multipleSelect'">
-                            and ${custom.value}
-                        </when>
-                        <when test="custom.type == 'date' or custom.type == 'datetime'">
-                            and left(replace(unix_timestamp(trim(both '"' from `value`)), '.', ''), 13)
-                            <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.condition">
-                                <property name="object" value="custom"/>
-                            </include>
-                        </when>
-                        <when test="custom.type == 'richText' or custom.type == 'textarea'">
-                            and text_value
-                            <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.condition">
-                                <property name="object" value="custom"/>
-                            </include>
-                        </when>
-                        <otherwise>
-                            and trim(both '"' from value)
-                            <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.condition">
-                                <property name="object" value="custom"/>
-                            </include>
-                        </otherwise>
-                    </choose>
+                select resource_id from custom_field_test_case where field_id = #{custom.id}
+                <choose>
+                    <when test="custom.type == 'multipleMember' or custom.type == 'checkbox' or custom.type == 'multipleSelect'">
+                        and ${custom.value}
+                    </when>
+                    <when test="custom.type == 'date' or custom.type == 'datetime'">
+                        and left(replace(unix_timestamp(trim(both '"' from `value`)), '.', ''), 13)
+                        <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.condition">
+                            <property name="object" value="custom"/>
+                        </include>
+                    </when>
+                    <when test="custom.type == 'richText' or custom.type == 'textarea'">
+                        and text_value
+                        <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.condition">
+                            <property name="object" value="custom"/>
+                        </include>
+                    </when>
+                    <otherwise>
+                        and trim(both '"' from value)
+                        <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.condition">
+                            <property name="object" value="custom"/>
+                        </include>
+                    </otherwise>
+                </choose>
                 )
             </foreach>
         </if>
@@ -188,9 +188,9 @@
     </select>
     <select id="getCountFollow" resultType="java.lang.Integer">
         select count(*) from test_case tc where
-        tc.id in (select tf.case_id from test_case_follow  tf where  tf.follow_id = #{userId,jdbcType=VARCHAR})
-                                    and
-        tc.project_id  in
+        tc.id in (select tf.case_id from test_case_follow tf where tf.follow_id = #{userId,jdbcType=VARCHAR})
+        and
+        tc.project_id in
         <foreach collection="projectIds" item="projectId" separator="," open="(" close=")">
             #{projectId}
         </foreach>
@@ -198,13 +198,13 @@
     </select>
     <select id="getCountUpcoming" resultType="java.lang.Integer">
         select count(*) from test_case tc where
-        tc.project_id  in
+        tc.project_id in
         <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 != 'Trash');
+        and (tc.status is null or tc.status Not IN ('Trash','Completed'));
     </select>
 
     <sql id="queryPublicCaseWhere">
@@ -303,14 +303,16 @@
                         </when>
                         <when test="key.startsWith('custom_single')">
                             and test_case.id in (
-                            select resource_id from custom_field_test_case where concat('custom_single-',field_id) = #{key}
+                            select resource_id from custom_field_test_case where concat('custom_single-',field_id) =
+                            #{key}
                             and trim(both '"' from value) in
                             <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.filterInWrapper"/>
                             )
                         </when>
                         <when test="key.startsWith('custom_multiple')">
                             and test_case.id in (
-                            select resource_id from custom_field_test_case where concat('custom_multiple-',field_id) = #{key}
+                            select resource_id from custom_field_test_case where concat('custom_multiple-',field_id) =
+                            #{key}
                             and
                             <foreach collection="values" item="value" separator="or" open="(" close=")">
                                 JSON_CONTAINS(value, #{value})