From b5b69ffb1c3893a16e9ed57a68b0db7ca516bd0d Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期六, 15 十月 2022 11:34:02 +0800
Subject: [PATCH] 修改小程序报错 bug
---
flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 10 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 3bd0c5e..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,12 +28,6 @@
@Autowired
IGuideEvolveService iGuideEvolveService;
- //分类
- @Autowired
- IClassifyAdministrationService iClassifyAdministrationService;
-
- @Autowired
- ITransactionEventService iTransactionEventService;
@Autowired
HomeStatisticsService homeStatisticsService;
@@ -45,6 +39,10 @@
@Autowired
IOrganizationChartService iOrganizationChartService;
+
+
+ @Autowired
+ IAreaCodeService iAreaCodeService;
@ApiOperation("首页统计不同状态工单数")
@@ -172,17 +170,17 @@
{
PieChartAll pieChartAll=new PieChartAll();
pieChartAll.setWorkOrderNum(iGuideRepairOrderService.countStatisticsNum("",null,null,null,null,null)+"");
- pieChartAll.setFingerpostNum(iTransactionEventService.countStatisticsNum(null)+"");
+ 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();
@@ -196,7 +194,7 @@
if(clasIds.size()>0)
{
workOrderNum=iGuideRepairOrderService.countStatisticsNum(null,null,null,null,null,clasIds);
- fingerpostNum=iTransactionEventService.countStatisticsNum(clasIds);
+ fingerpostNum=homeStatisticsService.countStatisticsNum(clasIds);
}
workOrder.setNum(workOrderNum+"");
fingerpost.setNum(fingerpostNum+"");
@@ -323,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