petty09190/ai-showcase-platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

前台得獎照片呈現

Browse Source
This commit is contained in:
吳佩庭
2025-09-29 23:20:11 +08:00
parent ea6afb1675
commit bdbb7f18d5
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
components/admin/competition-management.tsx
View File

@@ -1885,11 +1885,25 @@ export function CompetitionManagement() {
} }
// 準備獎項數據 // 準備獎項數據
console.log('🔍 準備獎項數據 - 參賽者資訊:', {
actualParticipantType,
participantId: newAward.participantId,
participantName,
participant: participant ? {
id: participant.id,
name: participant.name,
primary_app_id: participant.primary_app_id,
primary_app_name: participant.primary_app_name,
app_id: participant.app_id,
app_name: participant.app_name
} : null
});
const awardData = { const awardData = {
competition_id: newAward.competitionId, competition_id: newAward.competitionId,
app_id: actualParticipantType === "individual" ? newAward.participantId : (participant?.app_id || null), app_id: actualParticipantType === "individual" ? newAward.participantId : (participant?.primary_app_id || null),
team_id: actualParticipantType === "team" ? newAward.participantId : null, team_id: actualParticipantType === "team" ? newAward.participantId : null,
app_name: actualParticipantType === "individual" ? participantName : (participant?.app_name || null), app_name: actualParticipantType === "individual" ? participantName : (participant?.primary_app_name || null),
team_name: actualParticipantType === "team" ? participantName : null, team_name: actualParticipantType === "team" ? participantName : null,
creator: creatorName, creator: creatorName,
award_type: newAward.awardType, award_type: newAward.awardType,
@@ -1936,9 +1950,9 @@ export function CompetitionManagement() {
const awardItem = { const awardItem = {
id: result.data.id || selectedAward.id, id: result.data.id || selectedAward.id,
competitionId: newAward.competitionId, competitionId: newAward.competitionId,
appId: actualParticipantType === "individual" ? newAward.participantId : (participant?.app_id || null), appId: actualParticipantType === "individual" ? newAward.participantId : (participant?.primary_app_id || null),
teamId: actualParticipantType === "team" ? newAward.participantId : null, teamId: actualParticipantType === "team" ? newAward.participantId : null,
appName: actualParticipantType === "individual" ? participantName : (participant?.app_name || null), appName: actualParticipantType === "individual" ? participantName : (participant?.primary_app_name || null),
teamName: actualParticipantType === "team" ? participantName : null, teamName: actualParticipantType === "team" ? participantName : null,
creator: creatorName, creator: creatorName,
awardType: newAward.awardType as any, awardType: newAward.awardType as any,

5
lib/services/database-service.ts
View File

@@ -1728,7 +1728,10 @@ export class CompetitionService extends DatabaseServiceBase {
u.name as leader_name, u.name as leader_name,
u.phone as leader_phone, u.phone as leader_phone,
COUNT(DISTINCT tm.id) as actual_member_count, COUNT(DISTINCT tm.id) as actual_member_count,
COUNT(DISTINCT a.id) as app_count COUNT(DISTINCT a.id) as app_count,
-- 獲取團隊的主要應用（第一個應用）
(SELECT a2.id FROM apps a2 WHERE a2.team_id = t.id AND a2.is_active = 1 ORDER BY a2.created_at ASC LIMIT 1) as primary_app_id,
(SELECT a2.name FROM apps a2 WHERE a2.team_id = t.id AND a2.is_active = 1 ORDER BY a2.created_at ASC LIMIT 1) as primary_app_name
FROM competition_teams ct FROM competition_teams ct
JOIN teams t ON ct.team_id = t.id JOIN teams t ON ct.team_id = t.id
LEFT JOIN users u ON t.leader_id = u.id LEFT JOIN users u ON t.leader_id = u.id