From b51367d0c6b3d1c8e8d7dd8b4ec353aad51ae5c6 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Wed, 23 Jul 2025 17:26:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E5=9C=B0?=
 =?UTF-8?q?=E5=8C=BA=E4=BC=98=E5=8C=96=EF=BC=9A=E6=80=BB=E9=83=A8=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=9C=A8=E6=9C=80=E5=89=8D=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/demo/serviceImpl/GeneralServiceImpl.java  |  5 +++--
 .../com/example/demo/serviceImpl/StatisticsServiceImpl.java    | 10 ++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java
index 5611023..e5235d4 100644
--- a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java
@@ -131,8 +131,9 @@ public class GeneralServiceImpl implements GeneralService {
             List<String> list = Arrays.asList(market.split(","));
             //判断是否是总部
             if (list != null && list.contains("总部")) {
-                list=getMarket();//总部有所有地区的权限
-                list.add("总部"); //添加总部
+                List<String> allMarkets = getMarket(); // 获取所有地区
+                allMarkets.add(0, "总部"); // 将“总部”添加到列表第一位
+                list = allMarkets; // 更新list
             }
             return list;
         } catch (Exception e) {
diff --git a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java
index c831549..1085fd5 100644
--- a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java
@@ -60,7 +60,10 @@ public class StatisticsServiceImpl implements StatisticsService {
     public void runHourlyTaskPart2() {
         LocalDate today = LocalDate.now();
         Date start = Date.from(today.atStartOfDay(ZoneId.systemDefault()).toInstant());
-        Date end   = Date.from(today.plusDays(1).atStartOfDay(ZoneId.systemDefault()).toInstant());
+        Date end = Date.from(
+                today.atTime(LocalTime.MAX) // 当天 23:59:59
+                        .atZone(ZoneId.systemDefault())
+                        .toInstant());
         List<Statistics> list = statisticsMapper.listPart2All(start, end,today);
           if (!list.isEmpty()) {
             statisticsMapper.batchInsertPart2(list);
@@ -77,7 +80,10 @@ public class StatisticsServiceImpl implements StatisticsService {
         LocalDate today = LocalDate.now();
         LocalDate firstDay = today.withDayOfYear(1);
         Date yearStart = Date.from(firstDay.atStartOfDay(ZoneId.systemDefault()).toInstant());
-        Date end       = Date.from(today.plusDays(1).atStartOfDay(ZoneId.systemDefault()).toInstant());
+        Date end = Date.from(
+                today.atTime(LocalTime.MAX) // 当天 23:59:59
+                        .atZone(ZoneId.systemDefault())
+                        .toInstant());
         List<Statistics> list = statisticsMapper.listYearAll(yearStart, end, today);
         if (!list.isEmpty()) {
             statisticsMapper.batchInsertYear(list);