From e7b8a1c59d220de6e5e3a1e825062f91894ee28d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=85=E6=88=BF?= <hongjianli_email@126.com>
Date: Wed, 24 Dec 2025 17:01:54 +0800
Subject: [PATCH] fix: optimize schedule query and add scheduleDate field
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add scheduleDate field to ScheduleGroupDetailVO
- Fix schedule date format in mapper XML
- Optimize schedule service implementation

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 .../modules/martial/mapper/MartialScheduleGroupMapper.xml     | 1 +
 .../modules/martial/pojo/vo/ScheduleGroupDetailVO.java        | 3 +++
 .../service/impl/MartialScheduleArrangeServiceImpl.java       | 2 +-
 .../martial/service/impl/MartialScheduleServiceImpl.java      | 4 ++--
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/martial/mapper/MartialScheduleGroupMapper.xml b/src/main/java/org/springblade/modules/martial/mapper/MartialScheduleGroupMapper.xml
index 605b571..4f6adcd 100644
--- a/src/main/java/org/springblade/modules/martial/mapper/MartialScheduleGroupMapper.xml
+++ b/src/main/java/org/springblade/modules/martial/mapper/MartialScheduleGroupMapper.xml
@@ -17,6 +17,7 @@
 			d.venue_name AS venueName,
 			d.time_slot AS timeSlot,
 			d.time_slot_index AS timeSlotIndex,
+			d.schedule_date AS scheduleDate,
 			p.id AS participantId,
 			p.organization AS organization,
 			p.check_in_status AS checkInStatus,
diff --git a/src/main/java/org/springblade/modules/martial/pojo/vo/ScheduleGroupDetailVO.java b/src/main/java/org/springblade/modules/martial/pojo/vo/ScheduleGroupDetailVO.java
index 909a7dd..10ec88c 100644
--- a/src/main/java/org/springblade/modules/martial/pojo/vo/ScheduleGroupDetailVO.java
+++ b/src/main/java/org/springblade/modules/martial/pojo/vo/ScheduleGroupDetailVO.java
@@ -29,6 +29,9 @@ public class ScheduleGroupDetailVO implements Serializable {
 	private String timeSlot;
 	private Integer timeSlotIndex; // 时间段索引(0=第1天上午,1=第1天下午,2=第2天上午,...)
 
+	// === 比赛日期 ===
+	private String scheduleDate;
+
 	// === 参赛者信息 ===
 	private Long participantId;
 	private String organization;
diff --git a/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleArrangeServiceImpl.java b/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleArrangeServiceImpl.java
index 2d20764..042aa25 100644
--- a/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleArrangeServiceImpl.java
+++ b/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleArrangeServiceImpl.java
@@ -744,7 +744,7 @@ public class MartialScheduleArrangeServiceImpl implements IMartialScheduleArrang
 					participant.setScheduleDetailId(detailId);
 					participant.setScheduleGroupId(groupId);
 					participant.setParticipantId(athlete.getId());
-					participant.setOrganization(athlete.getOrganization());
+					participant.setOrganization(athlete.getTeamName() != null && !athlete.getTeamName().isEmpty() ? athlete.getTeamName() : athlete.getOrganization());
 					participant.setPlayerName(athlete.getPlayerName());
 					participant.setProjectName(groupData.getGroupName());
 					participant.setCategory(athlete.getCategory());
diff --git a/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleServiceImpl.java b/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleServiceImpl.java
index aec9683..7f069fd 100644
--- a/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleServiceImpl.java
+++ b/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleServiceImpl.java
@@ -103,7 +103,7 @@ public class MartialScheduleServiceImpl extends ServiceImpl<MartialScheduleMappe
 			if (participants.isEmpty()) {
 				// 没有参赛者，创建一条基础记录
 				ScheduleExportExcel excel = new ScheduleExportExcel();
-				excel.setScheduleDate("");
+				excel.setScheduleDate(firstDetail.getScheduleDate() != null ? firstDetail.getScheduleDate() : "");
 				excel.setTimeSlot(firstDetail.getTimeSlot());
 				excel.setVenueName(firstDetail.getVenueName());
 				excel.setProjectName(firstDetail.getGroupName());
@@ -114,7 +114,7 @@ public class MartialScheduleServiceImpl extends ServiceImpl<MartialScheduleMappe
 				// 为每个参赛者创建导出记录
 				for (ScheduleGroupDetailVO detail : participants) {
 					ScheduleExportExcel excel = new ScheduleExportExcel();
-					excel.setScheduleDate("");
+					excel.setScheduleDate(detail.getScheduleDate() != null ? detail.getScheduleDate() : "");
 					excel.setTimeSlot(detail.getTimeSlot());
 					excel.setVenueName(detail.getVenueName());
 					excel.setProjectName(detail.getGroupName());