From b95ca01d620cdf1be516f9af30a9317597da8801 Mon Sep 17 00:00:00 2001
From: moyongzhen <2534173414@qq.com>
Date: Sat, 2 Mar 2024 14:20:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E8=AE=A2=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=20=20=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=95=B0=E7=BB=84?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dtos/ProvideServices/GetPageTrackOrderInput.cs        | 7 ++++++-
 .../Dtos/Order/GetPageTrackOrderInputVO.cs                | 8 +++++++-
 src/SJZY.Track.Repository/Repositories/OrderRepository.cs | 8 +++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

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
     /// </summary>
     public int SubSystemId { get; set; }
 
+    ///// <summary>
+    ///// 单号
+    ///// </summary>
+    //public List<string>? OrderNos { get; set; }
+
     /// <summary>
     /// 单号
     /// </summary>
-    public List<string>? OrderNos { get; set; }
+    public string? OrderNos {  get; set; }
 
     /// <summary>
     /// 创建时间开始
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
         /// </summary>
         public int SubSystemId { get; set; }
 
+        ///// <summary>
+        ///// 单号
+        ///// </summary>
+        //public List<string>? OrderNos { get; set; }
+
+
         /// <summary>
         /// 单号
         /// </summary>
-        public List<string>? OrderNos { get; set; }
+        public string? OrderNos { get; set; }
 
         /// <summary>
         /// 创建时间开始
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<OrderEntity>, IOrderRepository, I
     /// <returns></returns>
     public async Task<UnifyPageResultDto<TrackOrderVO>> GetPageTrackOrder(GetPageTrackOrderInputVO input)
     {
+        List<string> orderNoList = new List<string>();
+        if (!input.OrderNos.IsNullOrWhiteSpace())
+        {
+            orderNoList  =  input.OrderNos.Split(new char[] { ',', '，', ':', '：' }).ToList();
+        }
+
         var pageList = await Context.Queryable<OrderEntity>()
             .LeftJoin<VExternalSubjectEntity>((a, b) => a.CustomId == b.Id && b.IsDeleted == false)
             .LeftJoin<VSystemEntity>((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),