From c1e1cec83669bc2a70eb460c928496deef027305 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 10 十一月 2022 14:23:36 +0800
Subject: [PATCH] 1.获取天气接口 2.搜索bug 3.小程序工单管理Bug
---
flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java | 80 ++++++++++++++++++++++------------------
1 files changed, 44 insertions(+), 36 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 477dfc2..b1f82ec 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
@@ -54,20 +54,21 @@
public ResultData<WorkOrder> getWorkOrder()
{
WorkOrder workOrder=new WorkOrder();
- //状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 6未解决 7已解决）
- workOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum("",null,null,null,null,null));
- workOrder.setWaitDistribution(iGuideRepairOrderService.countStatisticsNum("1",null,null,null,null,null));
- workOrder.setWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",null,null,null,null,null));
- workOrder.setHaveDealWith(iGuideRepairOrderService.countStatisticsNum("3",null,null,null,null,null));
- workOrder.setRemainEvaluated(iGuideRepairOrderService.countStatisticsNum("4",null,null,null,null,null));
- workOrder.setCanceled(iGuideRepairOrderService.countStatisticsNum("5",null,null,null,null,null));
- workOrder.setUnsolved(iGuideRepairOrderService.countStatisticsNum("6",null,null,null,null,null));
- workOrder.setResolved(iGuideRepairOrderService.countStatisticsNum("7",null,null,null,null,null));
+ //状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消）
+ workOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum("",null,null,null,null,null,null,null));
+ workOrder.setWaitDistribution(iGuideRepairOrderService.countStatisticsNum("1",null,null,null,null,null,null,null));
+ workOrder.setWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",null,null,null,null,null,null,null));
+ workOrder.setHaveDealWith(iGuideRepairOrderService.countStatisticsNum("3",null,null,null,null,null,null,null));
+ workOrder.setRemainEvaluated(iGuideRepairOrderService.countStatisticsNum("4",null,null,null,null,null,null,null));
+ workOrder.setCanceled(iGuideRepairOrderService.countStatisticsNum("5",null,null,null,null,null,null,null));
+ // //服务状态(1.已解决 2.未解决)
+ workOrder.setUnsolved(iGuideRepairOrderService.countStatisticsNum(null,null,null,null,null,null,"2",null));
+ workOrder.setResolved(iGuideRepairOrderService.countStatisticsNum(null,null,null,null,null,null,"1",null));
//是否超时 （1 未超时 2已超时） 超时未办结
- workOrder.setOvertime(iGuideRepairOrderService.countStatisticsNum(null,null,null,"2",null,null));
+ workOrder.setOvertime(iGuideRepairOrderService.countStatisticsNum(null,null,null,"2",null,null,null,null));
// 超时未办结
- workOrder.setOvertimeWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",null,null,"2",null,null));
+ workOrder.setOvertimeWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",null,null,"2",null,null,null,null));
return ResultData.success(workOrder);
}
@@ -79,11 +80,11 @@
//1 今天 2昨天 3本月 4本年度
//累计全部 本年 本月 今日 昨日
TimeWorkOrder timeWorkOrder=new TimeWorkOrder();
- timeWorkOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum(null,null,null,null,null,null));
- timeWorkOrder.setYearNum(iGuideRepairOrderService.countStatisticsNum(null,null,"4",null,null,null));
- timeWorkOrder.setMonthNum(iGuideRepairOrderService.countStatisticsNum(null,null,"3",null,null,null));
- timeWorkOrder.setTodayNum(iGuideRepairOrderService.countStatisticsNum(null,null,"1",null,null,null));
- timeWorkOrder.setYesterdayNum(iGuideRepairOrderService.countStatisticsNum(null,null,"2",null,null,null));
+ timeWorkOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum(null,null,null,null,null,null,null,null));
+ timeWorkOrder.setYearNum(iGuideRepairOrderService.countStatisticsNum(null,null,"4",null,null,null,null,null));
+ timeWorkOrder.setMonthNum(iGuideRepairOrderService.countStatisticsNum(null,null,"3",null,null,null,null,null));
+ timeWorkOrder.setTodayNum(iGuideRepairOrderService.countStatisticsNum(null,null,"1",null,null,null,null,null));
+ timeWorkOrder.setYesterdayNum(iGuideRepairOrderService.countStatisticsNum(null,null,"2",null,null,null,null,null));
return ResultData.success(timeWorkOrder);
}
@@ -120,49 +121,56 @@
{
EfficiencyEntity entity=new EfficiencyEntity();
//总工单数
- int allNum=iGuideRepairOrderService.countStatisticsNum("",null,null,null,null,null);
+ int allNum=iGuideRepairOrderService.countStatisticsNum("",null,null,null,null,null,null,null);
java.text.DecimalFormat weekDf=new java.text.DecimalFormat("##.##%");//传入格式模板
- int bj=iGuideRepairOrderService.countStatisticsNum("3",null,null,null,null,null);
+ int bj=iGuideRepairOrderService.countStatisticsNum("3",null,null,null,null,null,null,null);
if(bj!=0)
{
// 好评率=评价为满意的导办工单数量/已办结状态工单数量
- String goodReputationEfficiency=weekDf.format((float)(iGuideRepairOrderService.countStatisticsNum(null,null,null,null,"1",null)
- /bj));
+ String goodReputationEfficiency=weekDf.format((float)(iGuideRepairOrderService.countStatisticsNum(null,null,null,null,"1",null,null,null)
+ /(float)bj));
entity.setGoodReputationEfficiency(goodReputationEfficiency);
// 解决率=已解决状态的导办工单数量/已办结状态工单数量
- String resolveEfficiency=weekDf.format((float)(iGuideRepairOrderService.countStatisticsNum("7",null,null,null,null,null)
- /bj));
+ String resolveEfficiency=weekDf.format((float)(iGuideRepairOrderService.countStatisticsNum(null,null,null,null,null,null,"1",null)
+ /(float)bj));
entity.setResolveEfficiency(resolveEfficiency);
if(allNum!=0)
{
// 办结率=待评价+已办结状态的导办工单数量/总工单数量
- String workEfficiency=weekDf.format((float)((iGuideRepairOrderService.countStatisticsNum("4",null,null,null,null,null)
- +bj)/allNum));
+ String workEfficiency=weekDf.format((float)((iGuideRepairOrderService.countStatisticsNum("4",null,null,null,null,null,null,null)
+ +bj)/(float)allNum));
entity.setWorkEfficiency(workEfficiency);
}
}
- int cs=iGuideRepairOrderService.countStatisticsNum(null,null,null,"2",null,null);
+ int cs=iGuideRepairOrderService.countStatisticsNum(null,null,null,"2",null,null,null,null);
if(cs!=0)
{
// 超时办结率=超时状态下的待评价+已办结状态的导办工单数量/超时状态的导办工单数量
- String timeoutEfficiency=weekDf.format((float)((iGuideRepairOrderService.countStatisticsNum("4",null,null,"2",null,null)
- +iGuideRepairOrderService.countStatisticsNum("3",null,null,null,null,null))
- /cs));
+ String timeoutEfficiency=weekDf.format((float)((iGuideRepairOrderService.countStatisticsNum("4",null,null,"2",null,null,null,null)
+ +iGuideRepairOrderService.countStatisticsNum("3",null,null,null,null,null,null,null))
+ /(float)cs));
entity.setTimeoutEfficiency(timeoutEfficiency);
}
if(allNum!=0)
{
- // 回复率=最新进展里0条回复的导办工单数量/总工单数量
+ // 回复率=最新进展里大于0条回复的导办工单数量/总工单数量
//状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 6未解决 7已解决 8 系统自动分配 9 回复 10转派 11手动分配）
- String reversionRate=weekDf.format((float)(iGuideEvolveService.countStatisticsNum("9",null)/allNum));
- entity.setReversionRate(reversionRate);
+
+ String num=(homeStatisticsService.reversionRate("9",null));
+ if(!StringUtils.isEmpty(num))
+ {
+ String reversionRate=weekDf.format(Float.valueOf(num)/(float)allNum);
+ entity.setReversionRate(reversionRate);
+ }
+
+
}
return ResultData.success(entity);
@@ -173,7 +181,7 @@
public ResultData<PieChartAll> getPieChart()
{
PieChartAll pieChartAll=new PieChartAll();
- pieChartAll.setWorkOrderNum(iGuideRepairOrderService.countStatisticsNum("",null,null,null,null,null)+"");
+ pieChartAll.setWorkOrderNum(iGuideRepairOrderService.countStatisticsNum("",null,null,null,null,null,null,null)+"");
pieChartAll.setFingerpostNum(homeStatisticsService.countStatisticsNum(null)+"");
List<PieChart> workOrderList=new ArrayList<>();
List<PieChart> fingerpostList=new ArrayList<>();
@@ -197,7 +205,7 @@
int fingerpostNum=0;
if(clasIds.size()>0)
{
- workOrderNum=iGuideRepairOrderService.countStatisticsNum(null,null,null,null,null,clasIds);
+ workOrderNum=iGuideRepairOrderService.countStatisticsNum(null,null,null,null,null,clasIds,null,null);
fingerpostNum=homeStatisticsService.countStatisticsNum(clasIds);
}
workOrder.setNum(workOrderNum+"");
@@ -242,8 +250,8 @@
if(allNum>0 && score>0)
{
- java.text.DecimalFormat weekDf=new java.text.DecimalFormat("##.##");//传入格式模板
- String workEfficiency=weekDf.format((float)(score/allNum));
+ java.text.DecimalFormat weekDf=new java.text.DecimalFormat("##.#");//传入格式模板
+ String workEfficiency=weekDf.format((float)score/(float)allNum);
bean.setNum(workEfficiency);
}
}
@@ -351,7 +359,7 @@
int num=0;
if(ids!=null&&ids.size()>0)
{
- num=iGuideRepairOrderService.countStatisticsNum(null,ids,null,null,null,null);
+ num=homeStatisticsService.rangeStatistics(ids);
}
range.setNum(num+"");
rangeStatistics.add(range);
--
Gitblit v1.7.1