diff --git a/YD_Event.Application/Client/Dtos/MyDtos.cs b/YD_Event.Application/Client/Dtos/MyDtos.cs index 406f843..4517b92 100644 --- a/YD_Event.Application/Client/Dtos/MyDtos.cs +++ b/YD_Event.Application/Client/Dtos/MyDtos.cs @@ -137,11 +137,6 @@ public class MyTeamDto /// public string Name { get; set; } - /// - /// 成立日期 - /// - public DateTime EstablishedDate { get; set; } - /// /// 队员数量 /// diff --git a/YD_Event.Application/Client/MyController.cs b/YD_Event.Application/Client/MyController.cs index e3deadb..c5067dc 100644 --- a/YD_Event.Application/Client/MyController.cs +++ b/YD_Event.Application/Client/MyController.cs @@ -177,7 +177,6 @@ public class MyController : IDynamicApiController { Id = t.Id, Name = t.Name, - EstablishedDate = t.EstablishedDate, IsLeader = true, MemberCount = 0 // 暂无 Member 表关联，置为 0 或需扩展 }); diff --git a/YD_Event.Application/Team/Dtos/TeamDtos.cs b/YD_Event.Application/Team/Dtos/TeamDtos.cs index 1bd56aa..ae29c6c 100644 --- a/YD_Event.Application/Team/Dtos/TeamDtos.cs +++ b/YD_Event.Application/Team/Dtos/TeamDtos.cs @@ -43,18 +43,6 @@ public class AddTeamInput [Required(ErrorMessage = "团队名称不能为空"), MaxLength(64)] public string Name { get; set; } = null!; - /// - /// 团队简介 - /// - [MaxLength(512)] - public string? Introduction { get; set; } - - /// - /// 成立时间 - /// - [Required(ErrorMessage = "成立时间不能为空")] - public DateTime EstablishedDate { get; set; } - /// /// 领队ID集合 /// @@ -98,16 +86,6 @@ public class TeamOutput /// public string Name { get; set; } = null!; - /// - /// 团队简介 - /// - public string? Introduction { get; set; } - - /// - /// 成立时间 - /// - public DateTime EstablishedDate { get; set; } - /// /// 状态 /// @@ -156,14 +134,14 @@ public class TeamMemberOutput public string Name { get; set; } = null!; /// - /// 角色 + /// 角色 (PersonType) /// - public TeamRole Role { get; set; } + public PersonType PersonType { get; set; } /// /// 角色描述 /// - public string RoleName => Role.Description(); + public string RoleName => PersonType.Description(); /// /// 联系电话 diff --git a/YD_Event.Application/Team/TeamService.cs b/YD_Event.Application/Team/TeamService.cs index 7531729..446f3a7 100644 --- a/YD_Event.Application/Team/TeamService.cs +++ b/YD_Event.Application/Team/TeamService.cs @@ -56,14 +56,14 @@ public class TeamService : BaseService, IDynamicApiControlle var teamIds = result.Rows.Select(x => x.Id).ToList(); var members = await _memberRep.AsQueryable() .LeftJoin((m, u) => m.UserId == u.Id) - .Where(m => teamIds.Contains(m.TeamId) && (m.Role == TeamRole.Leader || m.Role == TeamRole.Coach)) - .Select((m, u) => new { m.TeamId, m.Role, u.Name }) + .Where(m => teamIds.Contains(m.TeamId) && (m.PersonType == PersonType.Leader || m.PersonType == PersonType.Coach)) + .Select((m, u) => new { m.TeamId, m.PersonType, u.Name }) .ToListAsync(); foreach (var item in result.Rows) { - item.LeaderNames = string.Join(", ", members.Where(m => m.TeamId == item.Id && m.Role == TeamRole.Leader).Select(m => m.Name)); - item.CoachNames = string.Join(", ", members.Where(m => m.TeamId == item.Id && m.Role == TeamRole.Coach).Select(m => m.Name)); + item.LeaderNames = string.Join(", ", members.Where(m => m.TeamId == item.Id && m.PersonType == PersonType.Leader).Select(m => m.Name)); + item.CoachNames = string.Join(", ", members.Where(m => m.TeamId == item.Id && m.PersonType == PersonType.Coach).Select(m => m.Name)); } } @@ -92,7 +92,7 @@ public class TeamService : BaseService, IDynamicApiControlle UserId = m.UserId, Name = u.Name, Mobile = u.Mobile, - Role = m.Role + PersonType = m.PersonType }) .ToListAsync(); @@ -122,13 +122,13 @@ public class TeamService : BaseService, IDynamicApiControlle var members = new List(); if (input.LeaderIds != null) - members.AddRange(input.LeaderIds.Select(uid => new TeamMember { TeamId = newTeam.Id, UserId = uid, Role = TeamRole.Leader, JoinTime = DateTime.Now })); + members.AddRange(input.LeaderIds.Select(uid => new TeamMember { TeamId = newTeam.Id, UserId = uid, PersonType = PersonType.Leader, JoinTime = DateTime.Now })); if (input.CoachIds != null) - members.AddRange(input.CoachIds.Select(uid => new TeamMember { TeamId = newTeam.Id, UserId = uid, Role = TeamRole.Coach, JoinTime = DateTime.Now })); + members.AddRange(input.CoachIds.Select(uid => new TeamMember { TeamId = newTeam.Id, UserId = uid, PersonType = PersonType.Coach, JoinTime = DateTime.Now })); if (input.MemberIds != null) - members.AddRange(input.MemberIds.Select(uid => new TeamMember { TeamId = newTeam.Id, UserId = uid, Role = TeamRole.Member, JoinTime = DateTime.Now })); + members.AddRange(input.MemberIds.Select(uid => new TeamMember { TeamId = newTeam.Id, UserId = uid, PersonType = PersonType.Athlete, JoinTime = DateTime.Now })); if (members.Any()) { @@ -202,13 +202,13 @@ public class TeamService : BaseService, IDynamicApiControlle var members = new List(); if (input.LeaderIds != null) - members.AddRange(input.LeaderIds.Select(uid => new TeamMember { TeamId = team.Id, UserId = uid, Role = TeamRole.Leader, JoinTime = DateTime.Now })); + members.AddRange(input.LeaderIds.Select(uid => new TeamMember { TeamId = team.Id, UserId = uid, PersonType = PersonType.Leader, JoinTime = DateTime.Now })); if (input.CoachIds != null) - members.AddRange(input.CoachIds.Select(uid => new TeamMember { TeamId = team.Id, UserId = uid, Role = TeamRole.Coach, JoinTime = DateTime.Now })); + members.AddRange(input.CoachIds.Select(uid => new TeamMember { TeamId = team.Id, UserId = uid, PersonType = PersonType.Coach, JoinTime = DateTime.Now })); if (input.MemberIds != null) - members.AddRange(input.MemberIds.Select(uid => new TeamMember { TeamId = team.Id, UserId = uid, Role = TeamRole.Member, JoinTime = DateTime.Now })); + members.AddRange(input.MemberIds.Select(uid => new TeamMember { TeamId = team.Id, UserId = uid, PersonType = PersonType.Athlete, JoinTime = DateTime.Now })); if (members.Any()) { diff --git a/YD_Event.Application/YD_Event.Application.xml b/YD_Event.Application/YD_Event.Application.xml index 767d37b..36f89c6 100644 --- a/YD_Event.Application/YD_Event.Application.xml +++ b/YD_Event.Application/YD_Event.Application.xml @@ -2497,11 +2497,6 @@ 团队名称 - - - 成立日期 - - 队员数量 @@ -7919,16 +7914,6 @@ 团队名称 - - - 团队简介 - - - - - 成立时间 - - 领队ID集合 @@ -7969,16 +7954,6 @@ 团队名称 - - - 团队简介 - - - - - 成立时间 - - 状态 @@ -8024,9 +7999,9 @@ 姓名 - + - 角色 + 角色 (PersonType) diff --git a/YD_Event.Core/Entities/Team.cs b/YD_Event.Core/Entities/Team.cs index 1910f04..f056fd3 100644 --- a/YD_Event.Core/Entities/Team.cs +++ b/YD_Event.Core/Entities/Team.cs @@ -15,17 +15,6 @@ public class Team : Entity, ISoftDelete, ICreatedUserId, ICreatedTime, IUp [SugarColumn(Length = 64)] public string Name { get; set; } = null!; - /// - /// 团队简介 - /// - [SugarColumn(Length = 512, IsNullable = true)] - public string? Introduction { get; set; } - - /// - /// 成立时间 - /// - public DateTime EstablishedDate { get; set; } - /// /// 团队状态 /// diff --git a/YD_Event.Core/Entities/TeamMember.cs b/YD_Event.Core/Entities/TeamMember.cs index a8af39c..14399b7 100644 --- a/YD_Event.Core/Entities/TeamMember.cs +++ b/YD_Event.Core/Entities/TeamMember.cs @@ -20,9 +20,9 @@ public class TeamMember : Entity, ISoftDelete, ICreatedUserId, ICreatedTim public long UserId { get; set; } /// - /// 团队角色 + /// 团队角色 (PersonType) /// - public TeamRole Role { get; set; } + public PersonType PersonType { get; set; } /// /// 加入时间 diff --git a/YD_Event.Core/Enum/TeamRole.cs b/YD_Event.Core/Enum/TeamRole.cs deleted file mode 100644 index bf31940..0000000 --- a/YD_Event.Core/Enum/TeamRole.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.ComponentModel; - -namespace YD_Event.Core.Enum; - -/// -/// 团队角色 (请统一使用 PersonType: 1=运动员, 2=教练, 3=领队) -/// -public enum TeamRole -{ - /// - /// 队员 - /// - [Description("队员")] - Member = 0, - - /// - /// 领队 - /// - [Description("领队")] - Leader = 1, - - /// - /// 教练 - /// - [Description("教练")] - Coach = 2 -} diff --git a/YD_Event.Core/YD_Event.Core.xml b/YD_Event.Core/YD_Event.Core.xml index 13fb424..8567599 100644 --- a/YD_Event.Core/YD_Event.Core.xml +++ b/YD_Event.Core/YD_Event.Core.xml @@ -3770,16 +3770,6 @@ 团队名称 - - - 团队简介 - - - - - 成立时间 - - 团队状态 @@ -3825,9 +3815,9 @@ 用户ID（关联AppUser） - + - 团队角色 + 团队角色 (PersonType) @@ -4315,26 +4305,6 @@ 两者都有 - - - 团队角色 (请统一使用 PersonType: 1=运动员, 2=教练, 3=领队) - - - - - 队员 - - - - - 领队 - - - - - 教练 - - 参与单位类型