perf:查询预警明细模型入参更新
- 订单号转化为数组,限制最大长度1000
This commit is contained in:
parent
7f938c5a7d
commit
28381c6441
@ -1,3 +1,5 @@
|
|||||||
|
using System.ComponentModel.DataAnnotations;
|
||||||
|
|
||||||
namespace SJZY.Track.Application.Contract.Dtos.Warning.Complete;
|
namespace SJZY.Track.Application.Contract.Dtos.Warning.Complete;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -11,9 +13,10 @@ public class GetPageCompleteWarningDetailsInput : PageInfoInput
|
|||||||
public int? SubSystemId { get; set; }
|
public int? SubSystemId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单号,多个订单号(,分割)
|
/// 订单号,限制1000个
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string? OrderNos { get; set; }
|
[MaxLength(1000)]
|
||||||
|
public List<string>? OrderNos { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单类型
|
/// 订单类型
|
||||||
|
|||||||
@ -1,3 +1,5 @@
|
|||||||
|
using System.ComponentModel.DataAnnotations;
|
||||||
|
|
||||||
namespace SJZY.Track.Application.Contract.Dtos.Warning.Return;
|
namespace SJZY.Track.Application.Contract.Dtos.Warning.Return;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -11,9 +13,10 @@ public class GetPageReturnWarningDetailsInput : PageInfoInput
|
|||||||
public int? SubSystemId { get; set; }
|
public int? SubSystemId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单号,多个订单号(,分割)
|
/// 订单号,限制1000个
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string? OrderNos { get; set; }
|
[MaxLength(1000)]
|
||||||
|
public List<string>? OrderNos { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单类型
|
/// 订单类型
|
||||||
|
|||||||
@ -1,3 +1,5 @@
|
|||||||
|
using System.ComponentModel.DataAnnotations;
|
||||||
|
|
||||||
namespace SJZY.Track.Application.Contract.Dtos.Warning.Transport;
|
namespace SJZY.Track.Application.Contract.Dtos.Warning.Transport;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -11,9 +13,10 @@ public class GetPageTransportWarningDetailsInput : PageInfoInput
|
|||||||
public int? SubSystemId { get; set; }
|
public int? SubSystemId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单号,多个订单号(,分割)
|
/// 订单号,限制1000个
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string? OrderNos { get; set; }
|
[MaxLength(1000)]
|
||||||
|
public List<string>? OrderNos { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单类型
|
/// 订单类型
|
||||||
|
|||||||
@ -8,9 +8,9 @@ public class GetPageCompleteWarningDetailsInputVO : PageInfoInput
|
|||||||
public int? SubSystemId { get; set; }
|
public int? SubSystemId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单号,多个订单号(,分割)
|
/// 订单号
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string? OrderNos { get; set; }
|
public List<string>? OrderNos { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单类型
|
/// 订单类型
|
||||||
|
|||||||
@ -11,9 +11,9 @@ public class GetPageReturnWarningDetailsInputVO : PageInfoInput
|
|||||||
public int? SubSystemId { get; set; }
|
public int? SubSystemId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单号,多个订单号(,分割)
|
/// 订单号
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string? OrderNos { get; set; }
|
public List<string>? OrderNos { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单类型
|
/// 订单类型
|
||||||
|
|||||||
@ -11,9 +11,9 @@ public class GetPageTransportWarningDetailsInputVO : PageInfoInput
|
|||||||
public int? SubSystemId { get; set; }
|
public int? SubSystemId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单号,多个订单号(,分割)
|
/// 订单号
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string? OrderNos { get; set; }
|
public List<string>? OrderNos { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单类型
|
/// 订单类型
|
||||||
|
|||||||
@ -28,11 +28,9 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien
|
|||||||
{
|
{
|
||||||
var musts = ListWrapperFactory.CreateListWrapper<TransportWarningDetailsIndex, GetPageTransportWarningDetailsInputVO>(input);
|
var musts = ListWrapperFactory.CreateListWrapper<TransportWarningDetailsIndex, GetPageTransportWarningDetailsInputVO>(input);
|
||||||
|
|
||||||
var orderNos = input.OrderNos?.Split(',');
|
|
||||||
|
|
||||||
// 精确匹配
|
// 精确匹配
|
||||||
musts.AddIf(x => x.CustomId > 0, c => c.Term(f => f.CustomId, input.CustomId));
|
musts.AddIf(x => x.CustomId > 0, c => c.Term(f => f.CustomId, input.CustomId));
|
||||||
musts.AddIf(_ => orderNos?.Length > 0, c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(orderNos)));
|
musts.AddIf(x => x.OrderNos?.Count > 0, c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(input.OrderNos)));
|
||||||
musts.AddIf(x => x.OrderType > 0, c => c.Term(f => f.OrderType, input.OrderType));
|
musts.AddIf(x => x.OrderType > 0, c => c.Term(f => f.OrderType, input.OrderType));
|
||||||
musts.AddIf(x => x.Status > 0, c => c.Term(f => f.Status, input.Status));
|
musts.AddIf(x => x.Status > 0, c => c.Term(f => f.Status, input.Status));
|
||||||
musts.AddIf(x => x.SubSystemId > 0, c => c.Term(f => f.SubSystemId, input.SubSystemId));
|
musts.AddIf(x => x.SubSystemId > 0, c => c.Term(f => f.SubSystemId, input.SubSystemId));
|
||||||
@ -313,11 +311,9 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien
|
|||||||
{
|
{
|
||||||
var musts = ListWrapperFactory.CreateListWrapper<ReturnWarningDetailsIndex, GetPageReturnWarningDetailsInputVO>(input);
|
var musts = ListWrapperFactory.CreateListWrapper<ReturnWarningDetailsIndex, GetPageReturnWarningDetailsInputVO>(input);
|
||||||
|
|
||||||
var orderNos = input.OrderNos?.Split(',');
|
|
||||||
|
|
||||||
// 精确匹配
|
// 精确匹配
|
||||||
musts.AddIf(x => x.SubSystemId > 0, c => c.Term(f => f.SubSystemId, input.SubSystemId));
|
musts.AddIf(x => x.SubSystemId > 0, c => c.Term(f => f.SubSystemId, input.SubSystemId));
|
||||||
musts.AddIf(_ => orderNos?.Length > 0, c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(orderNos)));
|
musts.AddIf(x => x.OrderNos?.Count > 0, c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(input.OrderNos)));
|
||||||
musts.AddIf(x => x.OrderType > 0, c => c.Term(f => f.OrderType, input.OrderType));
|
musts.AddIf(x => x.OrderType > 0, c => c.Term(f => f.OrderType, input.OrderType));
|
||||||
musts.AddIf(x => x.Status > 0, c => c.Term(f => f.Status, input.Status));
|
musts.AddIf(x => x.Status > 0, c => c.Term(f => f.Status, input.Status));
|
||||||
musts.AddIf(x => x.CustomId > 0, c => c.Term(f => f.CustomId, input.CustomId));
|
musts.AddIf(x => x.CustomId > 0, c => c.Term(f => f.CustomId, input.CustomId));
|
||||||
@ -706,10 +702,8 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien
|
|||||||
{
|
{
|
||||||
var musts = ListWrapperFactory.CreateListWrapper<CompleteWarningDetailsIndex, GetPageCompleteWarningDetailsInputVO>(input);
|
var musts = ListWrapperFactory.CreateListWrapper<CompleteWarningDetailsIndex, GetPageCompleteWarningDetailsInputVO>(input);
|
||||||
|
|
||||||
var orderNos = input.OrderNos?.Split(',');
|
|
||||||
|
|
||||||
musts.AddIf(x => x.SubSystemId > 0, c => c.Term(f => f.SubSystemId, input.SubSystemId));
|
musts.AddIf(x => x.SubSystemId > 0, c => c.Term(f => f.SubSystemId, input.SubSystemId));
|
||||||
musts.AddIf(_ => orderNos?.Length > 0, c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(orderNos)));
|
musts.AddIf(x => x.OrderNos?.Count > 0, c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(input.OrderNos)));
|
||||||
musts.AddIf(x => x.OrderType > 0, c => c.Term(f => f.OrderType, input.OrderType));
|
musts.AddIf(x => x.OrderType > 0, c => c.Term(f => f.OrderType, input.OrderType));
|
||||||
musts.AddIf(x => x.Status > 0, c => c.Term(f => f.Status, input.Status));
|
musts.AddIf(x => x.Status > 0, c => c.Term(f => f.Status, input.Status));
|
||||||
musts.AddIf(x => x.CustomId > 0, c => c.Term(f => f.CustomId, input.CustomId));
|
musts.AddIf(x => x.CustomId > 0, c => c.Term(f => f.CustomId, input.CustomId));
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user