From 10e74216724e78c7447bb58ecf38e819a844e7d2 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Mon, 7 Apr 2025 01:08:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/StatisticsMapper.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/main/resources/mapper/StatisticsMapper.xml b/src/main/resources/mapper/StatisticsMapper.xml
index 50d008a..de63c9e 100644
--- a/src/main/resources/mapper/StatisticsMapper.xml
+++ b/src/main/resources/mapper/StatisticsMapper.xml
@@ -156,6 +156,13 @@
         where scenic_id = #{scenicId}
             <if test="startTime!= null">and create_at >= #{startTime}</if>
             <if test="endTime!= null">and create_at &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>
@@ -172,6 +179,13 @@
             <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}
+            </if>
+            <if test="endTime!= null">
+                and create_time &lt;= #{endTime}
+            </if>)
             group by member_id
         )a
     </select>