From 7ad9c3c93f0cc103347ae2e2429e0122fb512e24 Mon Sep 17 00:00:00 2001 From: lrj <owen.stl@gmail.com> Date: 星期三, 01 十月 2025 21:26:12 +0800 Subject: [PATCH] feat: 修复员工管理功能并优化UI --- backend/src/main/java/com/rongyichuang/player/service/ActivityPlayerRatingService.java | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/backend/src/main/java/com/rongyichuang/player/service/ActivityPlayerRatingService.java b/backend/src/main/java/com/rongyichuang/player/service/ActivityPlayerRatingService.java index e26369e..f3b8ee9 100644 --- a/backend/src/main/java/com/rongyichuang/player/service/ActivityPlayerRatingService.java +++ b/backend/src/main/java/com/rongyichuang/player/service/ActivityPlayerRatingService.java @@ -259,22 +259,29 @@ Long judgeId = ((Number) row.get("id")).longValue(); String judgeName = (String) row.get("name"); - // 鏌ユ壘璇ヨ瘎濮旂殑璇勫垎 - Optional<ActivityPlayerRating> ratingOpt = activityPlayerRatingRepository - .findByActivityPlayerIdAndJudgeId(activityPlayerId, judgeId); + // 鏌ユ壘璇ヨ瘎濮旂殑璇勫垎璁板綍鏁伴噺锛堜粠t_activity_player_rating琛ㄦ寜activity_player_id鍜宩udge_id鏌ヨ锛� + String ratingCountSql = "SELECT COUNT(*) FROM t_activity_player_rating WHERE activity_player_id = ? AND judge_id = ?"; + Integer ratingCount = jdbcTemplate.queryForObject(ratingCountSql, Integer.class, activityPlayerId, judgeId); + Boolean hasRated = ratingCount != null && ratingCount > 0; // 璇勫娆℃暟>0琛ㄧず宸茶瘎瀹� + String ratingTime = null; BigDecimal totalScore = null; - Integer status = 0; - if (ratingOpt.isPresent()) { - ActivityPlayerRating rating = ratingOpt.get(); - totalScore = rating.getTotalScore(); - status = rating.getState(); + // 濡傛灉宸茶瘎鍒嗭紝鑾峰彇鏈�鏂扮殑璇勫垎璁板綍 + if (hasRated) { + Optional<ActivityPlayerRating> ratingOpt = activityPlayerRatingRepository + .findByActivityPlayerIdAndJudgeId(activityPlayerId, judgeId); + + if (ratingOpt.isPresent()) { + ActivityPlayerRating rating = ratingOpt.get(); + totalScore = rating.getTotalScore(); + if (rating.getUpdateTime() != null) { + ratingTime = rating.getUpdateTime().toString(); + } + } } - Boolean isCurrentJudge = judgeId.equals(currentJudgeId); - - return new JudgeRatingStatusResponse(judgeId, judgeName, totalScore, status, isCurrentJudge); + return new JudgeRatingStatusResponse(judgeId, judgeName, hasRated, ratingTime, totalScore); }).collect(java.util.stream.Collectors.toList()); } -- Gitblit v1.8.0