From 8973846a3549d16f598d62723e84cd19448a660e Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期六, 15 十月 2022 16:16:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java | 64 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 13 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..567c294 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;
@@ -44,9 +41,13 @@
IOrganizationChartService iOrganizationChartService;
+ @Autowired
+ IAreaCodeService iAreaCodeService;
+
+
@ApiOperation("首页统计不同状态工单数")
@GetMapping("/getWorkOrder")
- public ResultData getWorkOrder()
+ public ResultData<WorkOrder> getWorkOrder()
{
WorkOrder workOrder=new WorkOrder();
//状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 6未解决 7已解决）
@@ -69,7 +70,7 @@
@ApiOperation("首页统计不同时间段的工单数量")
@GetMapping("/getTimeWorkOrder")
- public ResultData getTimeWorkOrder()
+ public ResultData<TimeWorkOrder> getTimeWorkOrder()
{
//1 今天 2昨天 3本月 4本年度
//累计全部 本年 本月 今日 昨日
@@ -85,7 +86,7 @@
@ApiOperation("根据选择的时间段 筛选导办工单数 timeType：1 本年度 15 近15天的 30 近30天的")
@GetMapping("/getSelectionTimeOrder")
- public ResultData getSelectionTimeOrder(@RequestParam("timeType") Integer timeType)
+ public ResultData<CountList> getSelectionTimeOrder(@RequestParam("timeType") Integer timeType)
{
if(timeType<1)
{
@@ -111,7 +112,7 @@
@ApiOperation("获取效率比值")
@GetMapping("/getEfficiency")
- public ResultData getEfficiency()
+ public ResultData<EfficiencyEntity> getEfficiency()
{
EfficiencyEntity entity=new EfficiencyEntity();
//总工单数
@@ -165,21 +166,21 @@
@ApiOperation("工单 办事指南饼状图数据")
@GetMapping("/getPieChart")
- public ResultData getPieChart()
+ public ResultData<PieChartAll> getPieChart()
{
PieChartAll pieChartAll=new PieChartAll();
pieChartAll.setWorkOrderNum(iGuideRepairOrderService.countStatisticsNum("",null,null,null,null,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();
@@ -213,7 +214,7 @@
@ApiOperation("组织排行榜 type 1 安评价 2 按办结量")
@GetMapping("/getOrganization")
- public TableDataInfo getOrganization(@RequestParam("type") String type)
+ public TableDataInfo<OrganizationEntity> getOrganization(@RequestParam("type") String type)
{
List<OrganizationEntity> guidePlates=homeStatisticsService.getDepartment();
@@ -280,7 +281,7 @@
@ApiOperation("导办人员排行榜 type 1 安评价 2 按办结量 3 按超时")
@GetMapping("/getGuidePlate")
- public TableDataInfo getGuidePlate(@RequestParam("type") String type)
+ public TableDataInfo<GuidePlate> getGuidePlate(@RequestParam("type") String type)
{
int allNum=homeStatisticsService.staffNum();
@@ -304,7 +305,7 @@
@ApiOperation("办事指南排行榜 type 1 按浏览量 2 按办结量")
@GetMapping("/getGuidance")
- public TableDataInfo getGuidance(@RequestParam("type") String type)
+ public TableDataInfo<Guidance> getGuidance(@RequestParam("type") String type)
{
int allNum=homeStatisticsService.countWork();
if(StringUtils.equals("1",type))
@@ -320,6 +321,43 @@
+ @ApiOperation("导办工单按区域统计")
+ @GetMapping("/getRangeStatistics")
+ public TableDataInfo<RangeStatistics> 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