My/bps_admin_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mzaxd
2023-03-23 18:51:29 +08:00
parent c6697d5532
commit 5c6a50a328
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/mzaxd/noodles/service/impl/EveryDayDataServiceImpl.java
+4 -4
View File
@@ -87,15 +87,15 @@ public class EveryDayDataServiceImpl extends ServiceImpl<EveryDayDataMapper, Eve
@Override @Override
public List<EveryDayData> getLastWeekData() { 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 end = LocalDate.now().minusDays(1);
// 七天前是起始日期 // 七天前是起始日期
LocalDate start = end.minusDays(6); LocalDate start = end.minusDays(6);
List<EveryDayData> list = list(getLastWeekLambdaWrapper()); List<EveryDayData> list = list(lambdaQueryWrapper);
// 如果不足7条，则补充空数据 // 如果不足7条，则补充空数据
int missingDays = dayNum - list.size(); int missingDays = dayNum - list.size();
@@ -122,7 +122,7 @@ public class EveryDayDataServiceImpl extends ServiceImpl<EveryDayDataMapper, Eve
@Override @Override
public List<EveryDayData> getLastSixDayData() { public List<EveryDayData> getLastSixDayData() {
return getLastDate(6); return getLastDate(6, getLastSixDayLambdaWrapper());
} }
} }