From 6588756cf95e8295a93a2826137322b2e7fc6e80 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 19 十月 2022 14:27:47 +0800
Subject: [PATCH] 修改【角色管理】无法搜索 bug
---
flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java | 237 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 208 insertions(+), 29 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 b696e0d..b0b27f5 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
@@ -2,10 +2,9 @@
import com.dg.core.ResultData;
import com.dg.core.db.gen.entity.*;
-import com.dg.core.service.IClassifyAdministrationService;
-import com.dg.core.service.IGuideEvolveService;
-import com.dg.core.service.IGuideRepairOrderService;
-import com.dg.core.service.ITransactionEventService;
+import com.dg.core.db.manual.pojo.AppletUserCount;
+import com.dg.core.service.*;
+import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
@@ -15,14 +14,12 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
+import java.util.*;
@Api(tags = {"首页统计接口"})
@RestController
@RequestMapping("/Home")
-public class HomeStatisticsController
+public class HomeStatisticsController extends BaseController
{
//导办工单接口
@Autowired
@@ -32,16 +29,29 @@
@Autowired
IGuideEvolveService iGuideEvolveService;
- //分类
- @Autowired
- IClassifyAdministrationService iClassifyAdministrationService;
@Autowired
- ITransactionEventService iTransactionEventService;
+ HomeStatisticsService homeStatisticsService;
+
+
+ @Autowired
+ com.dg.core.service.ISysUserService IUserService;
+
+
+ @Autowired
+ IOrganizationChartService iOrganizationChartService;
+
+
+ @Autowired
+ IAreaCodeService iAreaCodeService;
+
+ @Autowired
+ private ISysUserRecordService iSysUserRecordService;
+
@ApiOperation("首页统计不同状态工单数")
@GetMapping("/getWorkOrder")
- public ResultData getWorkOrder()
+ public ResultData<WorkOrder> getWorkOrder()
{
WorkOrder workOrder=new WorkOrder();
//状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 6未解决 7已解决）
@@ -64,7 +74,7 @@
@ApiOperation("首页统计不同时间段的工单数量")
@GetMapping("/getTimeWorkOrder")
- public ResultData getTimeWorkOrder()
+ public ResultData<TimeWorkOrder> getTimeWorkOrder()
{
//1 今天 2昨天 3本月 4本年度
//累计全部 本年 本月 今日 昨日
@@ -80,7 +90,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)
{
@@ -106,7 +116,7 @@
@ApiOperation("获取效率比值")
@GetMapping("/getEfficiency")
- public ResultData getEfficiency()
+ public ResultData<EfficiencyEntity> getEfficiency()
{
EfficiencyEntity entity=new EfficiencyEntity();
//总工单数
@@ -119,19 +129,19 @@
{
// 好评率=评价为满意的导办工单数量/已办结状态工单数量
String goodReputationEfficiency=weekDf.format((float)(iGuideRepairOrderService.countStatisticsNum(null,null,null,null,"1",null)
- /bj));
+ /(float)bj));
entity.setGoodReputationEfficiency(goodReputationEfficiency);
// 解决率=已解决状态的导办工单数量/已办结状态工单数量
String resolveEfficiency=weekDf.format((float)(iGuideRepairOrderService.countStatisticsNum("7",null,null,null,null,null)
- /bj));
+ /(float)bj));
entity.setResolveEfficiency(resolveEfficiency);
if(allNum!=0)
{
// 办结率=待评价+已办结状态的导办工单数量/总工单数量
String workEfficiency=weekDf.format((float)((iGuideRepairOrderService.countStatisticsNum("4",null,null,null,null,null)
- +bj)/allNum));
+ +bj)/(float)allNum));
entity.setWorkEfficiency(workEfficiency);
}
}
@@ -142,7 +152,7 @@
// 超时办结率=超时状态下的待评价+已办结状态的导办工单数量/超时状态的导办工单数量
String timeoutEfficiency=weekDf.format((float)((iGuideRepairOrderService.countStatisticsNum("4",null,null,"2",null,null)
+iGuideRepairOrderService.countStatisticsNum("3",null,null,null,null,null))
- /cs));
+ /(float)cs));
entity.setTimeoutEfficiency(timeoutEfficiency);
}
@@ -151,7 +161,7 @@
{
// 回复率=最新进展里0条回复的导办工单数量/总工单数量
//状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 6未解决 7已解决 8 系统自动分配 9 回复 10转派 11手动分配）
- String reversionRate=weekDf.format((float)(iGuideEvolveService.countStatisticsNum("9",null)/allNum));
+ String reversionRate=weekDf.format((float)(iGuideEvolveService.countStatisticsNum("9",null)/(float)allNum));
entity.setReversionRate(reversionRate);
}
@@ -160,21 +170,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(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();
@@ -188,7 +198,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+"");
@@ -203,15 +213,184 @@
}
- @ApiOperation("组织排行榜")
+
+
+
+ @ApiOperation("组织排行榜 type 1 安评价 2 按办结量")
@GetMapping("/getOrganization")
- public ResultData getOrganization()
+ public TableDataInfo<OrganizationEntity> getOrganization(@RequestParam("type") String type)
{
+ List<OrganizationEntity> guidePlates=homeStatisticsService.getDepartment();
+ if(StringUtils.equals("1",type))
+ {
+ for (OrganizationEntity bean:guidePlates)
+ {
+ bean.setNum(0+"");
+ List<String> ids=iOrganizationChartService.getIds(bean.getId()+"");
- return ResultData.success();
+ //总评分
+ String scoreNum=homeStatisticsService.organizationScore(ids)+"";
+ int score=0;
+ if(!StringUtils.isEmpty(scoreNum) && !StringUtils.equals("null",scoreNum))
+ {
+ score=Integer.valueOf(scoreNum);
+ }
+
+ //总数量
+ int allNum=homeStatisticsService.organizationNum(ids);
+
+ if(allNum>0 && score>0)
+ {
+ java.text.DecimalFormat weekDf=new java.text.DecimalFormat("##.##");//传入格式模板
+ String workEfficiency=weekDf.format((float)(score/allNum));
+ bean.setNum(workEfficiency);
+ }
+ }
+ }
+ else
+ {
+ for (OrganizationEntity bean:guidePlates)
+ {
+ bean.setNum(0+"");
+ List<String> ids=iOrganizationChartService.getIds(bean.getId()+"");
+ //总数量
+ int allNum=homeStatisticsService.organizationNum(ids);
+ if(allNum>0)
+ {
+ bean.setNum(allNum+"");
+ }
+ }
+ }
+
+ OrganizationEntity entity=null;
+ for(int i = 0 ;i< guidePlates.size() -1; i++) {
+ for (int j = 0; j < guidePlates.size() - 1 - i; j++) {
+
+ if(Float.valueOf(guidePlates.get(j).getNum())>Float.valueOf(guidePlates.get(j+1).getNum()))
+ {
+ entity=guidePlates.get(j);
+ guidePlates.set(j,guidePlates.get(j+1));
+ guidePlates.set(j+1,entity);
+ }
+ }
+ }
+
+ Collections.reverse(guidePlates);
+
+ return getDataTable(guidePlates,guidePlates.size());
}
+ @ApiOperation("导办人员排行榜 type 1 安评价 2 按办结量 3 按超时")
+ @GetMapping("/getGuidePlate")
+ public TableDataInfo<GuidePlate> getGuidePlate(@RequestParam("type") String type)
+ {
+ int allNum=homeStatisticsService.staffNum();
+
+ if(StringUtils.equals("1",type))
+ {
+ //安评价
+ return getDataTable(homeStatisticsService.score(),allNum);
+ }
+ else if(StringUtils.equals("2",type))
+ {
+ //2 按办结量
+ return getDataTable(homeStatisticsService.guidePlatePeople(),allNum);
+ }
+ else
+ {
+ //3 按超时
+ return getDataTable(homeStatisticsService.timeout(),allNum);
+ }
+ }
+
+
+ @ApiOperation("办事指南排行榜 type 1 按浏览量 2 按办结量")
+ @GetMapping("/getGuidance")
+ public TableDataInfo<Guidance> getGuidance(@RequestParam("type") String type)
+ {
+ int allNum=homeStatisticsService.countWork();
+ if(StringUtils.equals("1",type))
+ {
+ return getDataTable(homeStatisticsService.guidanceBrowse(),allNum);
+ }
+ else
+ {
+ return getDataTable(homeStatisticsService.guidanceTransaction(),allNum);
+ }
+
+ }
+
+
+
+ @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);
+ }
+
+
+ /**
+ * 小程序用户访问量统计1.累计访问量2.本年访问量 3.本月访问量 4.今日访问量 5.昨日访问
+ * @return
+ */
+ @ApiOperation(value = "小程序用户访问量统计1.累计访问量2.本年访问量 3.本月访问量 4.今日访问量 5.昨日访问",response = AppletUserCount.class)
+ @GetMapping("/selectUserRecordCount")
+ public ResultData selectUserRecordCount(){
+ return iSysUserRecordService.selectUserRecordCount();
+ }
+
+ /**
+ * 小程序用户访问量统计1.近15天 2.近30天 3.近一年
+ * @return
+ */
+ @ApiOperation(value = "小程序用户访问量统计1.近15天 2.近30天 3.近一年",response = AppletUserCount.class)
+ @GetMapping("/selectByDateType")
+ public ResultData selectByDateType(@RequestParam("dateType") Integer dateType){
+ return iSysUserRecordService.selectByDateType(dateType);
+ }
+
+
+
+
+
+
+
+
+
+
+
+
}
--
Gitblit v1.7.1