Merge branch 'S07' into test

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/TrackTemplateContentDto.cs

@@ -46,7 +46,37 @@ public class TemplateContentDto
     public string Node { get; set; }
 
     /// <summary>
-    /// 排序键
+    /// 排序键和模板顺序一致
     /// </summary>
     public int Sort { get; set; }
+
+    /// <summary>
+    /// 是否对外
+    /// </summary>
+    public bool IsExternal { get; set; }
+
+    /// <summary>
+    /// 是否可重复
+    /// </summary>
+    public bool IsRepeatable { get; set; }
+
+    /// <summary>
+    /// 是否允许手动创建
+    /// </summary>
+    public bool IsAllowManuallyCreate { get; set; }
+
+    /// <summary>
+    /// 是否允许手动修改
+    /// </summary>
+    public bool IsAllowManuallyUpdate { get; set; }
+
+    /// <summary>
+    /// 是否广播
+    /// </summary>
+    public bool IsToMq { get; set; }
+
+    /// <summary>
+    /// 是否完成态
+    /// </summary>
+    public bool IsCompleted { get; set; }
 }

src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj

@@ -5,7 +5,7 @@
     <PropertyGroup>
         <TargetFramework>net7.0</TargetFramework>
         <GenerateDocumentationFile>True</GenerateDocumentationFile>
-        <Version>7.0.22</Version>
+        <Version>7.0.23</Version>
         <GenerateDocumentationFile>True</GenerateDocumentationFile>
     </PropertyGroup>
     <ItemGroup>

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

@@ -56,7 +56,37 @@ public class TemplateContentDtoVo
     public string Node { get; set; }
 
     /// <summary>
-    /// 排序键
+    /// 排序键和模板顺序一致
     /// </summary>
     public int Sort { get; set; }
+
+    /// <summary>
+    /// 是否对外
+    /// </summary>
+    public bool IsExternal { get; set; }
+
+    /// <summary>
+    /// 是否可重复
+    /// </summary>
+    public bool IsRepeatable { get; set; }
+
+    /// <summary>
+    /// 是否允许手动创建
+    /// </summary>
+    public bool IsAllowManuallyCreate { get; set; }
+
+    /// <summary>
+    /// 是否允许手动修改
+    /// </summary>
+    public bool IsAllowManuallyUpdate { get; set; }
+
+    /// <summary>
+    /// 是否广播
+    /// </summary>
+    public bool IsToMq { get; set; }
+
+    /// <summary>
+    /// 是否完成态
+    /// </summary>
+    public bool IsCompleted { get; set; }
 }

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

@@ -265,7 +265,13 @@ public class TrackTemplateRepository : BasicRepository<TrackTemplateEntity>, ITr
                 ContentEn = b.EnContent,
                 Status = c.Status,
                 Node = d.NodeName,
-                Sort = a.Sort
+                Sort = a.Sort,
+                IsExternal = b.IsExternal,
+                IsRepeatable = b.IsRepeatable,
+                IsAllowManuallyCreate = b.IsAllowManuallyCreate,
+                IsAllowManuallyUpdate = b.IsAllowManuallyUpdate,
+                IsToMq = c.IsToMq,
+                IsCompleted = c.IsCompleted
             })
             .ToPagedListAsync(input.PageIndex, input.PageSize);