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

xxxx

Uat_Study
hang 2022-04-28 11:50:39 +08:00
parent 329b028e37
commit d974c32050
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs
View File

@ -157,13 +157,13 @@ namespace IRaCIS.Core.Application.Contracts.DTO
public DateTime? LatestMsgTime { get; set; } 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 DateTime? ClosedTime { get; set; }
public bool IsClosed { get; set; } public bool IsClosed { get; set; }
public DateTime? ReUploadedTime { 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 DateTime CreateTime { get; set; }
public bool IsOverTime => IsClosed ? ClosedTime > DeadlineTime : DateTime.Now > DeadlineTime; 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 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; } public bool IsCurrentUser { get; set; }

2
IRaCIS.Core.Application/Service/QC/QCOperationService.cs
View File

@ -114,7 +114,6 @@ namespace IRaCIS.Core.Application.Image.QA
qcChallenge.QCProcessEnum = trialConfig.QCProcessEnum; qcChallenge.QCProcessEnum = trialConfig.QCProcessEnum;
qcChallenge.CurrentQCEnum = currentQCType; qcChallenge.CurrentQCEnum = currentQCType;
qcChallenge.TrialId = trialId; qcChallenge.TrialId = trialId;
qcChallenge.CreateUser = _userInfo.RealName;
qcChallenge.ChallengeCode = code + 1; qcChallenge.ChallengeCode = code + 1;
qcChallenge.UserTypeEnum = (UserTypeEnum)_userInfo.UserTypeEnumInt; qcChallenge.UserTypeEnum = (UserTypeEnum)_userInfo.UserTypeEnumInt;
@ -255,7 +254,6 @@ namespace IRaCIS.Core.Application.Image.QA
await _repository.AddAsync(qaReply); await _repository.AddAsync(qaReply);
qaReply.CreateUser = _userInfo.RealName;
qaReply.UserTypeEnum = (UserTypeEnum)_userInfo.UserTypeEnumInt; qaReply.UserTypeEnum = (UserTypeEnum)_userInfo.UserTypeEnumInt;
var dbQCChallenge = await _repository.FirstOrDefaultAsync<QCChallenge>(t => t.Id == qaDialogCommand.QCChallengeId); var dbQCChallenge = await _repository.FirstOrDefaultAsync<QCChallenge>(t => t.Id == qaDialogCommand.QCChallengeId);

7
IRaCIS.Core.Application/Service/QC/_MapConfig.cs
View File

@ -184,10 +184,15 @@ namespace IRaCIS.Core.Application.Service
//QC 质疑对话 //QC 质疑对话
var currentUserId = Guid.Empty; var currentUserId = Guid.Empty;
CreateMap<QCChallengeDialog, QCChanllengeDialogDTO>() CreateMap<QCChallengeDialog, QCChanllengeDialogDTO>()
.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)); .ForMember(d => d.IsCurrentUser, u => u.MapFrom(s => s.CreateUserId == currentUserId));
//质疑编号 //质疑编号
CreateMap<QCChallenge, QCChallengeWithUser>() CreateMap<QCChallenge, QCChallengeWithUser>()
.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.SubjectId, u => u.MapFrom(t => t.SubjectVisit.SubjectId ))
.ForMember(d => d.ChallengeCode, u => u.MapFrom(s => "Q" + s.ChallengeCode.ToString("D5"))); .ForMember(d => d.ChallengeCode, u => u.MapFrom(s => "Q" + s.ChallengeCode.ToString("D5")));

2
IRaCIS.Core.Domain/QC/QCChallenge.cs
View File

@ -30,7 +30,7 @@ namespace IRaCIS.Core.Domain.Models
public DateTime CreateTime { get; set; } = DateTime.Now; public DateTime CreateTime { get; set; } = DateTime.Now;
public Guid CreateUserId { get; set; } = Guid.Empty; 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 DateTime? ReUploadedTime { get; set; }
public string ReUploader { get; set; } = string.Empty; public string ReUploader { get; set; } = string.Empty;

8
IRaCIS.Core.Domain/QC/QCChallengeDialog.cs
View File

@ -3,7 +3,7 @@ using System;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models
{ {
public class QCChallengeDialog : Entity, IAuditAddWithUserName public class QCChallengeDialog : Entity, IAuditAdd
{ {
public QCChallenge QCChallenge { get; set; } public QCChallenge QCChallenge { get; set; }
public string TalkContent { get; set; } = string.Empty; public string TalkContent { get; set; } = string.Empty;
@ -13,9 +13,11 @@ namespace IRaCIS.Core.Domain.Models
public Guid SubjectVisitId { get; set; } 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 DateTime CreateTime { get; set; } = DateTime.Now;
public Guid CreateUserId { get; set; } = Guid.Empty; public Guid CreateUserId { get; set; } = Guid.Empty;