From 89bb6d9e830c24ba254d42e5813556083dbf8ee6 Mon Sep 17 00:00:00 2001
From: dannyxu <dannyxu@yeah.net>
Date: Sat, 26 Sep 2026 16:38:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EsRecordReportServiceImpl.java     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/ai-xuebao-es/src/main/java/net/hzvtc/service/impl/EsRecordReportServiceImpl.java b/ai-xuebao-es/src/main/java/net/hzvtc/service/impl/EsRecordReportServiceImpl.java
index d0ca3b4..c0d129d 100644
--- a/ai-xuebao-es/src/main/java/net/hzvtc/service/impl/EsRecordReportServiceImpl.java
+++ b/ai-xuebao-es/src/main/java/net/hzvtc/service/impl/EsRecordReportServiceImpl.java
@@ -2063,9 +2063,16 @@ public class EsRecordReportServiceImpl implements EsRecordReportService {
             }
         }
         if (!flag) {
-            LocalDate localDate = LocalDate.now();
-            dateFrom = localDate.with(TemporalAdjusters.firstDayOfMonth()).toString();
-            dateTo = localDate.with(TemporalAdjusters.lastDayOfMonth()).toString();
+            String strFrom = param.getString("dateFrom");
+            String strTo = param.getString("dateTo");
+            if (strFrom != null && !strFrom.isEmpty() && strTo != null && !strTo.isEmpty()) {
+                dateFrom = strFrom;
+                dateTo = strTo;
+            } else {
+                LocalDate localDate = LocalDate.now();
+                dateFrom = localDate.with(TemporalAdjusters.firstDayOfMonth()).toString();
+                dateTo = localDate.with(TemporalAdjusters.lastDayOfMonth()).toString();
+            }
         }
         queryParam.put("dateFrom", dateFrom);
         queryParam.put("dateTo", dateTo);