From 408c40594df3a5132a996a972bb640143d86ac4e Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 7 Jun 2022 14:20:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRaCIS.Core.Application.xml | 20 ---------------- .../Reading/Dto/ReadingPeriodSetViewModel.cs | 23 +------------------ .../Reading/ReadingPeriodSetService.cs | 2 +- 3 files changed, 2 insertions(+), 43 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 3820bdbb0..8b6af37c1 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -962,26 +962,6 @@ 阅片期名称 - - - 页码 - - - - - 每页大小 - - - - - 排序字段 - - - - - 排序字段 - - 项目外部人员 录入流程相关 diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs index 5fcc52a3d..2422c51f3 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs @@ -221,7 +221,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public ReadingPeriodStatus IsTakeEffect { get; set; } } - public class ReadingPeriodSetQuery + public class ReadingPeriodSetQuery:PageInput { /// @@ -238,26 +238,5 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 阅片期名称 /// public string? ReadingPeriodName { get; set; } - - /// - /// 页码 - /// - public int PageIndex { get; set; } = 1; - - /// - /// 每页大小 - /// - public int PageSize { get; set; } = 10; - - - /// - /// 排序字段 - /// - public string? SortField { get; set; } - - /// - /// 排序字段 - /// - public bool SortAsc { get; set; } = true; } } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs index b1c2a6bcd..86f0e4631 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs @@ -242,7 +242,7 @@ namespace IRaCIS.Application.Services .WhereIf(query.ReadingPeriodName != null, x => x.ReadingPeriodName.Contains(query.ReadingPeriodName)) .ProjectTo(_mapper.ConfigurationProvider); var pageList= await readQuery.ToPagedListAsync(query.PageIndex, query.PageSize, query.SortField == null ? "CreateTime" : query.SortField, - query.SortAsc); + query.Asc); return pageList; }