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 list = Arrays.asList(market.split(",")); //判断是否是总部 if (list != null && list.contains("总部")) { - list=getMarket();//总部有所有地区的权限 - list.add("总部"); //添加总部 + List 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 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 list = statisticsMapper.listYearAll(yearStart, end, today); if (!list.isEmpty()) { statisticsMapper.batchInsertYear(list);