From 134ef8858210a09d34567b5ef0b8d29b6c8bf38d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 23 九月 2024 16:20:05 +0800
Subject: [PATCH] 大屏设备运行率bug
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
index e05e86c..6df38ab 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
@@ -527,22 +527,17 @@
//澶у睆灞曠ず鑰冩牳寰楀垎
@Override
- //TODO:鑰冭檻limit bug
- public Map<String, List<Map<String, Object>>> dashboard(DashboardQuery dashboardQuery) {
+ public Map<String, Map<String, Object>> dashboard(DashboardQuery dashboardQuery) {
+ Date now = new Date();
+ dashboardQuery.setStartTime(DateUtils.getMouthStart(now));
+ dashboardQuery.setEndTime(DateUtils.getMouthEnd(now));
List<CheckScore> dashboard = scoreMapper.dashboard(dashboardQuery);
- Map<String, List<Map<String, Object>>> resultMap = new HashMap<>();
+ Map<String, Map<String, Object>> resultMap = new HashMap<>();
for (CheckScore checkScore : dashboard) {
- List<Map<String, Object>> list = new ArrayList<>();
Map<String, Object> map = new HashMap<>();
- map.put("value", checkScore.getScore());
- if (dashboardQuery.getDataScope() == 1) {
- map.put("name", "鐪佸巺寰楀垎");
- } else {
- map.put("name", "鍖哄幙寰楀垎");
- }
- list.add(map);
- resultMap.put(checkScore.getDeptName(), list);
+ map.put("score", checkScore.getScore().setScale(2,RoundingMode.HALF_UP));
+ resultMap.put(checkScore.getDeptName(), map);
}
return resultMap;
}
--
Gitblit v1.8.0