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

修改稽查文档
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
he 2025-04-07 17:42:58 +08:00
parent 8c5b759a92
commit b79b4567b4
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs
View File

@ -211,8 +211,9 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
var query = data var query = data
.WhereIf(inDto.SelfId != null, x => inDto.SelfId == x.Id)
.WhereIf(inDto.Id != null, x => inDto.Id == x.ParentId) .WhereIf(inDto.Id != null, x => inDto.Id == x.ParentId)
.WhereIf(inDto.Id == null, x => x.ParentId == null); .WhereIf(inDto.Id == null&& inDto.SelfId == null, x => x.ParentId == null);
@ -388,12 +389,13 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
{ {
var data = (await GetAuditDocumentData(new GetAuditDocumentDataInDto() var data = (await GetAuditDocumentData(new GetAuditDocumentDataInDto()
{ {
Id =item, SelfId =item,
PageIndex=1, PageIndex=1,
PageSize= 1000 PageSize= 1000
})).CurrentPageData; })).CurrentPageData;
List<AuditDocumentAddOrEdit> auditDocumentAddOrEdits = _mapper.Map<List<AuditDocumentAddOrEdit>>(inDto); List<AuditDocumentAddOrEdit> auditDocumentAddOrEdits = _mapper.Map<List<AuditDocumentAddOrEdit>>(data);
auditDocumentAddOrEdits.ForEach(x => x.IsUpdate = false); auditDocumentAddOrEdits.ForEach(x => x.IsUpdate = false);
await addData(auditDocumentAddOrEdits); await addData(auditDocumentAddOrEdits);
} }
@ -402,6 +404,7 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
{ {
foreach (var item in data) foreach (var item in data)
{ {
item.Id = null;
var result = await AddOrUpdateAuditDocument(item); var result = await AddOrUpdateAuditDocument(item);
item.Children.ForEach(x => { item.Children.ForEach(x => {

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

@ -28,6 +28,9 @@ public class GetAuditDocumentDataInDto:PageInput
{ {
public Guid? Id { get; set; } public Guid? Id { get; set; }
public Guid? SelfId { get; set; }
public bool? IsAuthorization { get; set; } public bool? IsAuthorization { get; set; }
public string Name { get; set; } = string.Empty; public string Name { get; set; } = string.Empty;

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

@ -15,6 +15,7 @@ namespace IRaCIS.Core.Application.Service
var userId = Guid.Empty; var userId = Guid.Empty;
var isEn_Us = false; var isEn_Us = false;
CreateMap<AuditDocumentData, AuditDocumentAddOrEdit>(); CreateMap<AuditDocumentData, AuditDocumentAddOrEdit>();
//CreateMap<List<AuditDocumentData>, List<AuditDocumentAddOrEdit>>();
CreateMap<AuditDocument, AuditDocumentView>(); CreateMap<AuditDocument, AuditDocumentView>();
CreateMap<AuditDocument, AuditDocumentUpdateDto>(); CreateMap<AuditDocument, AuditDocumentUpdateDto>();
CreateMap<AuditDocument, HistoricalVersionDto>(); CreateMap<AuditDocument, HistoricalVersionDto>();