diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 9b8926a7a..4fa46de3c 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -44,6 +44,13 @@ FrontAuditConfigService + + + 获取子数据 + + + + Cope子项数据 diff --git a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs index 1e65277f1..c45ea8e45 100644 --- a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs +++ b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs @@ -73,6 +73,13 @@ namespace IRaCIS.Core.Application.ViewModel } + public class GetChildrenItem + { + + + public string Identification { get; set; } + } + public class CopyOtherToThisItem { public List DataSource { get; set; }=new List(){ }; diff --git a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs index 139b4c85c..edcfaabae 100644 --- a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs @@ -26,6 +26,20 @@ namespace IRaCIS.Core.Application.Service _frontAuditConfigRepository = frontAuditConfigRepository; } + /// + /// 获取子数据 + /// + /// + /// + [HttpPost] + public async Task> GetChildrenItem(GetChildrenItem item) + { + var list =await (from data in _repository.GetQueryable().Where(x => x.Identification == item.Identification) + join childrenType in _repository.GetQueryable() on data.Id equals childrenType.ParentId + select childrenType).ToListAsync(); + return list; + } + /// /// Cope子项数据 /// diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs index e7336552c..3c9570433 100644 --- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs @@ -112,6 +112,7 @@ namespace IRaCIS.Core.Application.Service.Inspection Description=leftfrontAuditConfig.Description, ModuleTypeName= leftmoduleTypec.ValueCN, SignText= lefttrialSign.SignText, + Identification= leftfrontAuditConfig.Identification, }; query = query.WhereIf(!dto.BlindName.IsNullOrEmpty(), x => x.BlindName == dto.BlindName) diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs index b07ecc043..1c0a790bf 100644 --- a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs +++ b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs @@ -242,9 +242,6 @@ namespace IRaCIS.Application.Services }); return query.ToList(); - - - } diff --git a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs index 390b37e1c..905293a64 100644 --- a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs +++ b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs @@ -218,6 +218,7 @@ namespace IRaCIS.Core.Infra.EFCore } } + public async Task MaxAsync(Expression> selector) {