Bladeren bron

BUGFIX
1、获取机构长者周运营统计获取时间段错误

liangwenxuan 2 maanden geleden
bovenliggende
commit
0b7b253577

+ 3 - 2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ElderlyInfoServiceImpl.java

@@ -70,6 +70,7 @@ import java.text.NumberFormat;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
@@ -1488,8 +1489,8 @@ public class ElderlyInfoServiceImpl implements ElderlyInfoService {
         }
 
         LocalDate today = LocalDate.now();
-        LocalDate weekStart = today.with(DayOfWeek.SATURDAY);
-        LocalDate weekEnd = weekStart.plusDays(6);
+        LocalDate weekStart = today.with(TemporalAdjusters.previousOrSame(DayOfWeek.SATURDAY));
+        LocalDate weekEnd = today.with(TemporalAdjusters.nextOrSame(DayOfWeek.FRIDAY));
         LocalDate monthStart = today.withDayOfMonth(1);
 
         LocalDateTime weekStartDateTime = weekStart.atStartOfDay();