Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
d5cd8dc338
|
@ -335,13 +335,10 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
|
|||
var file = data.Where(x => x.Id == id).FirstOrDefault();
|
||||
if (file.AuditDocumentTypeEnum == AuditDocumentType.Folder)
|
||||
{
|
||||
|
||||
|
||||
if (finChild(new List<Guid> { id }, inDto.ParentId, data))
|
||||
{
|
||||
throw new BusinessValidationFailedException(_localizer["AuditDocument_CanNotMove"]);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -367,10 +364,6 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
|
|||
|
||||
foreach (var id in inDto.Ids)
|
||||
{
|
||||
|
||||
|
||||
|
||||
|
||||
await _auditDocumentRepository.UpdatePartialFromQueryAsync(id, x => new AuditDocument()
|
||||
{
|
||||
ParentId = inDto.ParentId
|
||||
|
@ -382,13 +375,56 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
|
|||
return ResponseOutput.Ok();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 复制文件或者文件夹
|
||||
/// </summary>
|
||||
/// <param name="inDto"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task<IResponseOutput> CopyFileOrFolder(MovieFileOrFolderInDto inDto)
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// 获取历史版本
|
||||
/// </summary>
|
||||
/// <param name="inDto"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
foreach (var item in inDto.Ids)
|
||||
{
|
||||
var data = (await GetAuditDocumentData(new GetAuditDocumentDataInDto()
|
||||
{
|
||||
Id =item,
|
||||
PageIndex=1,
|
||||
PageSize= 1000
|
||||
})).CurrentPageData;
|
||||
|
||||
List<AuditDocumentAddOrEdit> auditDocumentAddOrEdits = _mapper.Map<List<AuditDocumentAddOrEdit>>(inDto);
|
||||
auditDocumentAddOrEdits.ForEach(x => x.IsUpdate = false);
|
||||
await addData(auditDocumentAddOrEdits);
|
||||
}
|
||||
|
||||
async Task addData(List<AuditDocumentAddOrEdit> data)
|
||||
{
|
||||
foreach (var item in data)
|
||||
{
|
||||
var result = await AddOrUpdateAuditDocument(item);
|
||||
|
||||
item.Children.ForEach(x => {
|
||||
x.ParentId = result.Id;
|
||||
x.IsUpdate = false;
|
||||
|
||||
});
|
||||
|
||||
if (item.Children.Count() > 0)
|
||||
{
|
||||
await addData(item.Children);
|
||||
}
|
||||
}
|
||||
}
|
||||
return ResponseOutput.Ok();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取历史版本
|
||||
/// </summary>
|
||||
/// <param name="inDto"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task<List<HistoricalVersionDto>> GetHistoricalVersion(GetHistoricalVersionInDto inDto)
|
||||
{
|
||||
|
||||
|
|
|
@ -14,6 +14,7 @@ namespace IRaCIS.Core.Application.Service
|
|||
|
||||
var userId = Guid.Empty;
|
||||
var isEn_Us = false;
|
||||
CreateMap<AuditDocumentData, AuditDocumentAddOrEdit>();
|
||||
CreateMap<AuditDocument, AuditDocumentView>();
|
||||
CreateMap<AuditDocument, AuditDocumentUpdateDto>();
|
||||
CreateMap<AuditDocument, HistoricalVersionDto>();
|
||||
|
|
Loading…
Reference in New Issue