From 4e9d6807d62b5cc1f23fd441211ad603fbbe142c Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Tue, 8 Apr 2025 01:28:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=8D=E6=94=B9=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/StatisticsMapper.xml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/StatisticsMapper.xml b/src/main/resources/mapper/StatisticsMapper.xml
index de63c9e..6c02f30 100644
--- a/src/main/resources/mapper/StatisticsMapper.xml
+++ b/src/main/resources/mapper/StatisticsMapper.xml
@@ -31,7 +31,8 @@
             <if test="endTime!= null">
                 and create_time &lt;= #{endTime}
             </if>
-            and member_id in (select member_id from statistics where type = 1
+            and morph_id is not null
+            and member_id in (select member_id from statistics where type = 10
         <if test="startTime!= null">
             and create_time >= #{startTime}
         </if>
@@ -134,6 +135,13 @@
             <if test="endTime!= null">
                 and create_time &lt;= #{endTime}
             </if>
+            and member_id in (select member_id from statistics where type = 10
+            <if test="startTime!= null">
+                and create_time >= #{startTime}
+            </if>
+            <if test="endTime!= null">
+                and create_time &lt;= #{endTime}
+            </if>)
             group by member_id
         )a
     </select>
@@ -173,12 +181,6 @@
             from member_video mv
             left join face f on f.id = mv.face_id
             where f.scenic_id = #{scenicId}
-            <if test="startTime!= null">
-                and f.create_at >= #{startTime}
-            </if>
-            <if test="endTime!= null">
-                and f.create_at &lt;= #{endTime}
-            </if>
             and f.member_id in (select member_id from statistics where type = 10
             <if test="startTime!= null">
                 and create_time >= #{startTime}
@@ -186,7 +188,7 @@
             <if test="endTime!= null">
                 and create_time &lt;= #{endTime}
             </if>)
-            group by member_id
+            group by mv.member_id
         )a
     </select>
     <select id="countTotalVisitorOfMember" resultType="java.lang.Integer">