Merge branch 'dev' of http://git.xmmakeit.com/huangjiay/iot-platform-server into dev

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportWeekServiceImpl.java

@@ -116,7 +116,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
 
 
 
 
     private LocalDate weekStartDate(LocalDateTime defaultTime) {
     private LocalDate weekStartDate(LocalDateTime defaultTime) {
-        return weekStartDate(LocalDate.now().minusDays(1), defaultTime);
+        return weekStartDate(LocalDate.now().minusWeeks(1), defaultTime);
     }
     }
 
 
     private LocalDate weekStartDate(LocalDate now, LocalDateTime defaultTime) {
     private LocalDate weekStartDate(LocalDate now, LocalDateTime defaultTime) {
@@ -131,7 +131,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
     }
     }
 
 
     private LocalDate weekEndDate(LocalDateTime defaultTime) {
     private LocalDate weekEndDate(LocalDateTime defaultTime) {
-        return weekEndDate(LocalDate.now().minusDays(1), defaultTime);
+        return weekEndDate(LocalDate.now().minusWeeks(1), defaultTime);
     }
     }
 
 
     private LocalDate weekEndDate(LocalDate now, LocalDateTime defaultTime) {
     private LocalDate weekEndDate(LocalDate now, LocalDateTime defaultTime) {