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

修改

IRC_NewDev
he 2024-03-29 14:23:21 +08:00
parent f86bc219cf
commit 451a311142
4 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs
View File

@ -119,8 +119,7 @@ namespace IRaCIS.Core.Application.Contracts
public class GetNextUnSignDocumentInDto public class GetNextUnSignDocumentInDto
{ {
[NotDefault] public Guid? TrialId { get; set; }
public Guid TrialId { get; set; }
public bool Asc { get; set; } = true; public bool Asc { get; set; } = true;
public string SortField { get; set; } = ""; public string SortField { get; set; } = "";

3
IRaCIS.Core.Application/Service/Document/Interface/ISystemDocumentService.cs
View File

@ -25,6 +25,9 @@ namespace IRaCIS.Core.Application.Contracts
Task<IResponseOutput> DeleteSystemDocumentAsync(Guid systemDocumentId); Task<IResponseOutput> DeleteSystemDocumentAsync(Guid systemDocumentId);
Task<PageOutput<UnionDocumentWithConfirmInfoView>> getWaitSignSysDocList(SystemDocumentQuery querySystemDocument);
} }

1
IRaCIS.Core.Application/Service/Document/SystemDocumentService.cs
View File

@ -23,6 +23,7 @@ namespace IRaCIS.Core.Application.Services
private readonly IRepository<SystemDocConfirmedUser> _systemDocConfirmedUserRepository; private readonly IRepository<SystemDocConfirmedUser> _systemDocConfirmedUserRepository;
public SystemDocumentService( IRepository<SystemDocument> systemDocumentRepository, public SystemDocumentService( IRepository<SystemDocument> systemDocumentRepository,
IRepository<SystemDocNeedConfirmedUserType> systemDocNeedConfirmedUserTypeRepository, IRepository<SystemDocNeedConfirmedUserType> systemDocNeedConfirmedUserTypeRepository,
IRepository<SystemDocConfirmedUser> systemDocConfirmedUserRepository) IRepository<SystemDocConfirmedUser> systemDocConfirmedUserRepository)
{ {

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

@ -25,6 +25,7 @@ namespace IRaCIS.Core.Application.Services
private readonly IRepository<TrialDocument> _trialDocumentRepository; private readonly IRepository<TrialDocument> _trialDocumentRepository;
private readonly IRepository<TrialDocConfirmedUser> _trialDocUserTypeConfirmedUserRepository; private readonly IRepository<TrialDocConfirmedUser> _trialDocUserTypeConfirmedUserRepository;
private readonly IRepository<Trial> _trialRepository; private readonly IRepository<Trial> _trialRepository;
private readonly ISystemDocumentService _systemDocumentService;
private readonly IRepository<SystemDocConfirmedUser> _systemDocConfirmedUserRepository; private readonly IRepository<SystemDocConfirmedUser> _systemDocConfirmedUserRepository;
private readonly IRepository<SystemDocument> _systemDocumentRepository; private readonly IRepository<SystemDocument> _systemDocumentRepository;
private readonly IRepository<TrialCriterionAdditionalAssessmentType> _trialCriterionAdditionalAssessmentTypeRepository; private readonly IRepository<TrialCriterionAdditionalAssessmentType> _trialCriterionAdditionalAssessmentTypeRepository;
@ -34,6 +35,7 @@ namespace IRaCIS.Core.Application.Services
public TrialDocumentService(IRepository<TrialDocument> trialDocumentRepository, public TrialDocumentService(IRepository<TrialDocument> trialDocumentRepository,
IRepository<TrialDocConfirmedUser> trialDocUserTypeConfirmedUserRepository, IRepository<TrialDocConfirmedUser> trialDocUserTypeConfirmedUserRepository,
IRepository<Trial> trialRepository, IRepository<Trial> trialRepository,
ISystemDocumentService systemDocumentService,
IRepository<SystemDocConfirmedUser> systemDocConfirmedUserRepository, IRepository<SystemDocConfirmedUser> systemDocConfirmedUserRepository,
IRepository<TrialCriterionAdditionalAssessmentType> trialCriterionAdditionalAssessmentTypeRepository, IRepository<TrialCriterionAdditionalAssessmentType> trialCriterionAdditionalAssessmentTypeRepository,
IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrialRepository IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrialRepository
@ -42,6 +44,7 @@ namespace IRaCIS.Core.Application.Services
_trialDocumentRepository = trialDocumentRepository; _trialDocumentRepository = trialDocumentRepository;
this._trialDocUserTypeConfirmedUserRepository = trialDocUserTypeConfirmedUserRepository; this._trialDocUserTypeConfirmedUserRepository = trialDocUserTypeConfirmedUserRepository;
this._trialRepository = trialRepository; this._trialRepository = trialRepository;
this._systemDocumentService = systemDocumentService;
this._systemDocConfirmedUserRepository = systemDocConfirmedUserRepository; this._systemDocConfirmedUserRepository = systemDocConfirmedUserRepository;
_systemDocumentRepository = systemDocumentRepository; _systemDocumentRepository = systemDocumentRepository;
_readingQuestionCriterionTrialRepository = readingQuestionCriterionTrialRepository; _readingQuestionCriterionTrialRepository = readingQuestionCriterionTrialRepository;
@ -123,7 +126,11 @@ namespace IRaCIS.Core.Application.Services
[HttpPost] [HttpPost]
public async Task<UnionDocumentWithConfirmInfoView?> GetNextUnSignDocument(GetNextUnSignDocumentInDto inDto) public async Task<UnionDocumentWithConfirmInfoView?> GetNextUnSignDocument(GetNextUnSignDocumentInDto inDto)
{ {
var result = await this.GetUserDocumentList(new TrialUserDocUnionQuery() var result = new PageOutput<UnionDocumentWithConfirmInfoView>() { };
if (inDto.TrialId != null)
{
result = (await this.GetUserDocumentList(new TrialUserDocUnionQuery()
{ {
Asc = inDto.Asc, Asc = inDto.Asc,
IsSign = false, IsSign = false,
@ -131,11 +138,25 @@ namespace IRaCIS.Core.Application.Services
TrialId = inDto.TrialId, TrialId = inDto.TrialId,
PageIndex = 1, PageIndex = 1,
PageSize = 1, PageSize = 1,
})).Data;
}
else
{
result = await _systemDocumentService.getWaitSignSysDocList(new SystemDocumentQuery()
{
PageIndex=1,
IsSigned = false,
PageSize=1,
Asc=false,
SortField="UpdateTime",
}); });
if (result.Data.CurrentPageData.Count > 0) }
if (result.CurrentPageData.Count > 0)
{ {
return result.Data.CurrentPageData.First(); return result.CurrentPageData.First();
} }
else else
{ {