From 67d4a1804da3db5ffafa7d46ea92eab6ac0e955a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E6=A2=93=E5=BD=AD?= Date: Wed, 28 Oct 2026 15:00:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CitizenSportsPlatformService.cs | 13 ++++++++++++ .../Dtos/CitizenSportsSyncDtos.cs | 20 ++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/YD_Event.Application/CitizenSports/CitizenSportsPlatformService.cs b/YD_Event.Application/CitizenSports/CitizenSportsPlatformService.cs index 149d7b1..92feed0 100644 --- a/YD_Event.Application/CitizenSports/CitizenSportsPlatformService.cs +++ b/YD_Event.Application/CitizenSports/CitizenSportsPlatformService.cs @@ -353,6 +353,19 @@ public sealed class CitizenSportsPlatformService : ITransient TypeName = x.TypeName, PlayerCount = x.Players.Count }).ToList(), + Players = prepared.Groups.SelectMany(group => group.Players.Select(player => new CitizenSportsPlayerPreview + { + TypeName = group.TypeName, + PlayerId = player.PlayerId, + CardNumber = player.CardNumber, + CardType = player.CardType, + PlayerName = player.PlayerName, + PlayerSex = player.PlayerSex, + PlayerPhone = player.PlayerPhone, + PlayerBirth = player.PlayerBirth, + GroupName = player.GroupName, + DeleteStatus = player.DeleteStatus + })).ToList(), Errors = prepared.Errors }; diff --git a/YD_Event.Application/CitizenSports/Dtos/CitizenSportsSyncDtos.cs b/YD_Event.Application/CitizenSports/Dtos/CitizenSportsSyncDtos.cs index 1bfb7d5..0d77257 100644 --- a/YD_Event.Application/CitizenSports/Dtos/CitizenSportsSyncDtos.cs +++ b/YD_Event.Application/CitizenSports/Dtos/CitizenSportsSyncDtos.cs @@ -37,7 +37,7 @@ public class CitizenSportsExecuteInput : CitizenSportsSyncInput } /// -/// 同步预览结果,不返回证件号、手机号等敏感信息。 +/// 同步预览结果,包含实际待上传的运动员明细。 /// public class CitizenSportsPreviewOutput { @@ -49,6 +49,7 @@ public class CitizenSportsPreviewOutput public int TypeCount { get; set; } public bool CanUpload => Errors.Count == 0 && UploadRecordCount > 0; public List Types { get; set; } = []; + public List Players { get; set; } = []; public List Errors { get; set; } = []; } @@ -58,6 +59,23 @@ public class CitizenSportsTypePreview public int PlayerCount { get; set; } } +/// +/// 实际发送给市民运动会平台的运动员数据。 +/// +public class CitizenSportsPlayerPreview +{ + public string TypeName { get; set; } = string.Empty; + public string PlayerId { get; set; } = string.Empty; + public string CardNumber { get; set; } = string.Empty; + public string CardType { get; set; } = string.Empty; + public string PlayerName { get; set; } = string.Empty; + public string? PlayerSex { get; set; } + public string? PlayerPhone { get; set; } + public string? PlayerBirth { get; set; } + public string? GroupName { get; set; } + public int DeleteStatus { get; set; } +} + public class CitizenSportsValidationError { public long RegistrationPersonId { get; set; } From 6d0babb4d238e9b077da54b506d0c3044f4a744f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E6=A2=93=E5=BD=AD?= Date: Thu, 29 Oct 2026 15:13:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=8A=A5=E5=90=8D=E6=95=B0=E6=8D=AE=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CitizenSports/CitizenSportsPlatformService.cs | 3 +-- .../CitizenSports/Dtos/CitizenSportsSyncDtos.cs | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/YD_Event.Application/CitizenSports/CitizenSportsPlatformService.cs b/YD_Event.Application/CitizenSports/CitizenSportsPlatformService.cs index 92feed0..12304eb 100644 --- a/YD_Event.Application/CitizenSports/CitizenSportsPlatformService.cs +++ b/YD_Event.Application/CitizenSports/CitizenSportsPlatformService.cs @@ -363,8 +363,7 @@ public sealed class CitizenSportsPlatformService : ITransient PlayerSex = player.PlayerSex, PlayerPhone = player.PlayerPhone, PlayerBirth = player.PlayerBirth, - GroupName = player.GroupName, - DeleteStatus = player.DeleteStatus + GroupName = player.GroupName })).ToList(), Errors = prepared.Errors }; diff --git a/YD_Event.Application/CitizenSports/Dtos/CitizenSportsSyncDtos.cs b/YD_Event.Application/CitizenSports/Dtos/CitizenSportsSyncDtos.cs index 0d77257..fd1f11c 100644 --- a/YD_Event.Application/CitizenSports/Dtos/CitizenSportsSyncDtos.cs +++ b/YD_Event.Application/CitizenSports/Dtos/CitizenSportsSyncDtos.cs @@ -8,7 +8,7 @@ namespace YD_Event.Application.CitizenSports.Dtos; public class CitizenSportsSyncInput { /// - /// 悦动系统赛事 ID。 + /// 跃动系统赛事 ID。 /// [Required] public long EventId { get; set; } @@ -73,7 +73,6 @@ public class CitizenSportsPlayerPreview public string? PlayerPhone { get; set; } public string? PlayerBirth { get; set; } public string? GroupName { get; set; } - public int DeleteStatus { get; set; } } public class CitizenSportsValidationError