Merge branch 'S01-轨迹中台' into dev

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

@@ -41,6 +41,11 @@
         /// 轨迹标记id
         /// </summary>
         public int TrackFlagId { get; set; }
+
+        /// <summary>
+        /// 是否完结
+        /// </summary>
+        public bool IsFinish {  get; set; }
     }
 
     public class GetTrackContentDetailDto
@@ -94,5 +99,10 @@
         /// 轨迹标记
         /// </summary>
         public string TrackFlag { get; set; }
+
+        /// <summary>
+        /// 是否完结
+        /// </summary>
+        public bool IsFinish { get; set; }
     }
 }

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

@@ -84,5 +84,10 @@
         /// 修改人
         /// </summary>
         public string UpdateUser { get; set; }
+
+        /// <summary>
+        /// 是否完结
+        /// </summary>
+        public bool IsFinish { get; set; }
     }
 }

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

@@ -27,10 +27,10 @@
         /// </summary>
         public string? Code { get; set; }
 
-        /// <summary>
-        /// 是否完结
-        /// </summary>
-        public bool IsFinish { get; set; }
+        ///// <summary>
+        ///// 是否完结
+        ///// </summary>
+        //public bool IsFinish { get; set; }
     }
 
     public class GetTrackFlagDetailDto
@@ -60,9 +60,9 @@
         /// </summary>
         public string Flag { get; set; }
 
-        /// <summary>
-        /// 是否完结
-        /// </summary>
-        public bool IsFinish { get; set; }
+        ///// <summary>
+        ///// 是否完结
+        ///// </summary>
+        //public bool IsFinish { get; set; }
     }
 }

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

@@ -22,10 +22,10 @@
         /// </summary>
         public string Flag { get; set; }
 
-        /// <summary>
-        /// 是否完结
-        /// </summary>
-        public bool IsFinish { get; set; }
+        ///// <summary>
+        ///// 是否完结
+        ///// </summary>
+        //public bool IsFinish { get; set; }
 
         /// <summary>
         /// 创建时间

src/SJZY.Track.Application/AutoMapper/TrackContentAutoMapperProfile.cs

@@ -9,7 +9,8 @@ namespace SJZY.Track.Application.AutoMapper
     {
         public TrackContentAutoMapperProfile()
         {
-            CreateMap<EditTrackContentInput, TrackContentEntity>(MemberList.None);
+            CreateMap<EditTrackContentInput, TrackContentEntity>(MemberList.None)
+                .ForMember(dest => dest.IsCompleted, opt => opt.MapFrom(source => source.IsFinish));
             CreateMap<GetTrackContentDetailVO, GetTrackContentDetailDto>(MemberList.None);
             CreateMap<GetPageTrackContentInput, GetPageTrackContentVO>(MemberList.None);
             CreateMap<GetTrackContentListVO, GetTrackContentListDto>(MemberList.None);

src/SJZY.Track.Application/AutoMapper/TrackFlagAutoMapperProfile.cs

@@ -10,16 +10,12 @@ namespace SJZY.Track.Application.AutoMapper
         public TrackFlagAutoMapperProfile()
         {
             CreateMap<EditTrackFlagInput, TrackFlagEntity>(MemberList.None)
-                .ForMember(dest => dest.Name, opt => opt.MapFrom(source => source.Flag))
-                .ForMember(dest => dest.IsCompleted, opt => opt.MapFrom(source => source.IsFinish));
+                .ForMember(dest => dest.Name, opt => opt.MapFrom(source => source.Flag));
+                //.ForMember(dest => dest.IsCompleted, opt => opt.MapFrom(source => source.IsFinish));
             CreateMap<GetTrackFlagDetailVO, GetTrackFlagDetailDto>(MemberList.None);
             CreateMap<GetTrackFlagListVO, GetTrackFlagListDto>(MemberList.None);
             CreateMap<UnifyPageResultDto<GetTrackFlagListVO>, UnifyPageResultDto<GetTrackFlagListDto>>(MemberList.None);
             CreateMap<GetPageTrackFlagInput, GetPageTrackFlagVO>(MemberList.None);
-
-            //var pageResultDto =
-            //    ObjectMapper.Map<UnifyPageResultDto<GetTrackFlagListVO>, UnifyPageResultDto<GetTrackFlagListDto>>(
-            //        resultDto);
         }
     }
 }

src/SJZY.Track.Domain/Aggregates/TrackContentAggregate/TrackContentEntity.cs

@@ -47,4 +47,10 @@ public class TrackContentEntity : IFullAuditedBasicEntitys, IAggregateRoot
     /// </summary>
     [SugarColumn(ColumnName = "TrackStatusId")]
     public int TrackStatusId { get; set; }
+
+    /// <summary>
+    /// 是否完结
+    /// </summary>
+    [SugarColumn(ColumnName = "IsCompleted")]
+    public bool IsCompleted { get; set; }
 }

src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs

@@ -30,9 +30,9 @@ public class TrackFlagEntity : IFullAuditedBasicEntitys, IAggregateRoot
     [SugarColumn(ColumnName = "SubSystemId")]
     public int SubSystemId { get; set; }
 
-    /// <summary>
-    /// 是否完结
-    /// </summary>
-    [SugarColumn(ColumnName = "IsCompleted")]
-    public bool IsCompleted { get; set; }
+    ///// <summary>
+    ///// 是否完结
+    ///// </summary>
+    //[SugarColumn(ColumnName = "IsCompleted")]
+    //public bool IsCompleted { get; set; }
 }

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

@@ -90,5 +90,10 @@ namespace SJZY.Track.Domain.Dtos.TrackContents
         /// 修改人
         /// </summary>
         public string UpdateUser { get; set; }
+
+        /// <summary>
+        /// 是否完结
+        /// </summary>
+        public bool IsFinish { get; set; }
     }
 }

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

@@ -57,5 +57,10 @@ namespace SJZY.Track.Domain.Dtos.TrackContents
         /// 轨迹标记
         /// </summary>
         public string TrackFlag { get; set; }
+
+        /// <summary>
+        /// 是否完结
+        /// </summary>
+        public bool IsFinish { get; set; }
     }
 }

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

@@ -46,10 +46,10 @@ namespace SJZY.Track.Domain.Dtos.TrackFlags
         /// </summary>
         public string Flag { get; set; }
 
-        /// <summary>
-        /// 是否完结
-        /// </summary>
-        public bool IsFinish { get; set; }
+        ///// <summary>
+        ///// 是否完结
+        ///// </summary>
+        //public bool IsFinish { get; set; }
 
         /// <summary>
         /// 创建时间

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

@@ -33,9 +33,9 @@ namespace SJZY.Track.Domain.Dtos.TrackFlags
         /// </summary>
         public string Flag { get; set; }
 
-        /// <summary>
-        /// 是否完结
-        /// </summary>
-        public bool IsFinish { get; set; }
+        ///// <summary>
+        ///// 是否完结
+        ///// </summary>
+        //public bool IsFinish { get; set; }
     }
 }

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

@@ -74,7 +74,7 @@ public class TrackQueries : ISugarRepository, ITrackQueries,
                 Content = b.Content,
                 EnContent = b.EnContent,
                 Status = c.Status,
-                IsCompleted = d.IsCompleted
+                IsCompleted = b.IsCompleted
             })
             .FirstAsync();
     }

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

@@ -37,7 +37,8 @@ public class TrackContentRepository : BasicRepository<TrackContentEntity>, ITrac
                 Content = a.Content,
                 EnContent = a.EnContent,
                 TrackFlagId = a.TrackFlagId,
-                TrackFlag = c.Name
+                TrackFlag = c.Name,
+                IsFinish = a.IsCompleted
             })
             .FirstAsync();
         return detail;
@@ -79,7 +80,8 @@ public class TrackContentRepository : BasicRepository<TrackContentEntity>, ITrac
                 CreateTime = a.CreateTime,
                 CreateUser = e.Name,
                 UpdateTime = a.UpdateTime,
-                UpdateUser = f.Name
+                UpdateUser = f.Name,
+                IsFinish= a.IsCompleted
             })
             .ToPagedListAsync(input.PageIndex, input.PageSize);
 

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

@@ -26,8 +26,8 @@ public class TrackFlagRepository : BasicRepository<TrackFlagEntity>, ITrackFlagR
                 SubSystemId = a.SubSystemId,
                 SubSystem = b.CnName,
                 Code = a.Code,
-                Flag = a.Name,
-                IsFinish=a.IsCompleted
+                Flag = a.Name
+                //,IsFinish=a.IsCompleted
             })
             .FirstAsync();
         return detail;
@@ -54,7 +54,7 @@ public class TrackFlagRepository : BasicRepository<TrackFlagEntity>, ITrackFlagR
                 SubSystem = b.CnName,
                 Code = a.Code,
                 Flag = a.Name,
-                IsFinish=a.IsCompleted,
+                //IsFinish=a.IsCompleted,
                 CreateTime = a.CreateTime,
                 CreateUser = c.Name,
                 UpdateTime = a.UpdateTime,