XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化导航属性
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-09-10 23:59:18 +08:00
parent 510a35e2b4
commit 8678c3602f
5 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
View File

@ -67,7 +67,7 @@ namespace IRaCIS.Application.Services
.WhereIf(inQuery.UserTypeId != null, t => t.User.UserTypeId == inQuery.UserTypeId)
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserRealName), t => (t.User.FullName).Contains(inQuery.UserRealName))
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.OrganizationName), t => t.User.OrganizationName.Contains(inQuery.OrganizationName))
.ProjectTo<AssginSiteCRCListDTO>(_mapper.ConfigurationProvider, new { trialSiteId = inQuery.TrialSiteId });
.ProjectTo<AssginSiteCRCListDTO>(_mapper.ConfigurationProvider);
return await query.ToPagedListAsync(inQuery);

2
IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
View File

@ -98,7 +98,7 @@ namespace IRaCIS.Core.Application.Service
.ForMember(d => d.UserRealName, u => u.MapFrom(s => s.User.FullName))
.ForMember(d => d.TrialSiteId, u => u.MapFrom(t => trialSiteId))
.ForMember(d => d.UserType, u => u.MapFrom(t => t.User.UserTypeRole.UserTypeShortName))
.ForMember(d => d.IsSelect, u => u.MapFrom(t => t.SiteList.Any(k => k.TrialSiteId == trialSiteId)));
.ForMember(d => d.IsSelect, u => u.MapFrom(t => t.Trial.TrialSiteUserList.Any(k => k.UserId == t.UserId)));
CreateMap<User, AssginSiteCRCListDTO>();
var trialId = Guid.Empty;

3
IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs
View File

@ -27,8 +27,7 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public TrialSite TrialSite { get; set; }
[JsonIgnore]
public TrialUser TrialUser { get; set; }
#endregion
public Guid TrialSiteId { get; set; }

3
IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs
View File

@ -17,9 +17,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
[ForeignKey("UserId")]
public User User { get; set; }
[JsonIgnore]
public List<TrialSiteUser> SiteList { get; set; }
#endregion
public Guid UserId { get; set; }
public Guid TrialId { get; set; }

12
IRaCIS.Core.Infra.EFCore/EntityConfigration/TrialUserConfigration.cs
View File

@ -6,18 +6,6 @@ namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
{
public class TrialUserConfigration : IEntityTypeConfiguration<TrialUser>
{
public void Configure(EntityTypeBuilder<TrialUser> builder)
{
builder
.HasMany(s => s.SiteList)
.WithOne(c => c.TrialUser)
.HasForeignKey(s => new { s.TrialId, s.UserId })
.HasPrincipalKey(c => new { c.TrialId, c.UserId });
}
}
public class SubjectCriteriaEvaluationConfigration : IEntityTypeConfiguration<SubjectCriteriaEvaluation>
{