From 29fc6f5b1981775be5d2f0f9f8e61fec2f550252 Mon Sep 17 00:00:00 2001
From: lrj <owen.stl@gmail.com>
Date: 星期一, 29 九月 2025 19:29:11 +0800
Subject: [PATCH] 删除所有test开头的测试文件
---
backend/src/main/java/com/rongyichuang/player/service/PlayerApplicationService.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 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 62583da..962cf57 100644
--- a/backend/src/main/java/com/rongyichuang/player/service/PlayerApplicationService.java
+++ b/backend/src/main/java/com/rongyichuang/player/service/PlayerApplicationService.java
@@ -15,20 +15,33 @@
private EntityManager em;
/**
- * 璇诲彇鎶ュ悕鐢宠锛屾寜鎶ュ悕鏃堕棿鍊掑簭
- * 娉ㄦ剰锛氬疄闄呭簱琛ㄤ负 t_avtivity_player锛堟嫾鍐欎互搴撲负鍑嗭級
+ * 鏌ヨ娲诲姩鎶ュ悕淇℃伅
*/
@SuppressWarnings("unchecked")
- public List<ActivityPlayerApplicationResponse> listApplications(String name, Integer page, Integer size) {
+ public List<ActivityPlayerApplicationResponse> listApplications(String name, Long activityId, 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.audit_state AS state " +
- "FROM t_avtivity_player ap " +
+ "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 " +
+ "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 ";
- String where = "";
+
+ StringBuilder whereClause = new StringBuilder();
+ boolean hasCondition = false;
+
if (name != null && !name.isEmpty()) {
- where = "WHERE p.name LIKE CONCAT('%', :name, '%') ";
+ whereClause.append("p.name LIKE CONCAT('%', :name, '%')");
+ hasCondition = true;
}
+
+ if (activityId != null) {
+ if (hasCondition) {
+ whereClause.append(" AND ");
+ }
+ whereClause.append("ap.activity_id = :activityId");
+ hasCondition = true;
+ }
+
+ String where = hasCondition ? "WHERE " + whereClause.toString() + " " : "";
String order = "ORDER BY ap.create_time DESC ";
String limit = "";
if (page != null && size != null && page > 0 && size > 0) {
@@ -37,8 +50,11 @@
}
var q = em.createNativeQuery(baseSql + where + order + limit);
- if (!where.isEmpty()) {
+ if (name != null && !name.isEmpty()) {
q.setParameter("name", name);
+ }
+ if (activityId != null) {
+ q.setParameter("activityId", activityId);
}
List<Object[]> rows = q.getResultList();
List<ActivityPlayerApplicationResponse> list = new ArrayList<>();
@@ -49,8 +65,8 @@
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.audit_state锛�0=鏈鏍革紝1=杩涜涓紝2=宸查┏鍥烇紝3=缁撴潫锛�
- dto.setState(r[5] != null ? Integer.valueOf(r[5].toString()) : 0);
+ // 鏄犲皠鐘舵�侊細浣跨敤 t_player.state锛�1=鏈夋晥锛�0=鏃犳晥锛�
+ dto.setState(r[5] != null ? Integer.valueOf(r[5].toString()) : 1);
list.add(dto);
}
return list;
--
Gitblit v1.8.0