轨迹订单查询

src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs

@@ -4,6 +4,7 @@ using SJZY.Track.Application.Dtos.ProvideServices;
 using SJZY.Track.Domain.Aggregates.OrderAggregate;
 using SJZY.Track.Domain.Dtos.Order;
 using System.Diagnostics;
+using Volo.Abp.ObjectMapping;
 
 namespace SJZY.Track.Application.AutoMapper;
 
@@ -21,6 +22,6 @@ public class OrderAutoMapperProfile : Profile
 
         CreateMap<GetPageTrackOrderInput, GetPageTrackOrderInputVO>(MemberList.None);
         CreateMap<TrackOrderVO, TrackOrderDto>(MemberList.None);
-        CreateMap<UnifyPageResultDto<TrackOrderVO>, UnifyPageResultDto<TrackOrderDto>>(MemberList.None);        
+        CreateMap<UnifyPageResultDto<TrackOrderVO>, UnifyPageResultDto<TrackOrderDto>>(MemberList.None);
     }
 }

src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs

@@ -16,7 +16,7 @@ namespace SJZY.Track.Domain.Dtos.Order
         /// <summary>
         /// 单号
         /// </summary>
-        public List<string> OrderNos { get; set; }
+        public List<string>? OrderNos { get; set; }
 
         /// <summary>
         /// 创建时间开始
@@ -26,7 +26,7 @@ namespace SJZY.Track.Domain.Dtos.Order
         /// <summary>
         /// 创建时间截止
         /// </summary>
-        public DateTime? createTimeEnd { get; set; }
+        public DateTime? CreateTimeEnd { get; set; }
     }
 
     /// <summary>
@@ -64,10 +64,10 @@ namespace SJZY.Track.Domain.Dtos.Order
         /// </summary>
         public string? CustomerCode { get; set; }
 
-        /// <summary>
+        ///// <summary>
-        /// 订单明细（json）
+        ///// 订单明细（json）
-        /// </summary>
+        ///// </summary>
-        public string? OrderDetails { get; set; }
+        //public string? OrderDetails { get; set; }
 
         /// <summary>
         /// 最新轨迹内容

src/SJZY.Track.Infrastructure/Repositories/OrderRepository.cs

@@ -88,6 +88,11 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
         var pageList = await Context.Queryable<OrderEntity>()
               .LeftJoin<VExternalSubjectEntity>((a, b) => a.CustomId==b.Id)
               .LeftJoin<VSystemEntity>((a, b, c) => a.SubSystemId==c.Id)
+              .WhereIF(input.SubSystemId > 0, (a, b, c) => a.SubSystemId == input.SubSystemId)
+              .WhereIF(!input.OrderNos.IsNullOrEmpty(), (a, b, c) => input.OrderNos.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), (a, b, c) => a.CreateTime>= input.CreateTimeStart)
+              .WhereIF((!input.CreateTimeStart.HasValue)&& input.CreateTimeEnd.HasValue, (a, b, c) => a.CreateTime<= input.CreateTimeEnd)
               .Select((a, b, c) => new TrackOrderVO
               {
                   Id = a.Id,
@@ -95,8 +100,8 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
                   OrderType = a.OrderType,
                   CustomerShortName= b.Abbreviation,
                   CustomerCode= b.Code,
-                  TrackTemplateNames = "",
+                  TrackTemplateNames = SqlFunc.Subqueryable<OrderTemplateEntity>().LeftJoin<TrackTemplateEntity>((aa, bb) => aa.TrackTemplateId==bb.Id)
-                  OrderDetails="",
+                  .Where((aa, bb) => a.Id==aa.OrderId).SelectStringJoin((aa, bb) => bb.Name, ","),
                   NewestTrackContent= a.LatestTrackContent,
                   NewestTrackEnContent= a.LatestTrackEnContent,
                   NewestTrackPlace= a.LatestTrackPlace,
@@ -105,26 +110,26 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
                   SubSystem= c.CnName
               })
               .ToPagedListAsync(input.PageIndex, input.PageSize);
-
+        #region 暂时注释
-        if (pageList.List.Any())
+        //if (pageList.List.Any())
-        {
+        //{
-            var orderIds = pageList.List.Select(a => a.Id);
+        //    var orderIds = pageList.List.Select(a => a.Id);
-            //查询轨迹模版
+        //    //查询轨迹模版
 
 
-            var trackTemplateList = await Context.Queryable<OrderTemplateEntity>()
+        //    var trackTemplateList = await Context.Queryable<OrderTemplateEntity>()
-                 .LeftJoin<TrackTemplateEntity>((a, b) => a.TrackTemplateId==b.Id)
+        //         .LeftJoin<TrackTemplateEntity>((a, b) => a.TrackTemplateId==b.Id)
-                 .Where((a, b) => orderIds.Contains(a.OrderId))
+        //         .Where((a, b) => orderIds.Contains(a.OrderId))
-                 .Select((a, b) => new { OrderId = a.OrderId, Name = b.Name })
+        //         .Select((a, b) => new { OrderId = a.OrderId, Name = b.Name })
-                 .ToListAsync();
+        //         .ToListAsync();
-
-            pageList.List.ForEach(a =>
-            {
-                var templateListOfOrderId = trackTemplateList.Where(b => b.OrderId== a.Id);
-                a.TrackTemplateNames  = templateListOfOrderId.Select(c => c.Name).JoinAsString(",");
-            });
-        }
 
+        //    pageList.List.ForEach(a =>
+        //    {
+        //        var templateListOfOrderId = trackTemplateList.Where(b => b.OrderId== a.Id);
+        //        a.TrackTemplateNames  = templateListOfOrderId.Select(c => c.Name).JoinAsString(",");
+        //    });
+        //}
+        #endregion
         return pageList;
     }
 

src/SJZY.Track.Infrastructure/Repositories/TrackStatusRepository.cs

@@ -35,7 +35,7 @@ public class TrackStatusRepository : BasicRepository<TrackStatusEntity>, ITrackS
     }
 
     /// <summary>
-    /// 分页获取轨迹模版
+    /// 分页获取轨迹状态
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>