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

返回当前领取人信息

Uat_Study
hang 2022-04-29 16:18:48 +08:00
parent 7cc48b9342
commit 5fc78db5f7
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@ namespace IRaCIS.Core.Application.Contracts.DTO
public class VisitQACommand public class VisitQACommand
{ {
public QCChallengeCommand QARecord { get; set; }=new QCChallengeCommand(); public QCChallengeCommand QARecord { get; set; } = new QCChallengeCommand();
public List<QARecordTrialTemplateItemCommand> QATrialTemplateItemList { get; set; } = new List<QARecordTrialTemplateItemCommand>(); public List<QARecordTrialTemplateItemCommand> QATrialTemplateItemList { get; set; } = new List<QARecordTrialTemplateItemCommand>();
} }
@ -150,6 +150,10 @@ namespace IRaCIS.Core.Application.Contracts.DTO
public class QCChallengeWithUser : QCChallengeCommand public class QCChallengeWithUser : QCChallengeCommand
{ {
public Guid? CurrentActionUserId { get; set; }
public string CurrentActionUserName { get; set; } = String.Empty;
public Guid SubjectId { get; set; } public Guid SubjectId { get; set; }
public UserTypeEnum UserTypeEnum { get; set; } public UserTypeEnum UserTypeEnum { get; set; }
public Guid CreateUserId { get; set; } public Guid CreateUserId { get; set; }
@ -431,7 +435,7 @@ namespace IRaCIS.Core.Application.Contracts.DTO
/// </summary> /// </summary>
public class CloseCheckChallengeDto public class CloseCheckChallengeDto
{ {
public Guid subjectVisitId { get; set; } public Guid subjectVisitId { get; set; }
public string CloseCheckChallenge { get; set; } public string CloseCheckChallenge { get; set; }
} }

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

@ -1270,7 +1270,7 @@ namespace IRaCIS.Core.Application.Image.QA
{ {
var sv = dbSubjectVisitList[0]; var sv = dbSubjectVisitList[0];
var existObj = await _subjectVisitRepository.FirstOrDefaultAsync(t => t.SubmitState != SubmitStateEnum.Submitted && t.VisitNum < sv.VisitNum); var existObj = await _subjectVisitRepository.FirstOrDefaultAsync(t => t.SubjectId==sv.SubjectId && t.SubmitState != SubmitStateEnum.Submitted && t.VisitNum < sv.VisitNum);
if (sv.PDState == PDStateEnum.PDProgress) if (sv.PDState == PDStateEnum.PDProgress)
{ {

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

@ -195,6 +195,8 @@ namespace IRaCIS.Core.Application.Service
CreateMap<QCChallenge, QCChallengeWithUser>() CreateMap<QCChallenge, QCChallengeWithUser>()
.ForMember(d => d.LatestReplyUserName, u => u.MapFrom(t => t.LatestReplyUser.UserName)) .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.CreateUserName, u => u.MapFrom(t => t.CreateUser.UserName))
.ForMember(d => d.CurrentActionUserId, u => u.MapFrom(t => t.SubjectVisit.CurrentActionUserId))
.ForMember(d => d.CreateUserName, u => u.MapFrom(t => t.SubjectVisit.CurrentActionUser.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")));