轨迹标记也添加选中

src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs

@@ -55,6 +55,11 @@
         /// </summary>
         public int SubSystemId { get; set; }
 
+        /// <summary>
+        /// 选中的轨迹标记id
+        /// </summary>
+        public List<int>? SelectIds {  get; set; }
+
         ///// <summary>
         ///// 关键字
         ///// </summary>

src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs

@@ -13,6 +13,11 @@ namespace SJZY.Track.Domain.Dtos.TrackFlags
         /// </summary>
         public int SubSystemId { get; set; }
 
+        /// <summary>
+        /// 选中的轨迹标记id
+        /// </summary>
+        public List<int>? SelectIds { get; set; }
+
         ///// <summary>
         ///// 关键字
         ///// </summary>

src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs

@@ -62,6 +62,7 @@ public class TrackContentRepository : BasicRepository<TrackContentEntity>, ITrac
                 (a, b, c, d, e, f) => a.Code.Contains(input.Keywords) || a.Content.Contains(input.Keywords)
                 || a.EnContent.Contains(input.Keywords)
                                 )
+            .OrderByDescending((a, b, c, d, e, f) => a.CreateTime)
             .Select((a, b, c, d, e, f) => new GetTrackContentListVO
             {
                 Id = a.Id,

src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs

@@ -46,6 +46,8 @@ public class TrackFlagRepository : BasicRepository<TrackFlagEntity>, ITrackFlagR
             .LeftJoin<VUserEntity>((a, b, c) => a.CreateUserId == c.Id)
             .LeftJoin<VUserEntity>((a, b, c, d) => a.UpdateUserId == d.Id)
             .WhereIF(input.SubSystemId > 0, (a, b, c, d) => a.SubSystemId == input.SubSystemId)
+            .OrderByIF(input.SelectIds.IsNullOrEmpty(), (a, b, c, d) => a.CreateTime, OrderByType.Desc)
+            .OrderByIF(!input.SelectIds.IsNullOrEmpty(), (a, b, c, d) => SqlFunc.IIF(input.SelectIds.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), a.CreateTime), OrderByType.Desc)
             .Select((a, b, c, d) => new GetTrackFlagListVO
             {
                 Id = a.Id,
@@ -56,8 +58,7 @@ public class TrackFlagRepository : BasicRepository<TrackFlagEntity>, ITrackFlagR
                 CreateTime = a.CreateTime,
                 CreateUser = c.Name,
                 UpdateTime = a.UpdateTime,
-                UpdateUser = d.Name,
+                UpdateUser = d.Name
-
             })
             .ToPagedListAsync(input.PageIndex, input.PageSize);
 

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

@@ -45,7 +45,8 @@ public class TrackStatusRepository : BasicRepository<TrackStatusEntity>, ITrackS
             .WhereIF(!input.Keywords.IsNullOrWhiteSpace(),
                 (a, b, c, d) => a.Status.Contains(input.Keywords) || a.EnStatus.Contains(input.Keywords) ||
                                 a.Code.Contains(input.Keywords))
-            .OrderByIF(!input.SelectIds.IsNullOrEmpty(), (a, b) => SqlFunc.IIF(input.SelectIds.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), a.CreateTime), OrderByType.Desc)
+            .OrderByIF(input.SelectIds.IsNullOrEmpty(), (a, b, c, d) => a.CreateTime, OrderByType.Desc)
+            .OrderByIF(!input.SelectIds.IsNullOrEmpty(), (a, b, c, d) => SqlFunc.IIF(input.SelectIds.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), a.CreateTime), OrderByType.Desc)
             .Select((a, b, c, d) => new GetTrackStatusListVO
             {
                 Id = a.Id,

src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs

@@ -47,6 +47,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.SelectIds.IsNullOrEmpty(), (a, b) => a.CreateTime,OrderByType.Desc)
             .OrderByIF(!input.SelectIds.IsNullOrEmpty(), (a, b) => SqlFunc.IIF(input.SelectIds.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), a.CreateTime), OrderByType.Desc)
             .Select((a, b) => new GetTrackTemplateListVO
             {