fix
This commit is contained in:
parent
58cbc028fc
commit
2a68e5a6f5
@ -7,7 +7,7 @@ public class EditTrackContentMapInput
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 映射应用
|
/// 映射应用
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? MapAppKey { get; set; }
|
public string? MapAppKey { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 映射轨迹内容代码
|
/// 映射轨迹内容代码
|
||||||
@ -27,7 +27,7 @@ public class EditTrackContentMapInput
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 源应用
|
/// 源应用
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? AppKey { get; set; }
|
public string? AppKey { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 源轨迹内容代码
|
/// 源轨迹内容代码
|
||||||
|
|||||||
@ -10,7 +10,7 @@ public class GetPageCompleteWarningDetailsInput : PageInfoInput
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 应用
|
/// 应用
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? AppKey { get; set; }
|
public string? AppKey { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单号,限制1000个
|
/// 订单号,限制1000个
|
||||||
|
|||||||
@ -10,7 +10,7 @@ public class GetPageReturnWarningDetailsInput : PageInfoInput
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 应用
|
/// 应用
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? AppKey { get; set; }
|
public string? AppKey { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单号,限制1000个
|
/// 订单号,限制1000个
|
||||||
@ -32,7 +32,7 @@ public class GetPageReturnWarningDetailsInput : PageInfoInput
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 客户
|
/// 客户
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Customer { get; set; }
|
public string? Customer { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 轨迹状态id
|
/// 轨迹状态id
|
||||||
|
|||||||
@ -10,7 +10,7 @@ public class GetPageTransportWarningDetailsInput : PageInfoInput
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 应用
|
/// 应用
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? AppKey { get; set; }
|
public string? AppKey { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单号,限制1000个
|
/// 订单号,限制1000个
|
||||||
@ -31,7 +31,7 @@ public class GetPageTransportWarningDetailsInput : PageInfoInput
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 客户
|
/// 客户
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Customer { get; set; }
|
public string? Customer { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 预警名称
|
/// 预警名称
|
||||||
|
|||||||
@ -10,5 +10,5 @@ public class QueryAreaRequest : PageInfoInput
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 应用
|
/// 应用
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? AppKey { get; set; }
|
public string? AppKey { get; set; }
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,7 +5,7 @@ public class GetPageCompleteWarningDetailsInputVO : PageInfoInput
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 应用
|
/// 应用
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? AppKey { get; set; }
|
public string? AppKey { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单号
|
/// 订单号
|
||||||
@ -26,7 +26,7 @@ public class GetPageCompleteWarningDetailsInputVO : PageInfoInput
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 客户
|
/// 客户
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Customer { get; set; }
|
public string? Customer { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 缺失轨迹状态id
|
/// 缺失轨迹状态id
|
||||||
|
|||||||
@ -8,7 +8,7 @@ public class GetPageReturnWarningDetailsInputVO : PageInfoInput
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 应用
|
/// 应用
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? AppKey { get; set; }
|
public string? AppKey { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单号
|
/// 订单号
|
||||||
|
|||||||
@ -8,7 +8,7 @@ public class GetPageTransportWarningDetailsInputVO : PageInfoInput
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 应用
|
/// 应用
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? AppKey { get; set; }
|
public string? AppKey { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单号
|
/// 订单号
|
||||||
@ -28,7 +28,7 @@ public class GetPageTransportWarningDetailsInputVO : PageInfoInput
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 客户
|
/// 客户
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Customer { get; set; }
|
public string? Customer { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 预警名称
|
/// 预警名称
|
||||||
|
|||||||
@ -37,7 +37,7 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien
|
|||||||
c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(input.OrderNos)));
|
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.AppKey > 0, c => c.Term(f => f.AppKey, input.AppKey));
|
musts.AddIf(x => !x.AppKey.IsNullOrWhiteSpace(), c => c.Term(f => f.AppKey, input.AppKey));
|
||||||
musts.AddIf(x => !string.IsNullOrWhiteSpace(x.WarningName),
|
musts.AddIf(x => !string.IsNullOrWhiteSpace(x.WarningName),
|
||||||
c => c.Match(f => f.Field(d => d.WarningName).Query(input.WarningName)));
|
c => c.Match(f => f.Field(d => d.WarningName).Query(input.WarningName)));
|
||||||
musts.AddIf(x => x.CreateTimeStart.HasValue,
|
musts.AddIf(x => x.CreateTimeStart.HasValue,
|
||||||
@ -355,7 +355,7 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien
|
|||||||
ListWrapperFactory.CreateListWrapper<ReturnWarningDetailsIndex, GetPageReturnWarningDetailsInputVO>(input);
|
ListWrapperFactory.CreateListWrapper<ReturnWarningDetailsIndex, GetPageReturnWarningDetailsInputVO>(input);
|
||||||
|
|
||||||
// 精确匹配
|
// 精确匹配
|
||||||
musts.AddIf(x => x.AppKey > 0, c => c.Term(f => f.AppKey, input.AppKey));
|
musts.AddIf(x => !x.AppKey.IsNullOrWhiteSpace(), c => c.Term(f => f.AppKey, input.AppKey));
|
||||||
musts.AddIf(x => x.OrderNos?.Count > 0,
|
musts.AddIf(x => x.OrderNos?.Count > 0,
|
||||||
c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(input.OrderNos)));
|
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));
|
||||||
@ -738,7 +738,7 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien
|
|||||||
var musts = ListWrapperFactory
|
var musts = ListWrapperFactory
|
||||||
.CreateListWrapper<CompleteWarningDetailsIndex, GetPageCompleteWarningDetailsInputVO>(input);
|
.CreateListWrapper<CompleteWarningDetailsIndex, GetPageCompleteWarningDetailsInputVO>(input);
|
||||||
|
|
||||||
musts.AddIf(x => x.AppKey > 0, c => c.Term(f => f.AppKey, input.AppKey));
|
musts.AddIf(x => !x.AppKey.IsNullOrWhiteSpace(), c => c.Term(f => f.AppKey, input.AppKey));
|
||||||
musts.AddIf(x => x.OrderNos?.Count > 0,
|
musts.AddIf(x => x.OrderNos?.Count > 0,
|
||||||
c => c.Terms(f => f.Field(d => d.OrderNo.Suffix("keyword")).Terms(input.OrderNos)));
|
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));
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user