diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs index d34b8a8ff..ca5cda657 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs @@ -157,13 +157,13 @@ namespace IRaCIS.Core.Application.Contracts.DTO public DateTime? LatestMsgTime { get; set; } - public string LatestReplyUser { get; set; } = String.Empty; + public string LatestReplyUserName { get; set; } = String.Empty; public DateTime? ClosedTime { get; set; } public bool IsClosed { get; set; } public DateTime? ReUploadedTime { get; set; } - public string CreateUser { get; set; } = String.Empty; + public string CreateUserName { get; set; } = String.Empty; public DateTime CreateTime { get; set; } public bool IsOverTime => IsClosed ? ClosedTime > DeadlineTime : DateTime.Now > DeadlineTime; @@ -454,7 +454,8 @@ namespace IRaCIS.Core.Application.Contracts.DTO public Guid CreateUserId { get; set; } - public string CreateUser { get; set; } = String.Empty; + public string CreateUserName { get; set; } = String.Empty; + public string CreateUserFullName { get; set; } = String.Empty; public bool IsCurrentUser { get; set; } diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index d7e752a9a..c1ed6db40 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -114,7 +114,6 @@ namespace IRaCIS.Core.Application.Image.QA qcChallenge.QCProcessEnum = trialConfig.QCProcessEnum; qcChallenge.CurrentQCEnum = currentQCType; qcChallenge.TrialId = trialId; - qcChallenge.CreateUser = _userInfo.RealName; qcChallenge.ChallengeCode = code + 1; qcChallenge.UserTypeEnum = (UserTypeEnum)_userInfo.UserTypeEnumInt; @@ -255,7 +254,6 @@ namespace IRaCIS.Core.Application.Image.QA await _repository.AddAsync(qaReply); - qaReply.CreateUser = _userInfo.RealName; qaReply.UserTypeEnum = (UserTypeEnum)_userInfo.UserTypeEnumInt; var dbQCChallenge = await _repository.FirstOrDefaultAsync(t => t.Id == qaDialogCommand.QCChallengeId); diff --git a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs index 5c6c9f61e..6e37f70da 100644 --- a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs @@ -184,10 +184,15 @@ namespace IRaCIS.Core.Application.Service //QC 质疑对话 var currentUserId = Guid.Empty; CreateMap() + .ForMember(d => d.CreateUserName, u => u.MapFrom(t => t.CreateUser.UserName)) + .ForMember(d => d.CreateUserFullName, u => u.MapFrom(t => t.CreateUser.FullName)) + .ForMember(d => d.IsCurrentUser, u => u.MapFrom(s => s.CreateUserId == currentUserId)); //质疑编号 CreateMap() - .ForMember(d => d.LatestReplyUser, u => u.MapFrom(t => t.LatestReplyUser.LastName + t.Creator.FirstName)) + .ForMember(d => d.LatestReplyUserName, u => u.MapFrom(t => t.LatestReplyUser.UserName)) + .ForMember(d => d.CreateUserName, u => u.MapFrom(t => t.CreateUser.UserName)) + .ForMember(d => d.SubjectId, u => u.MapFrom(t => t.SubjectVisit.SubjectId )) .ForMember(d => d.ChallengeCode, u => u.MapFrom(s => "Q" + s.ChallengeCode.ToString("D5"))); diff --git a/IRaCIS.Core.Domain/QC/QCChallenge.cs b/IRaCIS.Core.Domain/QC/QCChallenge.cs index d74ebd50a..932bf7225 100644 --- a/IRaCIS.Core.Domain/QC/QCChallenge.cs +++ b/IRaCIS.Core.Domain/QC/QCChallenge.cs @@ -30,7 +30,7 @@ namespace IRaCIS.Core.Domain.Models public DateTime CreateTime { get; set; } = DateTime.Now; public Guid CreateUserId { get; set; } = Guid.Empty; - public string CreateUser { get; set; } = string.Empty; + public User CreateUser { get; set; } public DateTime? ReUploadedTime { get; set; } public string ReUploader { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/QC/QCChallengeDialog.cs b/IRaCIS.Core.Domain/QC/QCChallengeDialog.cs index 7243019f6..3eeb10a5d 100644 --- a/IRaCIS.Core.Domain/QC/QCChallengeDialog.cs +++ b/IRaCIS.Core.Domain/QC/QCChallengeDialog.cs @@ -3,7 +3,7 @@ using System; namespace IRaCIS.Core.Domain.Models { - public class QCChallengeDialog : Entity, IAuditAddWithUserName + public class QCChallengeDialog : Entity, IAuditAdd { public QCChallenge QCChallenge { get; set; } public string TalkContent { get; set; } = string.Empty; @@ -13,9 +13,11 @@ namespace IRaCIS.Core.Domain.Models public Guid SubjectVisitId { get; set; } - //public bool HasReply { get; set; } = false; - public string CreateUser { get; set; } + + public User CreateUser { get; set; } + + public DateTime CreateTime { get; set; } = DateTime.Now; public Guid CreateUserId { get; set; } = Guid.Empty;