From b85a7f932b9d789a2e9bdb36e366c36c2e1eb3cc Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 17 四月 2025 11:31:53 +0800
Subject: [PATCH] 查询考核成绩为null，为前端添加数据默认为0
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 57a706f..196e733 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
@@ -167,7 +167,7 @@
// }
List<CheckScore> checkScores = scoreMapper.selectCheckScoreMap(checkScore);
-
+ log.error("鎵撳嵃锛歿}",checkScores);
// 濡傛灉鏁版嵁涓虹┖锛屽垯鏌ヨ涔嬪墠鐨勬暟鎹�
if (CollectionUtils.isEmpty(checkScores) && (query.getStartDate() ==null || query.getStartDate() ==null)) {
CheckScore one = scoreMapper.getLast(checkScore);
@@ -180,7 +180,32 @@
}
//鍒嗘暟淇濈暀涓�浣嶅皬鏁�
checkScores.stream().forEach(item -> item.setScore(item.getScore().setScale(1, RoundingMode.HALF_UP)));
- return checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
+
+ Map<Long, List<CheckScore>> map = checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
+ log.error("map :{}",map);
+
+ for (Map.Entry<Long, List<CheckScore>> entry : map.entrySet()) {
+ List<CheckScore> tempList = new ArrayList<>(); // 涓存椂瀛樺偍闇�瑕佹坊鍔犵殑鍏冪礌
+ Iterator<CheckScore> iterator = entry.getValue().iterator();
+ while (iterator.hasNext()) {
+ CheckScore listCheckScore = iterator.next();
+ if (listCheckScore.getExamineCategory() == 1 && entry.getValue().size() == 1) {
+ CheckScore face = new CheckScore();
+ face.setExamineCategory((short) 2);
+ face.setScore(new BigDecimal("0.0"));
+ CheckScore car = new CheckScore();
+ car.setExamineCategory((short) 3);
+ car.setScore(new BigDecimal("0.0"));
+ tempList.add(face);
+ tempList.add(car);
+ }
+ }
+ // 杩唬缁撴潫鍚庯紝灏嗘柊鍏冪礌娣诲姞鍒板師濮嬪垪琛ㄤ腑
+ entry.getValue().addAll(tempList);
+ }
+
+
+ return map;
}
private void getCheckScore(CheckScore checkScore) {
--
Gitblit v1.8.0