From 9b004488a94fafae7015af1fe235dbdbd40495c1 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 14 十月 2022 17:34:55 +0800
Subject: [PATCH] 修改导办工单按区域统计 bug

---
 flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java |   48 +++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 43 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..50251a8 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;
@@ -42,6 +39,10 @@
 
     @Autowired
     IOrganizationChartService iOrganizationChartService;
+
+
+    @Autowired
+    IAreaCodeService iAreaCodeService;
 
 
     @ApiOperation("首页统计不同状态工单数")
@@ -172,14 +173,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();
 
@@ -320,6 +321,43 @@
 
 
 
+    @ApiOperation("导办工单按区域统计")
+    @GetMapping("/getRangeStatistics")
+    public TableDataInfo getRangeStatistics()
+    {
+        List<AreaCode2022> code2022s=iAreaCodeService.getListByPCode("510400000000");
+
+        List<RangeStatistics> rangeStatistics=new ArrayList<>();
+
+        for (AreaCode2022 bean:code2022s)
+        {
+            RangeStatistics range=new RangeStatistics();
+            range.setName(bean.getName());
+
+            List<String> ids;
+
+            if(bean.getCode()==510401000000L)
+            {
+                ids=homeStatisticsService.countId("");
+            }
+            else
+            {
+                ids=homeStatisticsService.countId(bean.getCode()+"");
+            }
+            int num=0;
+            if(ids!=null&&ids.size()>0)
+            {
+                num=iGuideRepairOrderService.countStatisticsNum(null,ids,null,null,null,null);
+            }
+            range.setNum(num+"");
+            rangeStatistics.add(range);
+        }
+
+
+        return getDataTable(rangeStatistics);
+    }
+
+
 
 
 

--
Gitblit v1.7.1