From 5c6a50a32883dd40505e7ec6c0d632a19339068d Mon Sep 17 00:00:00 2001
From: Mzaxd <caihaohan0712@foxmail.com>
Date: Thu, 23 Mar 2023 18:51:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8E=E7=AB=AF=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E8=BF=87=E5=8E=BB=E5=87=A0=E5=A4=A9=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=AF=8F=E6=97=A5=E6=95=B0=E6=8D=AE=E5=8A=9F=E8=83=BD=E7=9A=84?=
 =?UTF-8?q?Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EveryDayDataServiceImpl.java  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/mzaxd/noodles/service/impl/EveryDayDataServiceImpl.java b/src/main/java/com/mzaxd/noodles/service/impl/EveryDayDataServiceImpl.java
index 47e1f79..893d856 100644
--- a/src/main/java/com/mzaxd/noodles/service/impl/EveryDayDataServiceImpl.java
+++ b/src/main/java/com/mzaxd/noodles/service/impl/EveryDayDataServiceImpl.java
@@ -15,13 +15,13 @@ import java.time.ZoneId;
 import java.util.*;
 
 /**
-* @author 13439
-* @description 针对表【every_data】的数据库操作Service实现
-* @createDate 2023-02-21 12:52:12
-*/
+ * @author 13439
+ * @description 针对表【every_data】的数据库操作Service实现
+ * @createDate 2023-02-21 12:52:12
+ */
 @Service
 public class EveryDayDataServiceImpl extends ServiceImpl<EveryDayDataMapper, EveryDayData>
-    implements EveryDayDataService {
+        implements EveryDayDataService {
 
     @Override
     public ResponseResult getAuditLogCountYesterday() {
@@ -87,15 +87,15 @@ public class EveryDayDataServiceImpl extends ServiceImpl<EveryDayDataMapper, Eve
 
     @Override
     public List<EveryDayData> getLastWeekData() {
-        return getLastDate(7);
+        return getLastDate(7, getLastWeekLambdaWrapper());
     }
 
-    public List<EveryDayData> getLastDate(int dayNum) {
+    public List<EveryDayData> getLastDate(int dayNum, LambdaQueryWrapper<EveryDayData> lambdaQueryWrapper) {
         // 今天的前一天是截止日期
         LocalDate end = LocalDate.now().minusDays(1);
         // 七天前是起始日期
         LocalDate start = end.minusDays(6);
-        List<EveryDayData> list = list(getLastWeekLambdaWrapper());
+        List<EveryDayData> list = list(lambdaQueryWrapper);
 
         // 如果不足7条，则补充空数据
         int missingDays = dayNum - list.size();
@@ -122,7 +122,7 @@ public class EveryDayDataServiceImpl extends ServiceImpl<EveryDayDataMapper, Eve
 
     @Override
     public List<EveryDayData> getLastSixDayData() {
-        return getLastDate(6);
+        return getLastDate(6, getLastSixDayLambdaWrapper());
     }
 }