new-ryc.git - Gitblit

			@@ -206,7 +206,10 @@
			*/
			public CurrentJudgeRatingResponse getCurrentJudgeRating(Long activityPlayerId) {
			Long currentJudgeId = userContextUtil.getCurrentJudgeId();
			log.info("getCurrentJudgeRating - activityPlayerId: {}, currentJudgeId: {}", activityPlayerId, currentJudgeId);

			if (currentJudgeId == null) {
			log.warn("getCurrentJudgeRating - currentJudgeId is null");
			return null;
			}

			@@ -214,8 +217,11 @@
			.findByActivityPlayerIdAndJudgeId(activityPlayerId, currentJudgeId);

			if (!ratingOpt.isPresent()) {
			log.info("getCurrentJudgeRating - No rating found for activityPlayerId: {} and judgeId: {}", activityPlayerId, currentJudgeId);
			return null;
			}

			log.info("getCurrentJudgeRating - Found rating with id: {}", ratingOpt.get().getId());

			ActivityPlayerRating rating = ratingOpt.get();
			CurrentJudgeRatingResponse response = new CurrentJudgeRatingResponse();
			@@ -227,16 +233,35 @@
			// 获取评分项
			List<ActivityPlayerRatingItem> items = activityPlayerRatingItemRepository
			.findByActivityPlayerRatingId(rating.getId());

			List<CurrentJudgeRatingResponse.CurrentJudgeRatingItemResponse> itemResponses = items.stream()
			.map(item -> new CurrentJudgeRatingResponse.CurrentJudgeRatingItemResponse(
			item.getRatingItemId(),
			"", // 评分项名称暂时为空
			item.getScore(),
			item.getScore() // 使用得分作为加权得分
			))

			List<Long> ratingItemIds = items.stream()
			.map(ActivityPlayerRatingItem::getRatingItemId)
			.filter(java.util.Objects::nonNull)
			.distinct()
			.collect(java.util.stream.Collectors.toList());


			java.util.Map<Long, RatingItem> ratingItemMap = ratingItemIds.isEmpty()
			? java.util.Collections.emptyMap()
			: ratingItemRepository.findAllById(ratingItemIds).stream()
			.collect(java.util.stream.Collectors.toMap(RatingItem::getId, java.util.function.Function.identity()));

			List<CurrentJudgeRatingResponse.CurrentJudgeRatingItemResponse> itemResponses = items.stream()
			.map(item -> {
			RatingItem ratingItem = ratingItemMap.get(item.getRatingItemId());
			String name = ratingItem != null ? ratingItem.getName() : "";
			BigDecimal maxScore = ratingItem != null && ratingItem.getMaxScore() != null
			? BigDecimal.valueOf(ratingItem.getMaxScore()) : null;
			return new CurrentJudgeRatingResponse.CurrentJudgeRatingItemResponse(
			item.getRatingItemId(),
			name,
			item.getScore(),
			item.getScore(),
			maxScore
			);
			})
			.collect(java.util.stream.Collectors.toList());

			response.setRatedAt(rating.getUpdateTime() != null ? rating.getUpdateTime().toString() : null);
			response.setItems(itemResponses);
			return response;
			}
			@@ -397,7 +422,12 @@
			((Number) row.get("rating_item_id")).longValue(),
			(String) row.get("rating_item_name"),
			(BigDecimal) row.get("score"),
			(BigDecimal) row.get("score") // weightedScore 暂时使用相同值
			(BigDecimal) row.get("score"),
			row.get("max_score") instanceof BigDecimal
			? (BigDecimal) row.get("max_score")
			: row.get("max_score") instanceof Number
			? BigDecimal.valueOf(((Number) row.get("max_score")).doubleValue())
			: null
			))
			.collect(java.util.stream.Collectors.toList());

			@@ -406,6 +436,7 @@
			response.setTotalScore(rating.getTotalScore());
			response.setStatus(rating.getState());
			response.setRemark(rating.getFeedback());
			response.setRatedAt(rating.getUpdateTime() != null ? rating.getUpdateTime().toString() : null);
			response.setItems(items);

			return response;
			@@ -415,4 +446,4 @@
			return null;
			}
			}
			}
			}