From bdf4153f7d6fe995bab8f7c9f29a419c1b4db7a4 Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Thu, 7 Jul 2022 09:35:37 +0800 Subject: [PATCH] zh --- .../controller/wxApp/RankUController.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zh/project0512/controller/wxApp/RankUController.java b/src/main/java/com/zh/project0512/controller/wxApp/RankUController.java index b5907b4..f57e2d9 100644 --- a/src/main/java/com/zh/project0512/controller/wxApp/RankUController.java +++ b/src/main/java/com/zh/project0512/controller/wxApp/RankUController.java @@ -23,9 +23,12 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.time.DayOfWeek; +import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; import java.time.format.DateTimeFormatter; +import java.time.temporal.TemporalAdjusters; /** * 排行榜 @@ -69,21 +72,21 @@ public class RankUController { Page pg = MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()); QueryWrapper qw = new QueryWrapper<>(); DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - LocalDateTime now = LocalDateTime.of(LocalDateTime.now().toLocalDate(), LocalTime.MIN); - LocalDateTime before = now.minusMonths(1); + LocalDate now = LocalDateTime.now().toLocalDate(); + LocalDate before =now.with(TemporalAdjusters.firstDayOfMonth()); if (param.getDateCondition() != null) { switch (param.getDateCondition()) { case 1: before = now; break; case 2: - before = now.minusWeeks(1); + before = now.with(DayOfWeek.MONDAY); break; case 3: - before = now.minusMonths(1); + before = now.with(TemporalAdjusters.firstDayOfMonth()); break; case 4: - before = now.minusYears(1); + before = now.with(TemporalAdjusters.firstDayOfYear()); break; default: }