From 25bed79bf615556635d71d9da1adfac86f2499d3 Mon Sep 17 00:00:00 2001
From: moyongzhen <2534173414@qq.com>
Date: Wed, 28 Feb 2024 17:19:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=86=E9=A1=B5=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E8=BD=A8=E8=BF=B9=E6=A8=A1=E7=89=88=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TrackTemplateAutoMapperProfile.cs         |  8 +--
 .../TrackContents/TrackContentService.cs      |  1 -
 .../TrackTemplateRepository.cs                | 50 +++----------------
 3 files changed, 12 insertions(+), 47 deletions(-)

diff --git a/src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs
index 94219051..cec240ac 100644
--- a/src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs
+++ b/src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs
@@ -3,6 +3,7 @@ using AutoMapper.Internal.Mappers;
 using SJZY.Track.Application.Dtos.TrackTemplates;
 using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate;
 using SJZY.Track.Domain.Dtos.TrackTemplate;
+using Volo.Abp.ObjectMapping;
 
 namespace SJZY.Track.Application.AutoMapper;
 
@@ -14,11 +15,10 @@ public class TrackTemplateAutoMapperProfile : Profile
     public TrackTemplateAutoMapperProfile()
     {
         CreateMap<GetTrackTemplateDetailVO, GetTrackTemplateDetailDto>(MemberList.None);
-
-        //CreateMap<UnifyResultDto<GetTrackTemplateDetailVO>, UnifyResultDto<GetTrackTemplateDetailDto>>(MemberList.None);
-
         CreateMap<EditTrackTemplateContentInput, TrackTemplateContentEntity>(MemberList.None);
-
         CreateMap<EditTrackTemplateInput, TrackTemplateEntity>(MemberList.None);
+        CreateMap<GetPageTrackTemplateInput, GetPageTrackTemplateVO>(MemberList.None);
+        CreateMap<GetTrackTemplateListVO, GetTrackTemplateListDto>(MemberList.None);
+        CreateMap<UnifyPageResultDto<GetTrackTemplateListVO>, UnifyPageResultDto<GetTrackTemplateListDto>>(MemberList.None);        
     }
 }
\ No newline at end of file
diff --git a/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs b/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs
index 95504518..86116173 100644
--- a/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs
+++ b/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs
@@ -34,7 +34,6 @@ namespace SJZY.Track.Application.Services.TrackContents
         /// </summary>
         /// <returns></returns>
         [HttpPost("Edit")]
-        [AllowAnonymous]
         public async Task<UnifyResultDto> EditAsync(EditTrackContentInput input)
         {
             return input.Options switch
diff --git a/src/SJZY.Track.Repository/TrackTemplateRepository.cs b/src/SJZY.Track.Repository/TrackTemplateRepository.cs
index 1424b6df..d853725a 100644
--- a/src/SJZY.Track.Repository/TrackTemplateRepository.cs
+++ b/src/SJZY.Track.Repository/TrackTemplateRepository.cs
@@ -30,13 +30,13 @@ public class TrackTemplateRepository : BasicRepository<TrackTemplateEntity>, ITr
             .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();
+            {
+                Id = a.Id,
+                Code = a.Code,
+                Name = a.Name,
+                SubSystemId = a.SubSystemId,
+                SubSystem = b.CnName
+            }).FirstAsync();
 
         return detail;
     }
@@ -54,6 +54,7 @@ public class TrackTemplateRepository : BasicRepository<TrackTemplateEntity>, ITr
             .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))
+            .OrderByIF(input.TrackTemplateId>0, (a, b) => SqlFunc.IIF(a.Id==input.TrackTemplateId, SqlFunc.DateAdd(SqlFunc.GetDate(), 1), a.CreateTime), OrderByType.Desc)
             .Select((a, b) => new GetTrackTemplateListVO
             {
                 Id = a.Id,
@@ -63,41 +64,6 @@ public class TrackTemplateRepository : BasicRepository<TrackTemplateEntity>, ITr
                 SubSystem = b.CnName
             })
             .ToPagedListAsync(input.PageIndex, input.PageSize);
-        //如果轨迹模版id传值了，就置顶在第一条
-        if (input.TrackTemplateId > 0 && (!pagedList.List.IsNullOrEmpty()))
-        {
-            if (input.PageIndex == 1)
-            {
-                bool existCurrent = pagedList.List.Any(x => x.Id == input.TrackTemplateId);
-                if (existCurrent)
-                {
-                    var item = pagedList.List.FirstOrDefault(x => x.Id == input.TrackTemplateId);
-                    pagedList.List.Remove(item);
-                    pagedList.List.Insert(0, item);
-                }
-                else
-                {
-                    var item = await Context.Queryable<TrackTemplateEntity>()
-                        .LeftJoin<VSystemEntity>((a, b) => a.SubSystemId == b.Id)
-                        .Where((a, b) => a.Id == input.TrackTemplateId)
-                        .Select((a, b) => new GetTrackTemplateListVO
-                        {
-                            Id = a.Id,
-                            Code = a.Code,
-                            CreateTime = a.CreateTime,
-                            Name = a.Name,
-                            SubSystem = b.CnName
-                        })
-                        .FirstAsync();
-                    if (item != null)
-                    {
-                        var removeItem = pagedList.List.LastOrDefault();
-                        pagedList.List.Remove(removeItem);
-                        pagedList.List.Insert(0, item);
-                    }
-                }
-            }
-        }
 
         return pagedList;
     }