fix:修复预警明细的分页查询,不返回总数的bug

This commit is contained in:
hardstylewyl 2025-03-31 10:32:06 +08:00
parent e034bbab38
commit 027b06b9d9
4 changed files with 27 additions and 8 deletions

View File

@ -128,9 +128,13 @@ public class CompleteWarningService : ApplicationService
{ {
var vo = ObjectMapper.Map<GetPageCompleteWarningDetailsInput, GetPageCompleteWarningDetailsInputVO>(input); var vo = ObjectMapper.Map<GetPageCompleteWarningDetailsInput, GetPageCompleteWarningDetailsInputVO>(input);
var result = await _warningDetailsEsRepository.GetPageCompleteWarningDetailsAsync(vo); var result = await _warningDetailsEsRepository.GetPageCompleteWarningDetailsAsync(vo);
if (result.List.Count == 0) 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:缓存优化 // todo:缓存优化
var trackStatusIds = result.List var trackStatusIds = result.List

View File

@ -108,7 +108,13 @@ public class ReturnWarningService : ApplicationService
{ {
var vo = ObjectMapper.Map<GetPageReturnWarningDetailsInput, GetPageReturnWarningDetailsInputVO>(input); var vo = ObjectMapper.Map<GetPageReturnWarningDetailsInput, GetPageReturnWarningDetailsInputVO>(input);
var result = await _warningDetailsEsRepository.GetPageReturnWarningDetailsAsync(vo); 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:缓存优化 // todo:缓存优化
// 订单类型 // 订单类型
var orderTypeDict = await _orderRepository.GetTrackOrderTypeDictAsync(); var orderTypeDict = await _orderRepository.GetTrackOrderTypeDictAsync();

View File

@ -178,7 +178,10 @@ public class TransportWarningService : ApplicationService
var result = await _warningDetailsEsRepository.GetPageTransportWarningDetailsAsync(vo); var result = await _warningDetailsEsRepository.GetPageTransportWarningDetailsAsync(vo);
if (result.List.Count == 0) 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, sorted,
result.Pagination.PageIndex, result.Pagination.PageIndex,
result.Pagination.PageSize, result.Pagination.PageSize,
sorted.Count); result.Pagination.Total);
// 通知用户提取用户名称 // 通知用户提取用户名称
string ToUserNames(string notifyUsers) string ToUserNames(string notifyUsers)

View File

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