修复后端获取过去几天时间每日数据功能的Bug

This commit is contained in:
2023-03-23 18:37:43 +08:00
parent d8bfd40ba9
commit c6697d5532
@@ -87,18 +87,18 @@ public class EveryDayDataServiceImpl extends ServiceImpl<EveryDayDataMapper, Eve
@Override @Override
public List<EveryDayData> getLastWeekData() { public List<EveryDayData> getLastWeekData() {
return getLastDate(6); return getLastDate(7);
} }
public List<EveryDayData> getLastDate(int minusDay) { public List<EveryDayData> getLastDate(int dayNum) {
// 今天的前一天是截止日期 // 今天的前一天是截止日期
LocalDate end = LocalDate.now().minusDays(1); LocalDate end = LocalDate.now().minusDays(1);
// 七天前是起始日期 // 七天前是起始日期
LocalDate start = end.minusDays(minusDay); LocalDate start = end.minusDays(6);
List<EveryDayData> list = list(getLastWeekLambdaWrapper()); List<EveryDayData> list = list(getLastWeekLambdaWrapper());
// 如果不足7条,则补充空数据 // 如果不足7条,则补充空数据
int missingDays = 7 - list.size(); int missingDays = dayNum - list.size();
if (missingDays > 0) { if (missingDays > 0) {
List<EveryDayData> emptyData = new ArrayList<>(); List<EveryDayData> emptyData = new ArrayList<>();
for (int i = 0; i < missingDays; i++) { for (int i = 0; i < missingDays; i++) {
@@ -122,7 +122,7 @@ public class EveryDayDataServiceImpl extends ServiceImpl<EveryDayDataMapper, Eve
@Override @Override
public List<EveryDayData> getLastSixDayData() { public List<EveryDayData> getLastSixDayData() {
return getLastDate(5); return getLastDate(6);
} }
} }