Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台

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>
     /// 创建时间开始

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>
         /// 创建时间开始

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),