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 37587aa..47e1f79 100644 --- a/src/main/java/com/mzaxd/noodles/service/impl/EveryDayDataServiceImpl.java +++ b/src/main/java/com/mzaxd/noodles/service/impl/EveryDayDataServiceImpl.java @@ -87,18 +87,18 @@ public class EveryDayDataServiceImpl extends ServiceImpl getLastWeekData() { - return getLastDate(6); + return getLastDate(7); } - public List getLastDate(int minusDay) { + public List getLastDate(int dayNum) { // 今天的前一天是截止日期 LocalDate end = LocalDate.now().minusDays(1); // 七天前是起始日期 - LocalDate start = end.minusDays(minusDay); + LocalDate start = end.minusDays(6); List list = list(getLastWeekLambdaWrapper()); // 如果不足7条,则补充空数据 - int missingDays = 7 - list.size(); + int missingDays = dayNum - list.size(); if (missingDays > 0) { List emptyData = new ArrayList<>(); for (int i = 0; i < missingDays; i++) { @@ -122,7 +122,7 @@ public class EveryDayDataServiceImpl extends ServiceImpl getLastSixDayData() { - return getLastDate(5); + return getLastDate(6); } }