Merge branch 'S07' into test

src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs

@@ -128,9 +128,13 @@ public class CompleteWarningService : ApplicationService
     {
         var vo = ObjectMapper.Map<GetPageCompleteWarningDetailsInput, GetPageCompleteWarningDetailsInputVO>(input);
         var result = await _warningDetailsEsRepository.GetPageCompleteWarningDetailsAsync(vo);
-
         if (result.List.Count == 0)
-            return new UnifyPageResultDto<CompleteWarningDetailsDto>(new List<CompleteWarningDetailsDto>(), input.PageIndex, input.PageSize, 0);
+        {
+            return new UnifyPageResultDto<CompleteWarningDetailsDto>(new List<CompleteWarningDetailsDto>(),
+                result.Pagination.PageIndex,
+                result.Pagination.PageSize,
+                result.Pagination.Total);
+        }
 
         // todo:缓存优化
         var trackStatusIds = result.List

src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs

@@ -108,7 +108,13 @@ public class ReturnWarningService : ApplicationService
     {
         var vo = ObjectMapper.Map<GetPageReturnWarningDetailsInput, GetPageReturnWarningDetailsInputVO>(input);
         var result = await _warningDetailsEsRepository.GetPageReturnWarningDetailsAsync(vo);
-
+        if (result.List.Count == 0)
+        {
+            return new UnifyPageResultDto<ReturnWarningDetailsDto>(new List<ReturnWarningDetailsDto>(),
+                result.Pagination.PageIndex,
+                result.Pagination.PageSize,
+                result.Pagination.Total);
+        }
         // todo:缓存优化
         // 订单类型
         var orderTypeDict = await _orderRepository.GetTrackOrderTypeDictAsync();

src/SJZY.Track.Application/Services/Warning/TransportWarningService.cs

@@ -178,7 +178,10 @@ public class TransportWarningService : ApplicationService
         var result = await _warningDetailsEsRepository.GetPageTransportWarningDetailsAsync(vo);
         if (result.List.Count == 0)
         {
-            return new UnifyPageResultDto<TransportWarningDetailsDto>(new List<TransportWarningDetailsDto>(), input.PageIndex, input.PageSize, 0);
+            return new UnifyPageResultDto<TransportWarningDetailsDto>(new List<TransportWarningDetailsDto>(),
+                result.Pagination.PageIndex,
+                result.Pagination.PageSize,
+                result.Pagination.Total);
         }
 
         // 查最新轨迹(创建时间)
@@ -269,7 +272,7 @@ public class TransportWarningService : ApplicationService
             sorted,
             result.Pagination.PageIndex,
             result.Pagination.PageSize,
-            sorted.Count);
+            result.Pagination.Total);
 
         // 通知用户提取用户名称
         string ToUserNames(string notifyUsers)

src/SJZY.Track.Repository/Repositories/WarningDetailsEsRepository.cs

@@ -45,7 +45,9 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien
             .Index(GlobalConst.TransportWarningDetailsIndex)
             .Query(q => q.Bool(b => b.Must(musts)))
             .From((input.PageIndex - 1) * input.PageSize)
-            .Size(input.PageSize));
+            .Size(input.PageSize)
+            .TrackTotalHits(true)
+        );
 
         if (!r.IsValid)
         {
@@ -345,7 +347,9 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien
             .Index(GlobalConst.ReturnWarningDetailsIndex)
             .Query(q => q.Bool(b => b.Must(musts)))
             .From((input.PageIndex - 1) * input.PageSize)
-            .Size(input.PageSize));
+            .Size(input.PageSize)
+            .TrackTotalHits(true)
+        );
 
         if (!r.IsValid)
         {
@@ -731,7 +735,9 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien
             .Index(GlobalConst.CompleteWarningDetailsIndex)
             .Query(q => q.Bool(b => b.Must(musts)))
             .From((input.PageIndex - 1) * input.PageSize)
-            .Size(input.PageSize));
+            .Size(input.PageSize)
+            .TrackTotalHits(true)
+        );
 
         if (!r.IsValid)
         {