Browse Source

获取用户地区优化:总部展示在最前方

sunjiabei/feature-20250710132313-二期模块
lijianlin 4 weeks ago
parent
commit
b51367d0c6
  1. 5
      src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java
  2. 10
      src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java

5
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(",")); List<String> list = Arrays.asList(market.split(","));
//判断是否是总部 //判断是否是总部
if (list != null && list.contains("总部")) { if (list != null && list.contains("总部")) {
list=getMarket();//总部有所有地区的权限
list.add("总部"); //添加总部
List<String> allMarkets = getMarket(); // 获取所有地区
allMarkets.add(0, "总部"); // 总部添加到列表第一位
list = allMarkets; // 更新list
} }
return list; return list;
} catch (Exception e) { } catch (Exception e) {

10
src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java

@ -60,7 +60,10 @@ public class StatisticsServiceImpl implements StatisticsService {
public void runHourlyTaskPart2() { public void runHourlyTaskPart2() {
LocalDate today = LocalDate.now(); LocalDate today = LocalDate.now();
Date start = Date.from(today.atStartOfDay(ZoneId.systemDefault()).toInstant()); 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); List<Statistics> list = statisticsMapper.listPart2All(start, end,today);
if (!list.isEmpty()) { if (!list.isEmpty()) {
statisticsMapper.batchInsertPart2(list); statisticsMapper.batchInsertPart2(list);
@ -77,7 +80,10 @@ public class StatisticsServiceImpl implements StatisticsService {
LocalDate today = LocalDate.now(); LocalDate today = LocalDate.now();
LocalDate firstDay = today.withDayOfYear(1); LocalDate firstDay = today.withDayOfYear(1);
Date yearStart = Date.from(firstDay.atStartOfDay(ZoneId.systemDefault()).toInstant()); 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); List<Statistics> list = statisticsMapper.listYearAll(yearStart, end, today);
if (!list.isEmpty()) { if (!list.isEmpty()) {
statisticsMapper.batchInsertYear(list); statisticsMapper.batchInsertYear(list);

Loading…
Cancel
Save