From 3cf60f3e9ed8026f3fb1a0afeebff5c6ef907621 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 11 Aug 2026 17:21:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=94=B9=E4=B8=BA=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SiteSurvey/DTO/TrialSiteSurveyViewModel.cs | 4 ++-- .../Service/SiteSurvey/TrialSiteSurveyService.cs | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs b/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs index 842444f73..9ffc200c5 100644 --- a/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs +++ b/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs @@ -488,7 +488,7 @@ namespace IRaCIS.Core.Application.Contracts public string TrialSiteAliasName { get; set; } = String.Empty; } - public class SiteSurveyEquipmentQuery + public class SiteSurveyEquipmentQuery : PageInput { [NotDefault] public Guid TrialId { get; set; } @@ -497,7 +497,7 @@ namespace IRaCIS.Core.Application.Contracts public string? TrialSiteName { get; set; } } - public class SiteSurveyInfoQuery + public class SiteSurveyInfoQuery : PageInput { [NotDefault] public Guid TrialId { get; set; } diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs index a2cd24c05..c5a2fc105 100644 --- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs +++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs @@ -1465,17 +1465,17 @@ namespace IRaCIS.Core.Application.Contracts [HttpPost] public async Task GetSiteSurveyEquipmentList(SiteSurveyEquipmentQuery inQuery) { - var list = _trialSiteEquipmentSurveyRepository.Where(t => t.TrialSiteSurvey.TrialId == inQuery.TrialId) + var pageList = _trialSiteEquipmentSurveyRepository.Where(t => t.TrialSiteSurvey.TrialId == inQuery.TrialId) .WhereIf(inQuery.TrialSiteCode.IsNotNullOrEmpty(), t => t.TrialSiteSurvey.TrialSite.TrialSiteCode.Contains(inQuery.TrialSiteCode)) .WhereIf(inQuery.TrialSiteName.IsNotNullOrEmpty(), t => t.TrialSiteSurvey.TrialSite.TrialSiteAliasName.Contains(inQuery.TrialSiteName) || t.TrialSiteSurvey.TrialSite.TrialSiteName.Contains(inQuery.TrialSiteName)) - .ProjectTo(_mapper.ConfigurationProvider).ToList(); + .ProjectTo(_mapper.ConfigurationProvider).ToPagedListAsync(inQuery); var siteSurveryConfig = _trialRepository.Where(t => t.Id == inQuery.TrialId).Select(t => t.TrialExtraConfigJsonStr).FirstOrDefault() ?? string.Empty; var config = JsonConvert.DeserializeObject(siteSurveryConfig) ?? new TrialExtraConfig(); - return ResponseOutput.Ok(list, config); + return ResponseOutput.Ok(pageList, config); } /// @@ -1486,16 +1486,16 @@ namespace IRaCIS.Core.Application.Contracts [HttpPost] public async Task GetSiteSurveyInfoList(SiteSurveyInfoQuery inQuery) { - var list = _trialSiteSurveyRepository.Where(t => t.TrialId == inQuery.TrialId) + var pageList = _trialSiteSurveyRepository.Where(t => t.TrialId == inQuery.TrialId) - .ProjectTo(_mapper.ConfigurationProvider).ToList(); + .ProjectTo(_mapper.ConfigurationProvider).ToPagedListAsync(inQuery); var siteSurveryConfig = _trialRepository.Where(t => t.Id == inQuery.TrialId).Select(t => t.TrialExtraConfigJsonStr).FirstOrDefault() ?? string.Empty; var config = JsonConvert.DeserializeObject(siteSurveryConfig) ?? new TrialExtraConfig(); - return ResponseOutput.Ok(list, config); + return ResponseOutput.Ok(pageList, config); } ///