返回当前领取人信息
parent
7cc48b9342
commit
5fc78db5f7
|
@ -150,6 +150,10 @@ namespace IRaCIS.Core.Application.Contracts.DTO
|
|||
|
||||
public class QCChallengeWithUser : QCChallengeCommand
|
||||
{
|
||||
public Guid? CurrentActionUserId { get; set; }
|
||||
|
||||
public string CurrentActionUserName { get; set; } = String.Empty;
|
||||
|
||||
public Guid SubjectId { get; set; }
|
||||
public UserTypeEnum UserTypeEnum { get; set; }
|
||||
public Guid CreateUserId { get; set; }
|
||||
|
|
|
@ -1270,7 +1270,7 @@ namespace IRaCIS.Core.Application.Image.QA
|
|||
{
|
||||
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)
|
||||
{
|
||||
|
|
|
@ -195,6 +195,8 @@ namespace IRaCIS.Core.Application.Service
|
|||
CreateMap<QCChallenge, QCChallengeWithUser>()
|
||||
.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.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.ChallengeCode, u => u.MapFrom(s => "Q" + s.ChallengeCode.ToString("D5")));
|
||||
|
|
Loading…
Reference in New Issue