diff --git a/src/main/java/com/example/demo/controller/WorkbenchController.java b/src/main/java/com/example/demo/controller/WorkbenchController.java index 58912a8..ad9dab3 100644 --- a/src/main/java/com/example/demo/controller/WorkbenchController.java +++ b/src/main/java/com/example/demo/controller/WorkbenchController.java @@ -72,7 +72,7 @@ public class WorkbenchController { @PostMapping("getGraph") public ResponseEntity graph1(@RequestBody WorkbenchCard workbench, @AuthenticationPrincipal Admin admin) { String account = admin.getAccount(); - List markets = generalService.getAdminMarket1(account); + List markets = generalService.getAdminMarket(account); workbench.setMarkets(markets); diff --git a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java index 59b490b..5611023 100644 --- a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java @@ -131,7 +131,8 @@ public class GeneralServiceImpl implements GeneralService { List list = Arrays.asList(market.split(",")); //判断是否是总部 if (list != null && list.contains("总部")) { - list=getALLAdminMarket();//总部有所有地区的权限 + list=getMarket();//总部有所有地区的权限 + list.add("总部"); //添加总部 } 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 8c8fb40..ccec946 100644 --- a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java @@ -96,7 +96,7 @@ public class StatisticsServiceImpl implements StatisticsService { Calendar calendar = Calendar.getInstance(); calendar.setTime(yesterday); - // 设置时间为昨天的23:55 + // 设置时间为昨天的23:59:55 calendar.set(Calendar.HOUR_OF_DAY, 23); calendar.set(Calendar.MINUTE, 59); calendar.set(Calendar.SECOND, 55); @@ -195,7 +195,7 @@ public class StatisticsServiceImpl implements StatisticsService { } } - //根据地区与日期获取part1(余量属性)统计数据 + @Override public Statistics getStatisticsPart1(String market, Date date) { //获取日期