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 | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 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 962cf57..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 page, Integer size) {
+ 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, p.phone AS phone, ap.create_time AS apply_time, p.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,16 @@
if (hasCondition) {
whereClause.append(" AND ");
}
- whereClause.append("ap.activity_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;
+ }
+
+ if (state != null) {
+ if (hasCondition) {
+ whereClause.append(" AND ");
+ }
+ whereClause.append("ap.state = :state");
hasCondition = true;
}
@@ -56,6 +66,9 @@
if (activityId != null) {
q.setParameter("activityId", activityId);
}
+ if (state != null) {
+ q.setParameter("state", state);
+ }
List<Object[]> rows = q.getResultList();
List<ActivityPlayerApplicationResponse> list = new ArrayList<>();
for (Object[] r : rows) {
@@ -63,10 +76,11 @@
dto.setId(r[0] != null ? Long.valueOf(r[0].toString()) : null); // activity_player_id
dto.setPlayerName(r[1] != null ? r[1].toString() : "");
dto.setActivityName(r[2] != null ? r[2].toString() : "");
- dto.setPhone(r[3] != null ? r[3].toString() : "");
- dto.setApplyTime(r[4] != null ? r[4].toString() : "");
- // 鏄犲皠鐘舵�侊細浣跨敤 t_player.state锛�1=鏈夋晥锛�0=鏃犳晥锛�
- dto.setState(r[5] != null ? Integer.valueOf(r[5].toString()) : 1);
+ dto.setProjectName(r[3] != null ? r[3].toString() : ""); // project_name
+ dto.setPhone(r[4] != null ? r[4].toString() : "");
+ dto.setApplyTime(r[5] != null ? r[5].toString() : "");
+ // 鏄犲皠鐘舵�侊細浣跨敤 t_activity_player.state锛�0=鏈鏍革紝1=瀹℃牳閫氳繃锛�2=瀹℃牳椹冲洖锛�
+ dto.setState(r[6] != null ? Integer.valueOf(r[6].toString()) : 0);
list.add(dto);
}
return list;
--
Gitblit v1.8.0