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

xxx

Uat_Study
hang 2022-04-29 10:03:50 +08:00
parent 04b98e6e72
commit 61df8db461
3 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
IRaCIS.Core.Application/Service/Management/DTO/SystemNoticeViewModel.cs
View File

@ -32,6 +32,22 @@ namespace IRaCIS.Core.Application.ViewModel
public string FullFilePath { get; set; }
public SystemNotice_NoticeStateEnum ActualNoticeStateEnum
{
get
{
if (NoticeStateEnum == SystemNotice_NoticeStateEnum.HavePublished && EndDate != null && EndDate < DateTime.Now)
{
return SystemNotice_NoticeStateEnum.HaveExpired;
}
else
{
return NoticeStateEnum;
}
}
}
public List<UserTypeSimpleDTO> NoticeUserTypeList { get; set; }
}

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

@ -1415,7 +1415,7 @@ namespace IRaCIS.Core.Application.Image.QA
[TypeFilter(typeof(TrialResourceFilter))]
public async Task<IResponseOutput> QCPassedOrFailed(Guid trialId, Guid subjectVisitId, [FromRoute] AuditStateEnum auditState)
{
var aa = _userInfo.RequestUrl;
if (!await _repository.AnyAsync<TrialUser>(t => t.TrialId == trialId && t.UserId == _userInfo.Id))
{
@ -1434,9 +1434,9 @@ namespace IRaCIS.Core.Application.Image.QA
.FirstOrDefaultAsync(t => t.TrialId == trialId)
.IfNullThrowException();
var dbSubjectVisit = await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId);
var dbSubjectVisit = (await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId)).IfNullThrowException();
if (dbSubjectVisit == null) return Null404NotFound(dbSubjectVisit);
//有人QC Passed
if (auditState == AuditStateEnum.QCPassed)

17
IRaCIS.Core.Domain.Share/AuthUser/UserInfo.cs
View File

@ -1,4 +1,5 @@
using System;
using System.Linq;
using IRaCIS.Core.Domain.Share;
using Microsoft.AspNetCore.Http;
@ -204,7 +205,21 @@ namespace IRaCIS.Core.Domain.Share
get
{
return _accessor?.HttpContext?.Request?.Path;
var url = _accessor?.HttpContext?.Request?.Path.ToString();
var list = url.Split('/').Where(t=>!string.IsNullOrWhiteSpace(t)). ToList();
if (url.Contains("Inspection", StringComparison.OrdinalIgnoreCase))
{
list.RemoveAt(0);
return string.Join('/', list.Take(2));
}
else
{
return string.Join('/', list.Take(2));
}
}
}