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

修改

Uat_Study
hang 2022-04-01 15:00:18 +08:00
parent 3f1b3f02ec
commit 6e9871b099
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs
View File

@ -28,7 +28,12 @@ namespace IRaCIS.Core.Application.Service
public async Task<List<CommonDocumentView>> GetCommonDocumentList(CommonDocumentQuery queryCommonDocument) public async Task<List<CommonDocumentView>> GetCommonDocumentList(CommonDocumentQuery queryCommonDocument)
{ {
var commonDocumentQueryable = _commonDocumentRepository.ProjectTo<CommonDocumentView>(_mapper.ConfigurationProvider); var commonDocumentQueryable = _commonDocumentRepository.AsQueryable(true)
.WhereIf( queryCommonDocument.ModuleTypeId!=null ,t=>t.ModuleTypeId == queryCommonDocument.ModuleTypeId)
.WhereIf(queryCommonDocument.FileTypeId != null, t => t.FileTypeId == queryCommonDocument.FileTypeId)
.WhereIf( string.IsNullOrEmpty(queryCommonDocument.Code) , t => t.Code.Contains(queryCommonDocument.Code) )
.WhereIf(string.IsNullOrEmpty(queryCommonDocument.Name), t => t.Name.Contains(queryCommonDocument.Name))
.ProjectTo<CommonDocumentView>(_mapper.ConfigurationProvider);
return await commonDocumentQueryable.ToListAsync(); return await commonDocumentQueryable.ToListAsync();
} }

4
IRaCIS.Core.Application/Service/Common/DTO/CommonDocumentViewModel.cs
View File

@ -26,7 +26,7 @@ namespace IRaCIS.Core.Application.ViewModel
public class CommonDocumentQuery public class CommonDocumentQuery
{ {
public Guid? FileTypeId { get; set; } public Guid? FileTypeId { get; set; }
public Guid? ModuleId { get; set; } public Guid? ModuleTypeId { get; set; }
public string Name { get; set; } = String.Empty; public string Name { get; set; } = String.Empty;
public string Code { get; set; } = String.Empty; public string Code { get; set; } = String.Empty;
@ -43,7 +43,7 @@ namespace IRaCIS.Core.Application.ViewModel
public bool IsDeleted { get; set; } public bool IsDeleted { get; set; }
public string Code { get; set; } = String.Empty; public string Code { get; set; } = String.Empty;
public Guid FileTypeId { get; set; } public Guid FileTypeId { get; set; }
public Guid ModuleId { get; set; } public Guid ModuleTypeId { get; set; }
} }

8
IRaCIS.Core.Domain/Common/CommonDocument.cs
View File

@ -80,11 +80,9 @@ namespace IRaCIS.Core.Domain.Models
[Required] [Required]
public Guid FileTypeId { get; set; } public Guid FileTypeId { get; set; }
/// <summary>
/// ModuleId
/// </summary> public Guid ModuleTypeId { get; set; }
[Required]
public Guid ModuleId { get; set; }
public Dictionary FileType { get; set; } public Dictionary FileType { get; set; }