Browse Source

取消分页

guqiang 1 month ago
parent
commit
e78b8c15d1

+ 1 - 1
src/Hotline.Api/Controllers/JudicialManagementOrdersController.cs

@@ -701,7 +701,7 @@ namespace Hotline.Api.Controllers
         /// <param name="queryIndustryOrderStatisticsRequest"></param>
         /// <returns></returns>
         [HttpGet("enforcement_industry_statistics_order")]
-        public async Task<PagedDto<IndustryOrderStaticsDto>> QueryIndustryOrderStatics([FromQuery] QueryIndustryOrderStatisticsRequest queryIndustryOrderStatisticsRequest)
+        public async Task<List<IndustryOrderStaticsDto>> QueryIndustryOrderStatics([FromQuery] QueryIndustryOrderStatisticsRequest queryIndustryOrderStatisticsRequest)
         {
             return await _enforcementApplication.QueryIndustryOrderStatics(queryIndustryOrderStatisticsRequest);
         }

+ 3 - 8
src/Hotline.Application/JudicialManagement/EnforcementApplication.cs

@@ -367,7 +367,7 @@ namespace Hotline.Application.JudicialManagement
 
         }
 
-        public async Task<PagedDto<IndustryOrderStaticsDto>> QueryIndustryOrderStatics(QueryIndustryOrderStatisticsRequest queryIndustryOrderStatisticsRequest)
+        public async Task<List<IndustryOrderStaticsDto>> QueryIndustryOrderStatics(QueryIndustryOrderStatisticsRequest queryIndustryOrderStatisticsRequest)
         {
             var judicialManagementOrderTable = _judicialManagementOrdersRepository.Queryable()
                 .Where(x => x.CreationTime >= queryIndustryOrderStatisticsRequest.StartTime && x.CreationTime <= queryIndustryOrderStatisticsRequest.EndTime);
@@ -382,15 +382,10 @@ namespace Hotline.Application.JudicialManagement
                     ToBeVerifiedOrderCount = SqlFunc.AggregateCount(SqlFunc.IIF(j.IsEnforcementOrder == null, 1, 0))
                 });
 
-            var count = await queryable.CountAsync();
 
-            var result = await queryable.ToPageListAsync(queryIndustryOrderStatisticsRequest.PageIndex, queryIndustryOrderStatisticsRequest.PageSize);
+            var result = await queryable.ToListAsync();
 
-            return  new PagedDto<IndustryOrderStaticsDto>
-            {
-                Total = count,
-                Items = result
-            };
+            return result;
         }
     }
 }

+ 1 - 1
src/Hotline.Application/JudicialManagement/IEnforcementApplication.cs

@@ -80,6 +80,6 @@ namespace Hotline.Application.JudicialManagement
         /// </summary>
         /// <param name="queryIndustryOrderStatisticsRequest"></param>
         /// <returns></returns>
-        Task<PagedDto<IndustryOrderStaticsDto>> QueryIndustryOrderStatics(QueryIndustryOrderStatisticsRequest queryIndustryOrderStatisticsRequest);
+        Task<List<IndustryOrderStaticsDto>> QueryIndustryOrderStatics(QueryIndustryOrderStatisticsRequest queryIndustryOrderStatisticsRequest);
     }
 }

+ 1 - 1
src/Hotline.Share/Dtos/JudicialManagement/QueryEventClassificationStatisticsDto.cs

@@ -68,7 +68,7 @@ namespace Hotline.Share.Dtos.JudicialManagement
         public bool EnforcementOrder { get; set; }
     }
 
-    public record QueryIndustryOrderStatisticsRequest: PagedRequest
+    public record QueryIndustryOrderStatisticsRequest
     {
         /// <summary>
         /// 开始时间