From 65d1052b3201269ca5009f0e52e196e6fca71ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E5=BB=BA=E4=B8=9C?= <617601767@qq.com> Date: Fri, 5 Jan 2024 09:56:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9orderby=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=8E=92=E5=BA=8F=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZhongLian/ZhongLianService/InstallService.cs | 3 ++- ZhongLian/ZhongLianService/MaintenanceService.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ZhongLian/ZhongLianService/InstallService.cs b/ZhongLian/ZhongLianService/InstallService.cs index b5de5ab..3b0e38b 100644 --- a/ZhongLian/ZhongLianService/InstallService.cs +++ b/ZhongLian/ZhongLianService/InstallService.cs @@ -313,9 +313,10 @@ namespace ZhongLianService .WhereIF(pageSearch.Mode != null && !string.IsNullOrEmpty(pageSearch.Mode.PatrolUid), x => x.PatrolUid == pageSearch.Mode!.PatrolUid ) - .OrderByDescending(x => x.Id) .SplitTable((DateTime)pageSearch.StartDate!, (DateTime)pageSearch.EndDate!) + .OrderByDescending(x => x.Id) .ToPageListAsync(pageSearch.Index, pageSearch.Size, _Total); + return new PageData() { Index = pageSearch.Index, diff --git a/ZhongLian/ZhongLianService/MaintenanceService.cs b/ZhongLian/ZhongLianService/MaintenanceService.cs index 969c514..bf95489 100644 --- a/ZhongLian/ZhongLianService/MaintenanceService.cs +++ b/ZhongLian/ZhongLianService/MaintenanceService.cs @@ -146,9 +146,9 @@ namespace ZhongLianService .WhereIF(pageSearch.Mode != null && !string.IsNullOrEmpty(pageSearch.Mode.MaintenanceUid), x => x.MaintenanceUid == pageSearch.Mode!.MaintenanceUid ) + .SplitTable((DateTime)pageSearch.StartDate!, (DateTime)pageSearch.EndDate!) .OrderBy("(CASE State WHEN 2 THEN 0 ELSE State END) ASC") .OrderByDescending(x => x.Id) - .SplitTable((DateTime)pageSearch.StartDate!, (DateTime)pageSearch.EndDate!) .ToPageListAsync(pageSearch.Index, pageSearch.Size, _Total); return new PageData() {