From 9e2d6dc8b109099c20c845c8c7b9e253ff94f48a Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 21 十一月 2022 13:36:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java | 4 ++--
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
index 6944e7a..857e426 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
@@ -131,7 +131,6 @@
user.setMattersIds(config.getMattersIds());
user.setMasterNames(config.getMasterNames());
user.setMattersNames(config.getMattersNames());
- user.setMasterIds(config.getMasterIds());
//提示用户名或密码错误
return toAjax(IUserService.updateConfig(user));
}
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 b10423c..0f1da23 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
@@ -155,7 +155,7 @@
{
// 超时办结率=超时状态下的待评价+已办结状态的导办工单数量/超时状态的导办工单数量
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))
+ +iGuideRepairOrderService.countStatisticsNum("3",null,null,"2",null,null,null,null))
/(float)cs));
entity.setTimeoutEfficiency(timeoutEfficiency);
@@ -520,7 +520,7 @@
{
// 超时办结率=超时状态下的待评价+已办结状态的导办工单数量/超时状态的导办工单数量
String timeoutEfficiency=weekDf.format((float)((iGuideRepairOrderService.countStatisticsNum("4",ids,null,"2",null,null,null,null)
- +iGuideRepairOrderService.countStatisticsNum("3",ids,null,null,null,null,null,null))
+ +iGuideRepairOrderService.countStatisticsNum("3",ids,null,"2",null,null,null,null))
/(float)cs));
entity.setTimeoutEfficiency(timeoutEfficiency);
--
Gitblit v1.7.1