From 4040856595952ea0b8f8b764ba2770d5c244c891 Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期五, 14 十月 2022 11:19:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into local_20221010 --- flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java b/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java index 2c2b017..fd7c2d2 100644 --- a/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java +++ b/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java @@ -28,9 +28,6 @@ @Autowired IGuideEvolveService iGuideEvolveService; - //分类 - @Autowired - IClassifyAdministrationService iClassifyAdministrationService; @Autowired HomeStatisticsService homeStatisticsService; @@ -172,14 +169,14 @@ pieChartAll.setFingerpostNum(homeStatisticsService.countStatisticsNum(null)+""); List<PieChart> workOrderList=new ArrayList<>(); List<PieChart> fingerpostList=new ArrayList<>(); - List<ClassifyAdministration> oneIds=iClassifyAdministrationService.getClassify(null,"1"); + List<ClassifyAdministration> oneIds=homeStatisticsService.getClassify(null,"1"); for (ClassifyAdministration oneClassify:oneIds) { PieChart workOrder=new PieChart(); PieChart fingerpost=new PieChart(); workOrder.setName(oneClassify.getClassifyName()); fingerpost.setName(oneClassify.getClassifyName()); - List<ClassifyAdministration> twoIds = iClassifyAdministrationService.getClassify(oneClassify.getId()+"",null); + List<ClassifyAdministration> twoIds = homeStatisticsService.getClassify(oneClassify.getId()+"",null); List clasIds=new ArrayList(); -- Gitblit v1.7.1