From b4e0621a37ed07a75bd2d59a94f856d1dc9e2fc2 Mon Sep 17 00:00:00 2001
From: moyongzhen <2534173414@qq.com>
Date: Tue, 27 Feb 2024 15:59:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E6=A8=A1=E7=89=88=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TrackTemplates/TrackTemplateService.cs    |  6 ++--
 .../Services/TrackTemplateRepository.cs       | 30 ++++++++++++++++---
 .../ValueObjects/GetTrackTemplateDetailVO.cs  |  2 +-
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs b/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs
index 1ea21e22..eaa7d010 100644
--- a/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs
+++ b/src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs
@@ -13,6 +13,9 @@ using Volo.Abp.ObjectMapping;
 
 namespace SJZY.Track.Application.Services.TrackTemplates
 {
+    /// <summary>
+    /// 轨迹模版
+    /// </summary>
     [ApiExplorerSettings(GroupName = "轨迹模版")]
     [Route("/Track")]
     public class TrackTemplateService : ApplicationService, ITrackTemplateService, IScopedDependency
@@ -49,8 +52,7 @@ namespace SJZY.Track.Application.Services.TrackTemplates
         /// <returns></returns>
         [HttpGet("/Template/GetDetail")]
         public async Task<UnifyResultDto<GetTrackTemplateDetailDto>> GetDetailAsync(int id)
-        {
-            //var detailInfo = await _trackTemplateRepository.GetFirstAsync(a => a.Id== id);
+        {            
             var detailInfo = await _trackTemplateRepository.GetDetailAsync(id);
             if (detailInfo==null)
             {
diff --git a/src/SJZY.Track.Repository/TrackTemplate/Services/TrackTemplateRepository.cs b/src/SJZY.Track.Repository/TrackTemplate/Services/TrackTemplateRepository.cs
index 7b3432a6..7a91300d 100644
--- a/src/SJZY.Track.Repository/TrackTemplate/Services/TrackTemplateRepository.cs
+++ b/src/SJZY.Track.Repository/TrackTemplate/Services/TrackTemplateRepository.cs
@@ -1,5 +1,6 @@
 using SJZY.Track.Repository.TrackTemplate.Entitys;
 using SJZY.Track.Repository.TrackTemplate.ValueObjects;
+using SJZY.Track.Repository.VData.Entitys;
 
 namespace SJZY.Track.Repository.TrackTemplate.Services
 {
@@ -16,9 +17,19 @@ namespace SJZY.Track.Repository.TrackTemplate.Services
         /// <returns></returns>
         public async Task<GetTrackTemplateDetailVO> GetDetailAsync(int id)
         {
-            //await Context.Queryable<TrackTemplateEntity>().LeftJoin<>
+            var detail = await Context.Queryable<TrackTemplateEntity>().LeftJoin<VSystemEntity>((a, b) => a.SubSystemId==b.Id)
+                 .Where((a, b) => a.Id==id)
+                .Select((a, b) => new
+                GetTrackTemplateDetailVO
+                {
+                    Id = a.Id,
+                    Code = a.Code,
+                    Name = a.Name,
+                    SubSystemId = a.SubSystemId,
+                    SubSystem=b.CnName
+                }).FirstAsync();
 
-            return new  GetTrackTemplateDetailVO();
+            return detail;
         }
 
 
@@ -29,8 +40,19 @@ namespace SJZY.Track.Repository.TrackTemplate.Services
         /// <returns></returns>
         public async Task<UnifyPageResultDto<GetTrackTemplateListVO>> GetPageTrackTemplate(GetPageTrackTemplateVO input)
         {
-
-            return null;
+            var pagedList = await Context.Queryable<TrackTemplateEntity>().LeftJoin<VSystemEntity>((a, b) => a.SubSystemId==b.Id)
+                   .WhereIF(input.SubSystemId>0, (a, b) => a.SubSystemId==input.SubSystemId)
+                   .WhereIF(!input.Keywords.IsNullOrWhiteSpace(), (a, b) => a.Name.Contains(input.Keywords)|| a.Code.Contains(input.Keywords))
+                   .Select((a, b) => new GetTrackTemplateListVO
+                   {
+                       Id=a.Id,
+                       Code=a.Code,
+                       CreateTime= a.CreateTime,
+                       Name = a.Name,
+                       SubSystem = b.CnName
+                   })
+                   .ToPagedListAsync(input.PageIndex, input.PageSize);
+            return pagedList;
         }
     }
 }
diff --git a/src/SJZY.Track.Repository/TrackTemplate/ValueObjects/GetTrackTemplateDetailVO.cs b/src/SJZY.Track.Repository/TrackTemplate/ValueObjects/GetTrackTemplateDetailVO.cs
index 1ec9565f..b5393e84 100644
--- a/src/SJZY.Track.Repository/TrackTemplate/ValueObjects/GetTrackTemplateDetailVO.cs
+++ b/src/SJZY.Track.Repository/TrackTemplate/ValueObjects/GetTrackTemplateDetailVO.cs
@@ -65,6 +65,6 @@ namespace SJZY.Track.Repository.TrackTemplate.ValueObjects
         /// <summary>
         /// 创建时间
         /// </summary>
-        public DateTime CreateTime { get; set; }
+        public DateTime? CreateTime { get; set; }
     }
 }