From c7863d2db3caecbf668a70d4ed5450ae838074b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BB=BA=E5=9B=BD?= <tianyang.song@fit2cloud.com>
Date: Mon, 17 Apr 2023 11:13:08 +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=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E6=9C=AC=E5=91=A8=E5=88=9B=E5=BB=BA=E6=95=B0=E9=87=8F=E4=B8=8D?=
 =?UTF-8?q?=E5=AF=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1025473 --user=宋天阳
【工作台】github#23653，工作台->我的仪表盘->我创建的用例中，本周新增用例数量统计错误
https://www.tapd.cn/55049933/s/1363235
---
 .../base/mapper/ext/ExtApiTestCaseMapper.xml       | 14 +++++++++-----
 .../base/mapper/ext/ExtLoadTestMapper.xml          |  9 ++++++---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
index 3a6f7cd6f1..12f90c9553 100644
--- a/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@@ -281,16 +281,17 @@
     </select>
     <select id="getCountFollow" resultType="java.lang.Integer">
         select count(*) from api_test_case ac where
-        ac.id in (select af.case_id from api_test_case_follow  af where  af.follow_id = #{userId,jdbcType=VARCHAR})
+        ac.id in (select af.case_id from api_test_case_follow af where af.follow_id = #{userId,jdbcType=VARCHAR})
         and
-        ac.project_id  in
+        ac.project_id in
         <foreach collection="projectIds" item="projectId" separator="," open="(" close=")">
             #{projectId}
         </foreach>
         and (ac.status is null or ac.status != 'Trash');
     </select>
     <select id="getUpdateCount" resultType="java.lang.Integer">
-        select count(*) from api_test_case ac where ac.project_id = #{projectId,jdbcType=VARCHAR} and ac.create_user_id = #{userId,jdbcType=VARCHAR}
+        select count(*) from api_test_case ac where ac.project_id = #{projectId,jdbcType=VARCHAR} and ac.create_user_id
+        = #{userId,jdbcType=VARCHAR}
         and case_status in ('Prepare', 'Underway', 'Completed')
         <if test="statusList !=null and statusList.size() > 0">
             and ( ac.to_be_updated = 'true' or ac.status
@@ -306,7 +307,7 @@
             <foreach collection="statusList" item="value" separator="," open="(" close=")">
                 #{value}
             </foreach>
-         ))
+            ))
         </if>
         <if test="toBeUpdateTime !=null and (statusList ==null or statusList.size() == 0)">
             and ac.to_be_update_time >= #{toBeUpdateTime}
@@ -314,7 +315,7 @@
     </select>
     <select id="getCountUpcoming" resultType="java.lang.Integer">
         select count(*) from api_test_case ac where
-        ac.project_id  in
+        ac.project_id in
         <foreach collection="projectIds" item="projectId" separator="," open="(" close=")">
             #{projectId}
         </foreach>
@@ -400,6 +401,9 @@
             <if test="request.filters == null || request.filters.size() == 0 ">
                 and (api_test_case.status is null or api_test_case.status != 'Trash')
             </if>
+            <if test="request.createTime >0 ">
+                AND api_test_case.create_time >= #{request.createTime}
+            </if>
         </where>
     </sql>
 
diff --git a/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml b/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
index c335a208c6..548fced832 100644
--- a/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
+++ b/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
@@ -154,13 +154,16 @@
             <if test="request.workspaceId != null">
                 AND project.workspace_id = #{request.workspaceId}
             </if>
+            <if test="request.createTime >0 ">
+                AND load_test.create_time >= #{request.createTime}
+            </if>
         </where>
     </select>
     <select id="getCountFollow" resultType="java.lang.Integer">
         select count(*) from load_test lt where
-        lt.id in (select lf.test_id from load_test_follow  lf where  lf.follow_id = #{userId,jdbcType=VARCHAR})
+        lt.id in (select lf.test_id from load_test_follow lf where lf.follow_id = #{userId,jdbcType=VARCHAR})
         and
-        lt.project_id  in
+        lt.project_id in
         <foreach collection="projectIds" item="projectId" separator="," open="(" close=")">
             #{projectId}
         </foreach>
@@ -168,7 +171,7 @@
     </select>
     <select id="getCountUpcoming" resultType="java.lang.Integer">
         select count(*) from load_test lt where
-        lt.project_id  in
+        lt.project_id in
         <foreach collection="projectIds" item="projectId" separator="," open="(" close=")">
             #{projectId}
         </foreach>