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

代码修改

Browse Source
This commit is contained in:
he
2023-08-17 14:25:15 +08:00
parent 6b6ab9e406
commit 8da1ab2413
3 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs
+5 -5
View File
@@ -252,15 +252,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class GetReadModuleDtoOut
{
public string SubjectCode { get; set; }
public string? SubjectCode { get; set; }
public string TrialSiteCode { get; set; }
public string? TrialSiteCode { get; set; }
public string SiteCode { get; set; }
public string? SiteCode { get; set; }
public Guid SiteId { get; set; }
public Guid? SiteId { get; set; }
public Guid SubjectId { get; set; }
public Guid? SubjectId { get; set; }
public List<ReadModuleView> Data { get; set; }
IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs
+9 -9
View File
@@ -148,16 +148,16 @@ namespace IRaCIS.Application.Services
dto.SortField = nameof(ReadModuleView.SubjectCode);
dto.Asc = true;
}
dto.SortField = dto.Asc ? dto.SortField : dto.SortField + " desc";
var subjectQuery = _readModuleViewRepository.Where(x => x.TrialReadingCriterionId == dto.TrialReadingCriterionId)
.WhereIf(dto.TrialId != null, x => x.TrialId == dto.TrialId)
.WhereIf(dto.SubjectId != null, x => x.SubjectId == dto.SubjectId)
.WhereIf(dto.TrialSiteCode != null && dto.TrialSiteCode != string.Empty, x => x.TrialSiteCode.Contains(dto.TrialSiteCode))
.WhereIf(dto.SubjectCode != null && dto.SubjectCode != string.Empty, x => x.SubjectCode.Contains(dto.SubjectCode))
.WhereIf(dto.ModuleType != null, x => x.ModuleType == dto.ModuleType)
.WhereIf(dto.ReadingStatus != null, x => x.ReadingStatus == dto.ReadingStatus)
.WhereIf(dto.Name != null, x => x.Name.Contains(dto.Name!)).OrderBy(x => x.SiteCode);
var subjectQuery = _readModuleViewRepository.Where(x => x.TrialReadingCriterionId == dto.TrialReadingCriterionId)
.WhereIf(dto.TrialId != null, x => x.TrialId == dto.TrialId)
.WhereIf(dto.SubjectId != null, x => x.SubjectId == dto.SubjectId)
.WhereIf(dto.TrialSiteCode != null && dto.TrialSiteCode != string.Empty, x => x.TrialSiteCode.Contains(dto.TrialSiteCode))
.WhereIf(dto.SubjectCode != null && dto.SubjectCode != string.Empty, x => x.SubjectCode.Contains(dto.SubjectCode))
.WhereIf(dto.ModuleType != null, x => x.ModuleType == dto.ModuleType)
.WhereIf(dto.ReadingStatus != null, x => x.ReadingStatus == dto.ReadingStatus)
.WhereIf(dto.Name != null, x => x.Name.Contains(dto.Name!)).OrderBy(x => x.SiteCode);
var subjectIds = await subjectQuery.OrderBy(dto.SortField).Select(x => x.SubjectId).Distinct().Skip((dto.PageIndex - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();