From 2603cd1ac46c93f41308a647e55ba1bd3bcc2dab Mon Sep 17 00:00:00 2001
From: moyongzhen <2534173414@qq.com>
Date: Thu, 29 Feb 2024 19:45:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=B6=EF=BC=8C=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=BF=85=E9=A1=BB?=
 =?UTF-8?q?=E5=8A=A0=3F=E5=8F=AF=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TrackContents/EditTrackContentInput.cs    |  6 ++--
 .../Dtos/TrackStatus/EditTrackStatusInput.cs  |  6 ++--
 .../Dtos/TrackTemplates/GetTrackDetailDto.cs  |  4 +--
 src/SJZY.Track.Repository/OrderRepository.cs  | 29 +++++++++++++------
 4 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/SJZY.Track.Application/Dtos/TrackContents/EditTrackContentInput.cs b/src/SJZY.Track.Application/Dtos/TrackContents/EditTrackContentInput.cs
index 23294dfe..9879ffb8 100644
--- a/src/SJZY.Track.Application/Dtos/TrackContents/EditTrackContentInput.cs
+++ b/src/SJZY.Track.Application/Dtos/TrackContents/EditTrackContentInput.cs
@@ -31,17 +31,17 @@ namespace SJZY.Track.Application.Dtos.TrackContents
         /// <summary>
         /// 轨迹内容代码
         /// </summary>
-        public string Code { get; set; }
+        public string? Code { get; set; }
 
         /// <summary>
         /// 轨迹内容
         /// </summary>
-        public string Content { get; set; }
+        public string? Content { get; set; }
 
         /// <summary>
         /// 轨迹内容英文
         /// </summary>
-        public string EnContent { get; set; }
+        public string? EnContent { get; set; }
 
         /// <summary>
         /// 轨迹标记id
diff --git a/src/SJZY.Track.Application/Dtos/TrackStatus/EditTrackStatusInput.cs b/src/SJZY.Track.Application/Dtos/TrackStatus/EditTrackStatusInput.cs
index a77a4f1c..ce9a0ebf 100644
--- a/src/SJZY.Track.Application/Dtos/TrackStatus/EditTrackStatusInput.cs
+++ b/src/SJZY.Track.Application/Dtos/TrackStatus/EditTrackStatusInput.cs
@@ -31,16 +31,16 @@ namespace SJZY.Track.Application.Dtos.TrackStatus
         /// <summary>
         /// 轨迹状态代码
         /// </summary>
-        public string Code { get; set; }
+        public string? Code { get; set; }
 
         /// <summary>
         /// 轨迹状态
         /// </summary>
-        public string TrackStatus { get; set; }
+        public string? TrackStatus { get; set; }
 
         /// <summary>
         /// 轨迹状态英文
         /// </summary>
-        public string EntrackStatus { get; set; }
+        public string? EntrackStatus { get; set; }
     }
 }
diff --git a/src/SJZY.Track.Application/Dtos/TrackTemplates/GetTrackDetailDto.cs b/src/SJZY.Track.Application/Dtos/TrackTemplates/GetTrackDetailDto.cs
index 6269ba0b..f4ac73d8 100644
--- a/src/SJZY.Track.Application/Dtos/TrackTemplates/GetTrackDetailDto.cs
+++ b/src/SJZY.Track.Application/Dtos/TrackTemplates/GetTrackDetailDto.cs
@@ -85,11 +85,11 @@
         /// <summary>
         /// 模板名称
         /// </summary>
-        public string Name { set; get; }
+        public string? Name { set; get; }
 
         /// <summary>
         /// 模板代码
         /// </summary>
-        public string Code { set; get; }
+        public string? Code { set; get; }
     }
 }
diff --git a/src/SJZY.Track.Repository/OrderRepository.cs b/src/SJZY.Track.Repository/OrderRepository.cs
index 98a60b5f..3196cbdd 100644
--- a/src/SJZY.Track.Repository/OrderRepository.cs
+++ b/src/SJZY.Track.Repository/OrderRepository.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using SJZY.Track.Domain;
 using SJZY.Track.Domain.Aggregates.OrderAggregate;
+using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate;
 using SJZY.Track.Domain.Dtos.Order;
 
 namespace SJZY.Track.Repository;
@@ -81,16 +82,26 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
     public async Task<UnifyPageResultDto<TrackOrderVO>> GetPageTrackOrder(GetPageTrackOrderInputVO input)
     {
         //await Context.Queryable<OrderEntity, OrderTemplateEntity>((a,b)= );
-        await Context.Queryable<OrderEntity, OrderTemplateEntity>((a, b) => new JoinQueryInfos(JoinType.Left, a.Id==b.OrderId))
-            .GroupBy((a, b) => new { a.Id })
-            .Select((a, b) => new TrackOrderVO
-            {
-                Id=a.Id,
-                OrderNumber=a.OrderNo,
-                
-                
+        //await Context.Queryable<OrderEntity, OrderTemplateEntity>((a, b) => new JoinQueryInfos(JoinType.Left, a.Id==b.OrderId))
+        //    .GroupBy((a, b) => new { a.Id })
+        //    .Select((a, b) => new TrackOrderVO
+        //    {
+        //        Id=a.Id,
+        //        OrderNumber=a.OrderNo,
+        //        TrackTemplateNames = SqlFunc.AggregateConcat(b.)
 
-            }).ToPageListAsync(input.PageIndex, input.PageSize);
+
+        //    }).ToPageListAsync(input.PageIndex, input.PageSize);
+
+        //await Context.Queryable<OrderEntity>()
+        //    .Includes(a => a.OrderTemplates)
+        //    .Select(a => new TrackOrderVO
+        //    {
+        //        Id=a.Id,
+        //        OrderNumber=a.OrderNo,
+        //        TrackTemplateNames = SqlFunc.Subqueryable<OrderTemplateEntity>().Where(z=>z.OrderId==a.Id).SelectStringJoin(z=>z.)
+        //    })
+        //    .ToPageListAsync(input.PageIndex, input.PageSize);
 
         return null;
     }