修改映射
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
hang 2024-12-25 14:21:16 +08:00
parent 3ff0230fc1
commit 1d4eedf5bb
4 changed files with 8 additions and 4 deletions

View File

@ -212,6 +212,8 @@ namespace IRaCIS.Application.Contracts
{
public Guid Id { get; set; }
public string UserTypeShortName { get; set; }
public bool IsDeleted { get; set; }
public DateTime CreateTime { get; set; }
@ -388,8 +390,6 @@ namespace IRaCIS.Application.Contracts
public Guid TrialSiteId { get; set; }
//public int? UserCount { get; set; }
public string TrialSiteCode { get; set; } = String.Empty;
public string TrialSiteName { get; set; } = String.Empty;

View File

@ -58,6 +58,7 @@ namespace IRaCIS.Core.Application.Service
TrialUserRoleList = t.TrialUserRoleList.Select(ur => new TrialIdentityUserRoleDto()
{
Id = ur.Id,
UserTypeShortName=ur.UserRole.UserTypeRole.UserTypeShortName,
IsDeleted = ur.IsDeleted,
CreateTime = ur.CreateTime,
UpdateTime = ur.UpdateTime

View File

@ -59,11 +59,11 @@ namespace IRaCIS.Core.Application.Service
CreateMap<TrialUserRole, TrialIdentityUserRoleDto>();
CreateMap<TrialSiteUserRole, TrialSiteCRCListDTO>()
CreateMap<TrialSiteUserRole, TrialSiteCRCListDTO>().IncludeMembers(t=>t.UserRole.IdentityUser)
.ForMember(t => t.IdentityUserId, u => u.MapFrom(c => c.UserRole.IdentityUserId))
.ForMember(t => t.UserType, u => u.MapFrom(c => c.UserRole.UserTypeRole.UserTypeShortName));
CreateMap<IdentityUser, TrialSiteCRCListDTO>();

View File

@ -159,6 +159,7 @@ namespace IRaCIS.Core.Application.Service
/// <returns></returns>
public async Task<IResponseOutput> UserMutiAccount([FromServices] IRepository<IdentityUser> _identityUserRepository)
{
_userInfo.IsNotNeedInspection = true;
var userList = _userRoleRepository.Where().ToList();
@ -189,6 +190,8 @@ namespace IRaCIS.Core.Application.Service
/// <returns></returns>
public async Task<IResponseOutput> UserTrialUser([FromServices] IRepository<TrialIdentityUser> _trialIdentityUserRepository, [FromServices] IRepository<TrialUserRole> _trialUserRoleReposiotry)
{
_userInfo.IsNotNeedInspection = true;
var list = _trialUserRoleReposiotry.Where().Select(t => new { t.TrialId, t.UserRole.IdentityUserId, t.UserId, t.JoinTime, t.RemoveTime }).ToList();