diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs
index 7ae6fd7a..ee323b86 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs
@@ -7,10 +7,15 @@ public class GetPageTrackOrderInput : PageInfoInput
///
public int SubSystemId { get; set; }
+ /////
+ ///// 单号
+ /////
+ //public List? OrderNos { get; set; }
+
///
/// 单号
///
- public List? OrderNos { get; set; }
+ public string? OrderNos { get; set; }
///
/// 创建时间开始
diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
index 35ad2966..b32b1327 100644
--- a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
+++ b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
@@ -13,10 +13,16 @@ namespace SJZY.Track.Domain.Dtos.Order
///
public int SubSystemId { get; set; }
+ /////
+ ///// 单号
+ /////
+ //public List? OrderNos { get; set; }
+
+
///
/// 单号
///
- public List? OrderNos { get; set; }
+ public string? OrderNos { get; set; }
///
/// 创建时间开始
diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
index ed618ea4..77fd218d 100644
--- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
@@ -101,11 +101,17 @@ public class OrderRepository : BasicRepository, IOrderRepository, I
///
public async Task> GetPageTrackOrder(GetPageTrackOrderInputVO input)
{
+ List orderNoList = new List();
+ if (!input.OrderNos.IsNullOrWhiteSpace())
+ {
+ orderNoList = input.OrderNos.Split(new char[] { ',', ',', ':', ':' }).ToList();
+ }
+
var pageList = await Context.Queryable()
.LeftJoin((a, b) => a.CustomId == b.Id && b.IsDeleted == false)
.LeftJoin((a, b, c) => a.SubSystemId == c.Id && c.IsDeleted == false)
.WhereIF(input.SubSystemId > 0, (a, b, c) => a.SubSystemId == input.SubSystemId)
- .WhereIF(!input.OrderNos.IsNullOrEmpty(), (a, b, c) => input.OrderNos.Contains(a.OrderNo))
+ .WhereIF(!orderNoList.IsNullOrEmpty(), (a, b, c) => orderNoList.Contains(a.OrderNo))
.WhereIF(input.CreateTimeStart.HasValue && input.CreateTimeEnd.HasValue,
(a, b, c) => a.CreateTime >= input.CreateTimeStart && a.CreateTime <= input.CreateTimeEnd)
.WhereIF(input.CreateTimeStart.HasValue && (!input.CreateTimeEnd.HasValue),