diff --git a/YD_Event.Application/Event/Dtos/ScoreDtos.cs b/YD_Event.Application/Event/Dtos/ScoreDtos.cs
index 70189c6..97864c0 100644
--- a/YD_Event.Application/Event/Dtos/ScoreDtos.cs
+++ b/YD_Event.Application/Event/Dtos/ScoreDtos.cs
@@ -140,13 +140,18 @@ public class CoachLeaderListOutput
///
/// 年龄
///
- public int Age { get; set; }
+ public int? Age { get; set; }
///
/// 性别
///
public string Gender { get; set; }
+ ///
+ /// 出生日期
+ ///
+ public DateTime? BirthDate { get; set; }
+
///
/// 身份证号
///
diff --git a/YD_Event.Application/Event/EventScoreService.cs b/YD_Event.Application/Event/EventScoreService.cs
index e21e3b0..225e274 100644
--- a/YD_Event.Application/Event/EventScoreService.cs
+++ b/YD_Event.Application/Event/EventScoreService.cs
@@ -10,6 +10,8 @@ using SqlSugar;
using OfficeOpenXml;
using OfficeOpenXml.Style;
using System.Drawing;
+using static SKIT.FlurlHttpClient.Wechat.TenpayV3.Models.DepositMarketingMemberCardOpenCardCodesResponse.Types;
+using YD_Event.Application.AppUser.Dtos;
namespace YD_Event.Application.Event;
@@ -180,13 +182,24 @@ public class EventScoreService : BaseService, ITransient
Id = p.Id,
Name = p.Name,
Age = p.Age,
- Gender = p.Gender.Description(),
- IdCardNumber = p.IdCard,
- Mobile = p.Phone,
+ IdCardNumber = p.IdCardImageUrl,
+ Mobile = p.Mobile,
CertificateId = 0 // 需要单独查询,此处先设为0
})
.ToPagedListAsync(input);
+ foreach (var item in pageResult.Rows)
+ {
+ if (item.Age.HasValue)
+ {
+ continue;
+ }
+ if (item.BirthDate.HasValue)
+ {
+ item.Age = MemberOutput.CalculateAgeFromBirthDate(item.BirthDate);
+ }
+ }
+
return pageResult;
}