From dc643ba44fd2a426263015491268a0f0d6b4671d Mon Sep 17 00:00:00 2001 From: lrj <owen.stl@gmail.com> Date: 星期三, 01 十月 2025 08:39:29 +0800 Subject: [PATCH] 删除包含test、check、fix的文件名的文件 --- backend/src/main/java/com/rongyichuang/player/service/PlayerApplicationService.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/com/rongyichuang/player/service/PlayerApplicationService.java b/backend/src/main/java/com/rongyichuang/player/service/PlayerApplicationService.java index f78ffc1..397796e 100644 --- a/backend/src/main/java/com/rongyichuang/player/service/PlayerApplicationService.java +++ b/backend/src/main/java/com/rongyichuang/player/service/PlayerApplicationService.java @@ -16,14 +16,15 @@ /** * 鏌ヨ娲诲姩鎶ュ悕淇℃伅 + * 褰撲紶鍏ctivityId鏃讹紝鏌ヨ璇ユ瘮璧涗笅绗竴涓樁娈碉紙sort_order=1锛夌殑鎶ュ悕椤圭洰 */ @SuppressWarnings("unchecked") public List<ActivityPlayerApplicationResponse> listApplications(String name, Long activityId, Integer state, Integer page, Integer size) { String baseSql = - "SELECT ap.id, p.name AS player_name, a.name AS activity_name, ap.project_name AS project_name, p.phone AS phone, ap.create_time AS apply_time, ap.state AS state " + + "SELECT ap.id, p.name AS player_name, stage.name AS activity_name, ap.project_name AS project_name, p.phone AS phone, ap.create_time AS apply_time, ap.state AS state " + "FROM t_activity_player ap " + "JOIN t_player p ON p.id = ap.player_id " + - "JOIN t_activity a ON a.id = ap.activity_id "; + "JOIN t_activity stage ON stage.id = ap.stage_id "; StringBuilder whereClause = new StringBuilder(); boolean hasCondition = false; @@ -37,7 +38,8 @@ if (hasCondition) { whereClause.append(" AND "); } - whereClause.append("ap.stage_id = :activityId"); + // 鏌ヨ鎸囧畾涓绘瘮璧涚殑绗竴闃舵鎶ュ悕椤圭洰锛歛ctivity_id=涓绘瘮璧汭D, stage_id=绗竴闃舵ID + whereClause.append("ap.activity_id = :activityId AND stage.pid = :activityId AND stage.sort_order = 1"); hasCondition = true; } -- Gitblit v1.8.0