From c96e7a63b378ee6a77af74319157720de1ef8dcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E6=A2=93=E5=BD=AD?= <tianbohe0@163.com>
Date: Tue, 31 Mar 2026 18:54:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=9B=E4=BA=8B=E7=AE=A1=E7=90=86=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=80=A7=E5=88=AB=E5=92=8C=E5=B9=B4=E9=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Client/Dtos/EventClientDtos.cs            |  5 ++++
 .../Client/EventClientController.cs           | 23 +++++++++++++++++++
 YD_Event.Application/Team/Dtos/TeamDtos.cs    | 10 ++++++++
 YD_Event.Application/Team/TeamService.cs      |  4 +++-
 YD_Event.Application/YD_Event.Application.xml | 15 ++++++++++++
 5 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/YD_Event.Application/Client/Dtos/EventClientDtos.cs b/YD_Event.Application/Client/Dtos/EventClientDtos.cs
index 9b817ed..5c9b29c 100644
--- a/YD_Event.Application/Client/Dtos/EventClientDtos.cs
+++ b/YD_Event.Application/Client/Dtos/EventClientDtos.cs
@@ -180,6 +180,11 @@ public class EventDetailDto : EventListDto
     /// 项目列表
     /// </summary>
     public List<EventProjectDto> Projects { get; set; }
+
+    /// <summary>
+    /// 上级项目类型名称
+    /// </summary>
+    public string? ParentProjectTypeName { get; set; }
 }
 
 /// <summary>
diff --git a/YD_Event.Application/Client/EventClientController.cs b/YD_Event.Application/Client/EventClientController.cs
index 4a1816e..c4eb00a 100644
--- a/YD_Event.Application/Client/EventClientController.cs
+++ b/YD_Event.Application/Client/EventClientController.cs
@@ -26,6 +26,7 @@ public class EventClientController : IDynamicApiController
     private readonly ISqlSugarRepository<EventUnit> _unitRepository;
     private readonly ISqlSugarRepository<EventRegistrationPerson> _personRepository;
     private readonly ISqlSugarRepository<EventRegistrationLimit> _limitRepository;
+    private readonly ISqlSugarRepository<ProjectType> _projectTypeRepository;
     private readonly IHttpContextAccessor _httpContextAccessor;
     private readonly IIdGenerator _idGenerator;
 
@@ -40,6 +41,7 @@ public class EventClientController : IDynamicApiController
         ISqlSugarRepository<EventUnit> unitRepository,
         ISqlSugarRepository<EventRegistrationPerson> personRepository,
         ISqlSugarRepository<EventRegistrationLimit> limitRepository,
+        ISqlSugarRepository<ProjectType> projectTypeRepository,
         IHttpContextAccessor httpContextAccessor,
         IIdGenerator idGenerator)
     {
@@ -53,6 +55,7 @@ public class EventClientController : IDynamicApiController
         _unitRepository = unitRepository;
         _personRepository = personRepository;
         _limitRepository = limitRepository;
+        _projectTypeRepository = projectTypeRepository;
         _httpContextAccessor = httpContextAccessor;
         _idGenerator = idGenerator;
     }
@@ -179,6 +182,7 @@ public class EventClientController : IDynamicApiController
             .Select((p, t) => new { 
                 p.Id, 
                 p.Name, 
+                ProjectTypeId = t.Id,
                 TypeName = t.Name 
             })
             .ToListAsync();
@@ -186,6 +190,24 @@ public class EventClientController : IDynamicApiController
         var groups = await _groupRepository.AsQueryable()
             .Where(g => projectIds.Contains(g.ProjectId) && !g.DeleteMark)
             .ToListAsync();
+        
+        // 获取所有项目类型
+        var allProjectTypes = await _projectTypeRepository.AsQueryable()
+            .Where(t => !t.DeleteMark && t.Status == AvailabilityStatus.Enable)
+            .ToListAsync();
+        
+        // 获取上级项目类型名称（如果有项目，取第一个项目的上级类型名称）
+        string? parentProjectTypeName = null;
+        if (baseProjects.Any())
+        {
+            var firstProject = baseProjects.First();
+            var currentProjectType = allProjectTypes.FirstOrDefault(t => t.Id == firstProject.ProjectTypeId);
+            if (currentProjectType != null && currentProjectType.ParentId > 0)
+            {
+                var parentProjectType = allProjectTypes.FirstOrDefault(t => t.Id == currentProjectType.ParentId);
+                parentProjectTypeName = parentProjectType?.Name;
+            }
+        }
 
         // 获取单位
         var units = await _unitRepository.AsQueryable()
@@ -221,6 +243,7 @@ public class EventClientController : IDynamicApiController
             
             IndividualProjectLimit = limit?.IndividualProjectLimit ?? 0,
             TeamProjectLimit = limit?.TeamProjectLimit ?? 0,
+            ParentProjectTypeName = parentProjectTypeName,
             
             Units = units.Select(u => new EventUnitDto 
             {
diff --git a/YD_Event.Application/Team/Dtos/TeamDtos.cs b/YD_Event.Application/Team/Dtos/TeamDtos.cs
index ae29c6c..77e4da5 100644
--- a/YD_Event.Application/Team/Dtos/TeamDtos.cs
+++ b/YD_Event.Application/Team/Dtos/TeamDtos.cs
@@ -147,4 +147,14 @@ public class TeamMemberOutput
     /// 联系电话
     /// </summary>
     public string? Mobile { get; set; }
+
+    /// <summary>
+    /// 性别
+    /// </summary>
+    public Gender Gender { get; set; }
+
+    /// <summary>
+    /// 出生日期
+    /// </summary>
+    public DateTime? BirthDate { get; set; }
 }
diff --git a/YD_Event.Application/Team/TeamService.cs b/YD_Event.Application/Team/TeamService.cs
index 446f3a7..c92a2e0 100644
--- a/YD_Event.Application/Team/TeamService.cs
+++ b/YD_Event.Application/Team/TeamService.cs
@@ -92,7 +92,9 @@ public class TeamService : BaseService<Core.Entities.Team>, IDynamicApiControlle
                 UserId = m.UserId,
                 Name = u.Name,
                 Mobile = u.Mobile,
-                PersonType = m.PersonType
+                PersonType = m.PersonType,
+                Gender = u.Gender,
+                BirthDate = u.BirthDate
             })
             .ToListAsync();
 
diff --git a/YD_Event.Application/YD_Event.Application.xml b/YD_Event.Application/YD_Event.Application.xml
index eabde81..310114b 100644
--- a/YD_Event.Application/YD_Event.Application.xml
+++ b/YD_Event.Application/YD_Event.Application.xml
@@ -1665,6 +1665,11 @@
             项目列表
             </summary>
         </member>
+        <member name="P:YD_Event.Application.Client.Dtos.EventDetailDto.ParentProjectTypeName">
+            <summary>
+            上级项目类型名称
+            </summary>
+        </member>
         <member name="T:YD_Event.Application.Client.Dtos.EventProjectDto">
             <summary>
             赛事项目DTO
@@ -8254,6 +8259,16 @@
             联系电话
             </summary>
         </member>
+        <member name="P:YD_Event.Application.Team.Dtos.TeamMemberOutput.Gender">
+            <summary>
+            性别
+            </summary>
+        </member>
+        <member name="P:YD_Event.Application.Team.Dtos.TeamMemberOutput.BirthDate">
+            <summary>
+            出生日期
+            </summary>
+        </member>
         <member name="T:YD_Event.Application.Team.TeamService">
             <summary>
             团队管理服务