添加字段回显

src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs

@@ -119,4 +119,19 @@ public class GetTrackContentDetailDto
     /// 是否对外
     /// </summary>
     public bool IsExternal { get; set; }
+
+    /// <summary>
+    /// 是否可重复
+    /// </summary>
+    public bool IsRepeatable { get; set; }
+
+    /// <summary>
+    /// 是否允许手动修改
+    /// </summary>
+    public bool IsAllowManuallyUpdate { get; set; }
+
+    /// <summary>
+    /// 是否允许手动创建
+    /// </summary>
+    public bool IsAllowManuallyCreate { get; set; }
 }

src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs

@@ -282,6 +282,7 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
                     CreateTime = DateTime.Now,
                     //来源轨迹内容,第一次新增的时候使用轨迹内容表提供的
                     TrackStatus = trackContent.TrackStatus,
+                    TrackStatusCode = trackContent.TrackStatusCode,
                     TrackContent = trackContent.TrackContent,
                     TrackEnContent = trackContent.TrackEnContent,
                     //新增轨迹明细字段

src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs

@@ -199,12 +199,13 @@ public class TrackOrderService : ApplicationService
         var trackDetails = await _trackDetailsEsRepository.GetListAsync(order.Id);
         res.Data = new List<GetDetailTimelineOutput>();
         var isCompleted = false;
-        foreach (var item in trackDetails.OrderBy(m => m.CreateTime).ToList())
+        foreach (var item in trackDetails)
         {
-            var currentTrackStatus = trackStatus.FirstOrDefault(m => m.Code == item.TrackStatus);
+            var currentTrackStatus = trackStatus.FirstOrDefault(m => m.Code == item.TrackStatusCode);
 
             //是否完结
-            isCompleted = currentTrackStatus?.IsCompleted == true;
+            if (!isCompleted)
+                isCompleted = currentTrackStatus is { IsCompleted: true };
 
             //如果是内部系统，且轨迹内容不对外则跳过这条轨迹内容
             if (system.SystemProperty == 1 && item.IsVisibility)
@@ -219,7 +220,7 @@ public class TrackOrderService : ApplicationService
                 TrackTime = ToUnixTimestamp(item.TrackTime),
                 TrackPlace = item.TrackPlace,
                 EnContent = item.TrackEnContent,
-                Files = item.Files?.Any() == true
+                Files = item.Files == null
                     ? new List<TrackFileItem>()
                     : item.Files!.Select(m => new TrackFileItem()
                     {

src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs

@@ -37,6 +37,11 @@ public class TrackDetailsIndex : IdBaseIndex
     /// </summary>
     public string TrackStatus { get; set; } = GlobalConst.EmptyString;
 
+    /// <summary>
+    /// 轨迹状态code
+    /// </summary>
+    public string TrackStatusCode { get; set; } = GlobalConst.EmptyString;
+
     /// <summary>
     /// 轨迹内容代码
     /// </summary>

src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs

@@ -56,4 +56,18 @@ public class GetTrackContentDetailVO
     /// 是否对外
     /// </summary>
     public bool IsExternal { get; set; }
+    /// <summary>
+    /// 是否可重复
+    /// </summary>
+    public bool IsRepeatable { get; set; }
+
+    /// <summary>
+    /// 是否允许手动修改
+    /// </summary>
+    public bool IsAllowManuallyUpdate { get; set; }
+
+    /// <summary>
+    /// 是否允许手动创建
+    /// </summary>
+    public bool IsAllowManuallyCreate { get; set; }
 }

src/SJZY.Track.Domain/Dtos/TrackContents/TrackContentVO.cs

@@ -31,4 +31,9 @@ public class TrackContentVO
     /// 是否完成态
     /// </summary>
     public bool IsCompleted { get; set; }
+
+    /// <summary>
+    /// 轨迹状态代码
+    /// </summary>
+    public string TrackStatusCode { get; set; }
 }

src/SJZY.Track.Repository/Queries/ProvideQueries.cs

@@ -87,6 +87,7 @@ public class ProvideQueries : ISugarRepository, IProvideQueries, ITransientDepen
                 SubSystemCode = z.Key,
                 TrackStatusId = x.TrackStatusId,
                 TrackStatus = y.Status,
+                TrackStatusCode = y.Code,
                 TrackContent = x.Content,
                 TrackEnContent = x.EnContent,
                 IsCompleted = y.IsCompleted,

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

@@ -33,6 +33,9 @@ public class TrackContentRepository : BasicRepository<TrackContentEntity>, ITrac
                 EnContent = a.EnContent,
                 TrackFlagId = a.TrackFlagId,
                 IsExternal = a.IsExternal,
+                IsRepeatable = a.IsRepeatable,
+                IsAllowManuallyUpdate = a.IsAllowManuallyUpdate,
+                IsAllowManuallyCreate = a.IsAllowManuallyCreate
             })
             .Mapper(x => { x.TrackFlagIds = x.TrackFlagId?.Split(',').Select(int.Parse).ToList(); })
             .FirstAsync();