From 9e11e94f8a92a62695657bb2b3b59a1cf47058a5 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 17 十月 2025 13:38:11 +0800
Subject: [PATCH] 大屏显示问题以及报备导出
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 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 83fe3b2..86ea120 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
@@ -179,8 +179,7 @@
checkScores = scoreMapper.selectCheckScoreMap(checkScore);
}
}
- //鍒嗘暟淇濈暀涓�浣嶅皬鏁�
- checkScores.stream().forEach(item -> item.setScore(item.getScore().setScale(3, RoundingMode.HALF_UP)));
+ checkScores.stream().forEach(item -> item.setScore(item.getScore().setScale(4, RoundingMode.HALF_UP)));
Map<Long, List<CheckScore>> map = checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
for (Map.Entry<Long, List<CheckScore>> entry : map.entrySet()) {
List<CheckScore> tempList = getCheckScores(entry);
@@ -206,13 +205,13 @@
if (!hasCar){
CheckScore car = new CheckScore();
car.setExamineCategory((short) 2);
- car.setScore(new BigDecimal("0.00"));
+ car.setScore(new BigDecimal("0.000"));
tempList.add(car);
}
if (!hasFace){
CheckScore face = new CheckScore();
face.setExamineCategory((short) 3);
- face.setScore(new BigDecimal("0.00"));
+ face.setScore(new BigDecimal("0.000"));
tempList.add(face);
}
@@ -566,7 +565,23 @@
//澶у睆灞曠ず鑰冩牳寰楀垎
@Override
public Map<String, Map<String, Object>> dashboard(DashboardQuery dashboardQuery) {
- Date now = new Date();
+// Date now = new Date();
+
+ Calendar cal = Calendar.getInstance();
+
+// 2. 璁剧疆涓轰粖骞�10鏈�12鍙� 00:00:00锛堟竻闄ゆ椂鍒嗙锛岄伩鍏嶅綋鍓嶆椂闂村共鎵帮級
+ cal.set(Calendar.MONTH, Calendar.OCTOBER); // 10鏈堬紙鐢ㄥ父閲忔洿鐩磋锛岄伩鍏嶈0鍩猴級
+// cal.set(Calendar.MONTH, 9); // 涔熷彲浠ョ敤鏁板瓧9锛堜笉鎺ㄨ崘锛屽彲璇绘�у樊锛�
+ cal.set(Calendar.DAY_OF_MONTH, 12); // 鏃ユ湡璁句负12鍙�
+ cal.set(Calendar.HOUR_OF_DAY, 12); // 灏忔椂璁句负0锛�24灏忔椂鍒讹級
+ cal.set(Calendar.MINUTE, 0); // 鍒嗛挓璁句负0
+ cal.set(Calendar.SECOND, 0); // 绉掕涓�0
+ cal.set(Calendar.MILLISECOND, 0); // 姣璁句负0
+
+// 3. 杞垚Date瀵硅薄
+ Date now = cal.getTime();
+
+
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
dashboardQuery.setStartTime(format.format(DateUtils.getDayStart(now)));
dashboardQuery.setEndTime(format.format(DateUtils.getDayEnd(now)));
@@ -588,7 +603,7 @@
Map<String, Object> map = resultMap.get(checkScore.getDeptName());
BigDecimal score = checkScore.getScore();
// 鏍稿績閫昏緫锛氬師濮媠core 脳10 鈫� 淇濈暀涓や綅灏忔暟 鈫� 鎷兼帴鐧惧垎鍙�
- BigDecimal scoreMultiplied = score.multiply(new BigDecimal("10")); // 4.6160 脳10 = 46.160
+ BigDecimal scoreMultiplied = score.multiply(new BigDecimal("100"));
BigDecimal scoreWithTwoDecimals = scoreMultiplied.setScale(2, RoundingMode.HALF_UP); // 淇濈暀涓や綅灏忔暟锛�46.16
String formattedScore = scoreWithTwoDecimals + "%"; // 鎷兼帴鐧惧垎鍙凤細46.16%
--
Gitblit v1.8.0