diff --git a/IRaCIS.Core.Application/Service/Document/DTO/TrialFileTypeViewModel.cs b/IRaCIS.Core.Application/Service/Document/DTO/TrialFileTypeViewModel.cs index 696abc5c6..0317b7e85 100644 --- a/IRaCIS.Core.Application/Service/Document/DTO/TrialFileTypeViewModel.cs +++ b/IRaCIS.Core.Application/Service/Document/DTO/TrialFileTypeViewModel.cs @@ -30,6 +30,8 @@ public class TrialFileTypeSelectView public bool IsEnable { get; set; } public bool IsSelfDefine { get; set; } + + public ArchiveType ArchiveTypeEnum { get; set; } } @@ -90,6 +92,8 @@ public class TrialFileTypeSelectQuery public bool? IsEnable { get; set; } public bool? IsSelfDefine { get; set; } + + public ArchiveType? ArchiveTypeEnum { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Document/TrialFileTypeService.cs b/IRaCIS.Core.Application/Service/Document/TrialFileTypeService.cs index 9ae25c270..41cadf6f1 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialFileTypeService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialFileTypeService.cs @@ -48,11 +48,16 @@ public class TrialFileTypeService(IRepository _trialFileTypeRepos return pageList; } + /// + /// 获取项目文件类型下拉框 + /// + /// + /// public async Task> GetTrialFileTypeSelectList(TrialFileTypeSelectQuery inQuery) { var list = _trialFileTypeRepository .Where(t => t.TrialId == inQuery.TrialId) - + .WhereIf(inQuery.ArchiveTypeEnum != null, t => t.ArchiveTypeEnum == inQuery.ArchiveTypeEnum) .WhereIf(inQuery.IsSelfDefine != null, t => t.IsSelfDefine == inQuery.IsSelfDefine) .WhereIf(inQuery.IsEnable != null, t => t.IsEnable == inQuery.IsEnable) .Select(t => new TrialFileTypeSelectView() @@ -61,6 +66,7 @@ public class TrialFileTypeService(IRepository _trialFileTypeRepos IsEnable = t.IsEnable, Name = _userInfo.IsEn_Us ? t.Name : t.NameCN, IsSelfDefine = t.IsSelfDefine, + ArchiveTypeEnum = t.ArchiveTypeEnum, }).ToList(); return list;