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

增加统计字段

IRC_NewDev
hang 2024-03-11 15:45:12 +08:00
parent 21cc610095
commit cd7318dd63
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs
View File

@ -382,6 +382,10 @@ namespace IRaCIS.Core.Application.Contracts
public int? TrialWaitSignDocCount { get; set; } public int? TrialWaitSignDocCount { get; set; }
public int? SysWaitSignDocCount { get; set; } public int? SysWaitSignDocCount { get; set; }
public int? TrialSignedDocCount { get; set; }
public int? SysSignedDocCount { get; set; }
#region PM/APM #region PM/APM
public int? PM_SiteSurveryCount { get; set; } public int? PM_SiteSurveryCount { get; set; }
public int? PM_CheckCount { get; set; } public int? PM_CheckCount { get; set; }

14
IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
View File

@ -1212,6 +1212,17 @@ namespace IRaCIS.Core.Application
.SelectMany(t => t.NeedConfirmedUserTypeList) .SelectMany(t => t.NeedConfirmedUserTypeList)
.CountAsync(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId); .CountAsync(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId);
var signedTrialCount = await _trialRepository.Where(t => t.TrialStatusStr != StaticData.TrialState.TrialStopped).Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
.Where(c => c.TrialDocumentList.Where(t => t.IsDeleted == false && t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId)
&& t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id && t.ConfirmTime != null)).Count() > 0).CountAsync();
var signedSysDocCont = await _systemDocumentRepository
.Where(t => t.IsDeleted == false && t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id && t.ConfirmTime != null))
.SelectMany(t => t.NeedConfirmedUserTypeList)
.CountAsync(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId);
var siteSurveyCount = await _trialRepository var siteSurveyCount = await _trialRepository
.Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id)) .Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
.WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM, c => c.TrialSiteSurveyList.Where(t => t.State == TrialSiteSurveyEnum.SPMApproved).Count() > 0) .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM, c => c.TrialSiteSurveyList.Where(t => t.State == TrialSiteSurveyEnum.SPMApproved).Count() > 0)
@ -1248,6 +1259,9 @@ namespace IRaCIS.Core.Application
SysWaitSignDocCount = needSignSysDocCont, SysWaitSignDocCount = needSignSysDocCont,
TrialWaitSignDocCount = needSignTrialCount , TrialWaitSignDocCount = needSignTrialCount ,
TrialSignedDocCount=signedTrialCount,
SysSignedDocCount=signedSysDocCont,
#region PM #region PM
PM_SiteSurveryCount = isPM ? siteSurveyCount : 0, PM_SiteSurveryCount = isPM ? siteSurveyCount : 0,