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 | 56 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 10 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 4a3be48..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
@@ -10,6 +10,7 @@
import com.ycl.platform.domain.dto.CheckScoreIndexDTO;
import com.ycl.platform.domain.dto.ScoreIndexDTO;
import com.ycl.platform.domain.entity.*;
+import com.ycl.platform.domain.query.DashboardQuery;
import com.ycl.platform.domain.vo.*;
import com.ycl.platform.mapper.CheckRuleMapper;
import com.ycl.platform.mapper.CheckScoreMapper;
@@ -174,8 +175,8 @@
}
}
//鍒嗘暟淇濈暀涓�浣嶅皬鏁�
- checkScores.stream().forEach(item ->item.setScore(item.getScore().setScale(1,RoundingMode.HALF_UP)));
- return checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
+ checkScores.stream().forEach(item -> item.setScore(item.getScore().setScale(1, RoundingMode.HALF_UP)));
+ return checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
}
private void getCheckScore(CheckScore checkScore, Calendar calendar) {
@@ -220,7 +221,7 @@
}
List<CheckScore> checkScores = scoreMapper.selectCheckScoreList(checkScore);
//鍒嗘暟淇濈暀涓�浣嶅皬鏁�
- checkScores.stream().forEach(item ->item.setScore(item.getScore().setScale(1,RoundingMode.HALF_UP)));
+ checkScores.stream().forEach(item -> item.setScore(item.getScore().setScale(1, RoundingMode.HALF_UP)));
return checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
}
@@ -236,7 +237,7 @@
//鍖哄幙鍙兘鐪嬪凡鍙戝竷
roleControl(checkScore);
List<CheckScore> scoreList = scoreMapper.selectCheckScoreList(checkScore);
- scoreList.stream().forEach(item ->item.setScore(item.getScore().setScale(1,RoundingMode.HALF_UP)));
+ scoreList.stream().forEach(item -> item.setScore(item.getScore().setScale(1, RoundingMode.HALF_UP)));
return scoreList;
}
@@ -318,10 +319,16 @@
checkIndexCar.setQuarter(exportDTO.getQuarter());
checkIndexCar.setDeptId(exportDTO.getDeptId());
checkIndexCar.setDeptIds(exportDTO.getDeptIds());
- checkIndexCar.setExamineTags(exportDTO.getExamineTags());
//鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
roleControl(checkIndexCar);
- List<CheckIndexCar> checkIndexCars = indexCarService.selectCheckIndexCarList(checkIndexCar);
+ List<CheckIndexCar> checkIndexCars = new ArrayList<>();
+ for (Integer examineTag : exportDTO.getExamineTags()) {
+ checkIndexCar.setExamineTag(Short.valueOf(examineTag+""));
+ if(examineTag ==0){
+ checkIndexCar.setExamineTagQuery(1);
+ }
+ checkIndexCars.addAll(indexCarService.selectCheckIndexCarList(checkIndexCar));
+ }
//璁＄畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
if (exportDTO.getAverage() != null && exportDTO.getAverage() && !CollectionUtils.isEmpty(checkIndexCars)) {
//鍏堝尯鍒嗚�冩牳鏍囩锛屽啀鍖哄垎鍖哄幙
@@ -360,10 +367,16 @@
checkIndexFace.setQuarter(exportDTO.getQuarter());
checkIndexFace.setDeptId(exportDTO.getDeptId());
checkIndexFace.setDeptIds(exportDTO.getDeptIds());
- checkIndexFace.setExamineTags(exportDTO.getExamineTags());
//鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
roleControl(checkIndexFace);
- List<CheckIndexFace> checkIndexFaces = indexFaceService.selectCheckIndexFaceList(checkIndexFace);
+ List<CheckIndexFace> checkIndexFaces = new ArrayList<>();
+ for (Integer examineTag : exportDTO.getExamineTags()) {
+ checkIndexFace.setExamineTag(Short.valueOf(examineTag+""));
+ if(examineTag ==0){
+ checkIndexFace.setExamineTagQuery(1);
+ }
+ checkIndexFaces.addAll(indexFaceService.selectCheckIndexFaceList(checkIndexFace));
+ }
//璁＄畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
if (exportDTO.getAverage() != null && exportDTO.getAverage() && !CollectionUtils.isEmpty(checkIndexFaces)) {
//鍏堝尯鍒嗚�冩牳鏍囩锛屽啀鍖哄垎鍖哄幙
@@ -402,10 +415,16 @@
checkIndexVideo.setQuarter(exportDTO.getQuarter());
checkIndexVideo.setDeptId(exportDTO.getDeptId());
checkIndexVideo.setDeptIds(exportDTO.getDeptIds());
- checkIndexVideo.setExamineTags(exportDTO.getExamineTags());
//鏉冮檺鎺у埗 鍙兘鏌ョ湅宸插彂甯�
roleControl(checkIndexVideo);
- List<CheckIndexVideo> checkIndexVideos = indexVideoService.selectCheckIndexVideoList(checkIndexVideo);
+ List<CheckIndexVideo> checkIndexVideos = new ArrayList<>();
+ for (Integer examineTag : exportDTO.getExamineTags()) {
+ checkIndexVideo.setExamineTag(Short.valueOf(examineTag+""));
+ if(examineTag ==0){
+ checkIndexVideo.setExamineTagQuery(1);
+ }
+ checkIndexVideos.addAll(indexVideoService.selectCheckIndexVideoList(checkIndexVideo));
+ }
//璁＄畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
if (exportDTO.getAverage() != null && exportDTO.getAverage() && !CollectionUtils.isEmpty(checkIndexVideos)) {
//鍏堝尯鍒嗚�冩牳鏍囩锛屽啀鍖哄垎鍖哄幙
@@ -506,6 +525,23 @@
return scoreMapper.calculate(startDate, endDate, category);
}
+ //澶у睆灞曠ず鑰冩牳寰楀垎
+ @Override
+ 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, Map<String, Object>> resultMap = new HashMap<>();
+
+ for (CheckScore checkScore : dashboard) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("score", checkScore.getScore().setScale(2,RoundingMode.HALF_UP));
+ resultMap.put(checkScore.getDeptName(), map);
+ }
+ return resultMap;
+ }
+
// /**
// * 鏂板鑰冩牳绉垎
// *
--
Gitblit v1.8.0