Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台

src/SJZY.Track.Api/appsettings.json

@@ -1,6 +1,6 @@
 {
   "Configuration": {
-    "UseLocalConfiguration": true, //是否使用本地配置文件
+    "UseLocalConfiguration": false, //是否使用本地配置文件
     "ConfiguraFileName": "appsettings.Development.json", //指定配置文件名称，开启UseLocalConfiguration时生效
     "Apollo": {
       "AppId": "SJZY.Track.Configuration",
@@ -9,12 +9,12 @@
       "MetaServer": "http://apollo-service-test-apollo-configservice.apollo.svc.cluster.local:8080",
       "ConfigServer": [ "http://apollo-service-test-apollo-configservice.apollo.svc.cluster.local:8080" ]
     }
-    },
-    "Kestrel": {
-      "EndPoints": {
-        "Http": {
-          "Url": "http://*:5056"
-        }
+  },
+  "Kestrel": {
+    "EndPoints": {
+      "Http": {
+        "Url": "http://*:5056"
       }
     }
   }
+}

src/SJZY.Track.Domain/Dtos/Common/KeywordsInputVO.cs

@@ -15,5 +15,5 @@ public class KeywordsInputVO : PageInfoInput
     /// <summary>
     /// 选中项
     /// </summary>
-    public List<int>? SelectedId { get; set; }
+    public List<int>? SelectedIds { get; set; }
 }

src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentDetailOutputVO.cs

@@ -38,4 +38,9 @@ public class GetTrackTemplateContentDetailOutputVO
     /// 轨迹状态id
     /// </summary>
     public int TrackStatusId { get; set; }
+
+    /// <summary>
+    /// 轨迹模板id
+    /// </summary>
+    public int TrackTemplateId { get; set; }
 }

src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageInputVO.cs

@@ -6,4 +6,9 @@ public class GetTrackTemplateContentPageInputVO : PageInfoInput
     /// 轨迹模板id
     /// </summary>
     public List<int> TrackTemplateIds { get; set; }
+
+    /// <summary>
+    /// 选中项
+    /// </summary>
+    public List<int>? SelectedIds { get; set; }
 }

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

@@ -85,7 +85,8 @@ public class TrackTemplateRepository : BasicRepository<TrackTemplateEntity>, ITr
                     templateContent.UpdateUserId == updateUser.Id && !updateUser.IsDeleted)
             .Filter(null, true)
             .Where(templateContent => input.TrackTemplateIds.Contains(templateContent.TrackTemplateId) && !templateContent.IsDeleted)
-            .OrderByDescending(templateContent => templateContent.CreateTime)
+            .OrderByIF(input.SelectedIds.IsNullOrEmpty(), templateContent => templateContent.CreateTime, OrderByType.Desc)
+            .OrderByIF(!input.SelectedIds.IsNullOrEmpty(), templateContent => SqlFunc.IIF(input.SelectedIds.Contains(templateContent.TrackContentId), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), templateContent.CreateTime), OrderByType.Desc)
             .Select((templateContent, trackContent, trackStatus, enumValue, trackFlag, createUser, updateUser) =>
                 new GetTrackTemplateContentPageOutputVO
                 {