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

文档类型处理

Uat_Study
hang 2022-04-08 13:44:03 +08:00
parent 3273ad590e
commit 6318c09946
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
View File

@ -144,6 +144,7 @@ namespace IRaCIS.Core.Application.Services
SignViewMinimumMinutes = needConfirmedUserType.SystemDocument.SignViewMinimumMinutes, SignViewMinimumMinutes = needConfirmedUserType.SystemDocument.SignViewMinimumMinutes,
Name = needConfirmedUserType.SystemDocument.Name, Name = needConfirmedUserType.SystemDocument.Name,
Path = needConfirmedUserType.SystemDocument.Path, Path = needConfirmedUserType.SystemDocument.Path,
FileTypeId = needConfirmedUserType.SystemDocument.FileTypeId,
FileType = needConfirmedUserType.SystemDocument.FileType.Value, FileType = needConfirmedUserType.SystemDocument.FileType.Value,
UpdateTime = needConfirmedUserType.SystemDocument.UpdateTime, UpdateTime = needConfirmedUserType.SystemDocument.UpdateTime,
@ -174,6 +175,7 @@ namespace IRaCIS.Core.Application.Services
IsDeleted = trialDoc.IsDeleted, IsDeleted = trialDoc.IsDeleted,
Name = trialDoc.Name, Name = trialDoc.Name,
Path = trialDoc.Path, Path = trialDoc.Path,
FileTypeId = trialDoc.FileTypeId,
FileType = trialDoc.FileType.Value, FileType = trialDoc.FileType.Value,
UpdateTime = trialDoc.UpdateTime, UpdateTime = trialDoc.UpdateTime,
SignViewMinimumMinutes = trialDoc.SignViewMinimumMinutes, SignViewMinimumMinutes = trialDoc.SignViewMinimumMinutes,
@ -290,7 +292,6 @@ namespace IRaCIS.Core.Application.Services
var trialFininshedTime = await _repository.Where<Trial>(t => t.Id == querySystemDocument.TrialId).Select(t => t.TrialFinishedTime).FirstOrDefaultAsync(); var trialFininshedTime = await _repository.Where<Trial>(t => t.Id == querySystemDocument.TrialId).Select(t => t.TrialFinishedTime).FirstOrDefaultAsync();
var trialDocQuery = from trialDocumentNeedConfirmedUserType in _repository.Where<TrialDocNeedConfirmedUserType>(t => t.TrialDocument.TrialId == querySystemDocument.TrialId) var trialDocQuery = from trialDocumentNeedConfirmedUserType in _repository.Where<TrialDocNeedConfirmedUserType>(t => t.TrialDocument.TrialId == querySystemDocument.TrialId)
//.Where(t => t.TrialDocument.Trial.TrialUserList.Any(cc => cc.User.UserTypeId == t.NeedConfirmUserTypeId))
join trialUser in _repository.Where<TrialUser>(t => t.TrialId == querySystemDocument.TrialId) join trialUser in _repository.Where<TrialUser>(t => t.TrialId == querySystemDocument.TrialId)
.WhereIf(querySystemDocument.UserId != null, t => t.UserId == querySystemDocument.UserId) .WhereIf(querySystemDocument.UserId != null, t => t.UserId == querySystemDocument.UserId)
.WhereIf(querySystemDocument.UserTypeId != null, t => t.User.UserTypeId == querySystemDocument.UserTypeId) .WhereIf(querySystemDocument.UserTypeId != null, t => t.User.UserTypeId == querySystemDocument.UserTypeId)
@ -309,6 +310,7 @@ namespace IRaCIS.Core.Application.Services
SignViewMinimumMinutes = trialDocumentNeedConfirmedUserType.TrialDocument.SignViewMinimumMinutes, SignViewMinimumMinutes = trialDocumentNeedConfirmedUserType.TrialDocument.SignViewMinimumMinutes,
Name = trialDocumentNeedConfirmedUserType.TrialDocument.Name, Name = trialDocumentNeedConfirmedUserType.TrialDocument.Name,
Path = trialDocumentNeedConfirmedUserType.TrialDocument.Path, Path = trialDocumentNeedConfirmedUserType.TrialDocument.Path,
FileTypeId = trialDocumentNeedConfirmedUserType.TrialDocument.FileTypeId,
FileType = trialDocumentNeedConfirmedUserType.TrialDocument.FileType.Value, FileType = trialDocumentNeedConfirmedUserType.TrialDocument.FileType.Value,
UpdateTime = trialDocumentNeedConfirmedUserType.TrialDocument.UpdateTime, UpdateTime = trialDocumentNeedConfirmedUserType.TrialDocument.UpdateTime,
@ -343,6 +345,7 @@ namespace IRaCIS.Core.Application.Services
Name = needConfirmEdUserType.SystemDocument.Name, Name = needConfirmEdUserType.SystemDocument.Name,
Path = needConfirmEdUserType.SystemDocument.Path, Path = needConfirmEdUserType.SystemDocument.Path,
FileType = needConfirmEdUserType.SystemDocument.FileType.Value, FileType = needConfirmEdUserType.SystemDocument.FileType.Value,
FileTypeId = needConfirmEdUserType.SystemDocument.FileTypeId,
UpdateTime = needConfirmEdUserType.SystemDocument.UpdateTime, UpdateTime = needConfirmEdUserType.SystemDocument.UpdateTime,
@ -383,11 +386,13 @@ namespace IRaCIS.Core.Application.Services
/// <param name="trialId"></param> /// <param name="trialId"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("{trialId:guid}")] [HttpGet("{trialId:guid}")]
public async Task<List<string>> GetTrialDocAndSystemDocType(Guid trialId) public async Task<IResponseOutput> GetTrialDocAndSystemDocType(Guid trialId)
{ {
return await _trialDocumentRepository.Where(t => t.TrialId == trialId).Select(t => t.FileType.Value) var result = await _trialDocumentRepository.Where(t => t.TrialId == trialId).Select(t => new { FileType = t.FileType.Value, t.FileTypeId })
.Union(_repository.GetQueryable<SystemDocument>().Select(t => t.FileType.Value)).Distinct() .Union(_systemDocumentRepository.Select(t => new { FileType = t.FileType.Value, t.FileTypeId }))
.ToListAsync(); .ToListAsync();
return ResponseOutput.Ok(result);
} }
public async Task<IResponseOutput> AddOrUpdateTrialDocument(AddOrEditTrialDocument addOrEditTrialDocument) public async Task<IResponseOutput> AddOrUpdateTrialDocument(AddOrEditTrialDocument addOrEditTrialDocument)