diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs index e1e0d223b..3680d34fd 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs @@ -205,7 +205,7 @@ namespace IRaCIS.Core.Application.Contracts public DateTime? ClosedTime { get; set; } - public string PreliminaryAuditUserName { get; set; } + public string PreliminaryAuditUserName { get; set; } = String.Empty; //public string ClosedUserUserName { get; set; } = String.Empty; diff --git a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs index 6e37f70da..4020954e4 100644 --- a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs @@ -213,7 +213,7 @@ namespace IRaCIS.Core.Application.Service .ForMember(d => d.BlindName, u => u.MapFrom(s => s.SubjectVisit.BlindName)) //.ForMember(d => d.ClosedUserUserName, u => u.MapFrom(s => s.ClosedUser.UserName)) .ForMember(d => d.IsQCConfirmedReupload, u => u.MapFrom(s => s.SubjectVisit.IsQCConfirmedReupload)) - .ForMember(d => d.CreateUserName, u => u.MapFrom(s => s.Creator.UserName)) + .ForMember(d => d.CreateUserName, u => u.MapFrom(s => s.CreateUser.UserName)) .ForMember(d => d.LatestReplyUserName, u => u.MapFrom(t => t.LatestReplyUser.UserName)) .ForMember(d => d.ChallengeCode, u => u.MapFrom(s => "Q" + s.ChallengeCode.ToString("D5"))); //排序的时候有坑 把这个带到sql 中去了 //.AfterMap((src, dest) => dest.ChallengeCode = "Q" + src.ChallengeCode.ToString("D5"));//实测没有效果 diff --git a/IRaCIS.Core.Domain/QC/QCChallenge.cs b/IRaCIS.Core.Domain/QC/QCChallenge.cs index 932bf7225..5db073a84 100644 --- a/IRaCIS.Core.Domain/QC/QCChallenge.cs +++ b/IRaCIS.Core.Domain/QC/QCChallenge.cs @@ -8,10 +8,10 @@ namespace IRaCIS.Core.Domain.Models public class QCChallenge : Entity, IAuditAdd { [ForeignKey("CreateUserId")] - public User Creator { get; set; } + + public User CreateUser { get; set; } + - //[ForeignKey("CreateUserId")] - //public User Replyer { get; set; } public Guid TrialId { get; set; } public Guid SubjectVisitId { get; set; } @@ -20,8 +20,6 @@ namespace IRaCIS.Core.Domain.Models public string Note { get; set; } = string.Empty; - //public bool NeedReUpload { get; set; } = false; - //public bool IsReuploaded { get; set; } = false; public QCChanllengeReuploadEnum ReuploadEnum { get; set; } @@ -30,7 +28,6 @@ namespace IRaCIS.Core.Domain.Models public DateTime CreateTime { get; set; } = DateTime.Now; public Guid CreateUserId { get; set; } = Guid.Empty; - public User CreateUser { get; set; } public DateTime? ReUploadedTime { get; set; } public string ReUploader { get; set; } = string.Empty;