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

IsAbandon->IsDeleted

Browse Source
This commit is contained in:
hang
2022-04-08 10:41:15 +08:00
parent 10bc94f9fd
commit 7aa3d7acdf
15 changed files with 159 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
+3 -3
View File
@@ -43,7 +43,7 @@ namespace IRaCIS.Core.Application
TotalNeedSignTrialDocCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin
? 0
: await _trialDocumentRepository
.Where(t => t.IsAbandon == false || (t.IsAbandon == true &&
.Where(t => t.IsDeleted == false || (t.IsDeleted == true &&
t.TrialDocConfirmedUserList.Any(t =>
t.ConfirmUserId == _userInfo.Id)))
.SelectMany(t => t.NeedConfirmedUserTypeList)
@@ -60,7 +60,7 @@ namespace IRaCIS.Core.Application
TotalNeedSignSystemDocCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin
? 0
: await _systemDocumentRepository
.Where(t => t.IsAbandon == false || (t.IsAbandon == true && t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id)))
.Where(t => t.IsDeleted == false || (t.IsDeleted == true && t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id)))
.SelectMany(t => t.NeedConfirmedUserTypeList)
.CountAsync(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId),
@@ -78,7 +78,7 @@ namespace IRaCIS.Core.Application
/// <summary>
/// Site 调研 每个项目 处理任务数
/// Site 调研 每个项目 需要处理的审批统计
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
+1 -1
View File
@@ -76,7 +76,7 @@ namespace IRaCIS.Core.Application.Services
var data = await _trialRepository.Where(t => t.Id == trialId).IgnoreQueryFilters().ProjectTo<TrialSiteUserSummaryExportDto>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
var groupSelectIdQuery =
_trialSiteSurveyRepository.Where(t => t.TrialId == trialId && t.IsAbandon == false)
_trialSiteSurveyRepository.Where(t => t.TrialId == trialId && t.IsDeleted == false)
.GroupBy(t => t.SiteId)
.Select(g => g.OrderByDescending(u => u.CreateTime).Select(t => t.Id).First());