修改
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
2d9ebe7094
commit
409b76df26
|
@ -331,14 +331,18 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
|
|||
/// <param name="inDto"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task<GetHistoricalVersionOutDto> GetHistoricalVersion(GetHistoricalVersionInDto inDto)
|
||||
public async Task<List<HistoricalVersionDto>> GetHistoricalVersion(GetHistoricalVersionInDto inDto)
|
||||
{
|
||||
return new GetHistoricalVersionOutDto()
|
||||
{
|
||||
|
||||
CurrentData = await _auditDocumentRepository.Where(x => x.Id == inDto.Id).ProjectTo<AuditDocumentData>(_mapper.ConfigurationProvider).FirstNotNullAsync(),
|
||||
HistoricalVersionList = await _auditDocumentRepository.Where(x => x.MainFileId == inDto.Id).ProjectTo<AuditDocumentData>(_mapper.ConfigurationProvider).OrderByDescending(x => x.Version).ToListAsync()
|
||||
};
|
||||
List< HistoricalVersionDto > result=new List<HistoricalVersionDto>();
|
||||
|
||||
result = await _auditDocumentRepository.Where(x => x.MainFileId == inDto.Id).ProjectTo<HistoricalVersionDto>(_mapper.ConfigurationProvider).OrderByDescending(x => x.Version).ToListAsync();
|
||||
var currentData = await _auditDocumentRepository.Where(x => x.Id == inDto.Id).ProjectTo<HistoricalVersionDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
|
||||
currentData.IsCurrentVersion = true;
|
||||
|
||||
result.Insert(0, currentData);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -82,6 +82,13 @@ public class MovieFileOrFolderInDto
|
|||
public Guid ParentId { get; set; }
|
||||
}
|
||||
|
||||
public class HistoricalVersionDto: AuditDocumentUpdateDto
|
||||
{
|
||||
public bool IsCurrentVersion { get; set; } = false;
|
||||
|
||||
public int? Version { get; set; }
|
||||
}
|
||||
|
||||
public class AuditDocumentUpdateDto
|
||||
{
|
||||
public Guid? Id { get; set; }
|
||||
|
|
|
@ -15,6 +15,7 @@ namespace IRaCIS.Core.Application.Service
|
|||
var userId = Guid.Empty;
|
||||
var isEn_Us = false;
|
||||
CreateMap<AuditDocument, AuditDocumentView>();
|
||||
CreateMap<AuditDocument, HistoricalVersionDto>();
|
||||
CreateMap<AuditDocumentUpdateDto, AuditDocumentAddOrEdit>();
|
||||
CreateMap<AuditDocument, AuditDocumentData>();
|
||||
CreateMap<AuditDocument, AuditDocumentAddOrEdit>().ReverseMap();
|
||||
|
|
Loading…
Reference in New Issue