Compare commits
No commits in common. "9b94ad70eef18b7c0baddbbe10a2a953d2d37bf0" and "b203c891a483817c32d2d7c0752c2511d80ec691" have entirely different histories.
9b94ad70ee
...
b203c891a4
|
|
@ -38,8 +38,6 @@ namespace IRaCIS.Application.Contracts
|
||||||
public DateTime? DeletedTime { get; set; }
|
public DateTime? DeletedTime { get; set; }
|
||||||
public DateTime UpdateTime { get; set; }
|
public DateTime UpdateTime { get; set; }
|
||||||
public DateTime CreateTime { get; set; }
|
public DateTime CreateTime { get; set; }
|
||||||
|
|
||||||
public Guid TrialSiteId { get; set; }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class UserTrialDTO : UserTrialCommand
|
public class UserTrialDTO : UserTrialCommand
|
||||||
|
|
|
||||||
|
|
@ -27,14 +27,7 @@ namespace IRaCIS.Core.Application.Services
|
||||||
var query = _trialSiteUserRoleRepository.Where(t => t.TrialId == trialId && t.TrialSiteId == siteId).IgnoreQueryFilters()
|
var query = _trialSiteUserRoleRepository.Where(t => t.TrialId == trialId && t.TrialSiteId == siteId).IgnoreQueryFilters()
|
||||||
.ProjectTo<TrialSiteCRCListDTO>(_mapper.ConfigurationProvider);
|
.ProjectTo<TrialSiteCRCListDTO>(_mapper.ConfigurationProvider);
|
||||||
|
|
||||||
var list = await query.ToListAsync();
|
return await query.ToListAsync();
|
||||||
|
|
||||||
foreach (var item in list)
|
|
||||||
{
|
|
||||||
item.TrialSiteId = siteId;
|
|
||||||
}
|
|
||||||
|
|
||||||
return list;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -92,13 +92,13 @@ namespace IRaCIS.Core.Application.Service
|
||||||
CreateMap<UserRole, TrialMaintenanceDTO>();
|
CreateMap<UserRole, TrialMaintenanceDTO>();
|
||||||
|
|
||||||
var trialSiteId = Guid.Empty;
|
var trialSiteId = Guid.Empty;
|
||||||
CreateMap<TrialUserRole, AssginSiteCRCListDTO>().IncludeMembers(t => t.UserRole.IdentityUser)
|
CreateMap<TrialUserRole, AssginSiteCRCListDTO>().IncludeMembers(t => t.UserRole)
|
||||||
.ForMember(d => d.UserRealName, u => u.MapFrom(s => s.UserRole.IdentityUser.FullName))
|
.ForMember(d => d.UserRealName, u => u.MapFrom(s => s.UserRole.FullName))
|
||||||
.ForMember(d => d.TrialSiteId, u => u.MapFrom(t => trialSiteId))
|
.ForMember(d => d.TrialSiteId, u => u.MapFrom(t => trialSiteId))
|
||||||
.ForMember(d => d.UserType, u => u.MapFrom(t => t.UserRole.UserTypeRole.UserTypeShortName))
|
.ForMember(d => d.UserType, u => u.MapFrom(t => t.UserRole.UserTypeRole.UserTypeShortName))
|
||||||
.ForMember(d => d.IsSelect, u => u.MapFrom(t => t.Trial.TrialSiteUserList.Any(k => k.UserId == t.UserId && k.TrialSiteId== trialSiteId)));
|
.ForMember(d => d.IsSelect, u => u.MapFrom(t => t.Trial.TrialSiteUserList.Any(k => k.UserId == t.UserId && k.TrialSiteId== trialSiteId)));
|
||||||
|
|
||||||
CreateMap<IdentityUser, AssginSiteCRCListDTO>();
|
CreateMap<UserRole, AssginSiteCRCListDTO>();
|
||||||
|
|
||||||
var trialId = Guid.Empty;
|
var trialId = Guid.Empty;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue