From c48e51c40b1ee29d9c82ae0120148a2785345130 Mon Sep 17 00:00:00 2001
From: moyongzhen <2534173414@qq.com>
Date: Thu, 29 Feb 2024 14:36:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AutoMapper/TrackFlagAutoMapperProfile.cs              | 7 ++++++-
 .../Dtos/TrackFlags/GetTrackFlagListDto.cs                | 8 ++++----
 src/SJZY.Track.Application/Localization/Resources/en.json | 3 ++-
 src/SJZY.Track.Application/Localization/Resources/zh.json | 3 ++-
 .../Aggregates/TrackFlagAggregate/TrackFlagEntity.cs      | 2 +-
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/SJZY.Track.Application/AutoMapper/TrackFlagAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackFlagAutoMapperProfile.cs
index a25177a4..acc0102a 100644
--- a/src/SJZY.Track.Application/AutoMapper/TrackFlagAutoMapperProfile.cs
+++ b/src/SJZY.Track.Application/AutoMapper/TrackFlagAutoMapperProfile.cs
@@ -24,7 +24,12 @@ namespace SJZY.Track.Application.AutoMapper
                  .ForMember(dest => dest.IsCompleted, opt => opt.MapFrom(source => source.IsFinish));
             CreateMap<GetTrackFlagDetailVO, GetTrackFlagDetailDto>(MemberList.None);
             CreateMap<GetTrackFlagListVO, GetTrackFlagListDto>(MemberList.None);
-            CreateMap<UnifyPageResultDto<GetTrackFlagListVO>, UnifyPageResultDto<GetTrackFlagListVO>>(MemberList.None);
+            CreateMap<UnifyPageResultDto<GetTrackFlagListVO>, UnifyPageResultDto<GetTrackFlagListDto>>(MemberList.None);
+            CreateMap<GetPageTrackFlagInput, GetPageTrackFlagVO>(MemberList.None);
+
+            //var pageResultDto =
+            //    ObjectMapper.Map<UnifyPageResultDto<GetTrackFlagListVO>, UnifyPageResultDto<GetTrackFlagListDto>>(
+            //        resultDto);
         }
     }
 }
diff --git a/src/SJZY.Track.Application/Dtos/TrackFlags/GetTrackFlagListDto.cs b/src/SJZY.Track.Application/Dtos/TrackFlags/GetTrackFlagListDto.cs
index 40097fdc..714203f2 100644
--- a/src/SJZY.Track.Application/Dtos/TrackFlags/GetTrackFlagListDto.cs
+++ b/src/SJZY.Track.Application/Dtos/TrackFlags/GetTrackFlagListDto.cs
@@ -61,9 +61,9 @@ namespace SJZY.Track.Application.Dtos.TrackFlags
         /// </summary>
         public int SubSystemId { get; set; }
 
-        /// <summary>
-        /// 关键字
-        /// </summary>
-        public string keywords { get; set; }
+        ///// <summary>
+        ///// 关键字
+        ///// </summary>
+        //public string Keywords { get; set; }
     }
 }
diff --git a/src/SJZY.Track.Application/Localization/Resources/en.json b/src/SJZY.Track.Application/Localization/Resources/en.json
index 7833f864..9e31fad8 100644
--- a/src/SJZY.Track.Application/Localization/Resources/en.json
+++ b/src/SJZY.Track.Application/Localization/Resources/en.json
@@ -6,6 +6,7 @@
     "ParameterDemo1": "{0} in {1} to do {2}",
     "TemplateExist": "The template code already exists under the currently selected subsystem",
     "TrackContentExist": "The trace code or trace content or trace content in the current subsystem is repeated in English",
-    "TrackStatusExist": "The trajectory status code or trajectory status or trajectory status in English is repeated under the current subsystem"
+    "TrackStatusExist": "The trajectory status code or trajectory status or trajectory status in English is repeated under the current subsystem",
+    "TrackFlagExist": "Duplicate code or flag in the current subsystem"
   }
 }
\ No newline at end of file
diff --git a/src/SJZY.Track.Application/Localization/Resources/zh.json b/src/SJZY.Track.Application/Localization/Resources/zh.json
index 7ef977fe..24a80165 100644
--- a/src/SJZY.Track.Application/Localization/Resources/zh.json
+++ b/src/SJZY.Track.Application/Localization/Resources/zh.json
@@ -6,6 +6,7 @@
     "ParameterDemo1": "{0}在{1}地方做了{2}动作",
     "TemplateExist": "模板代码已存在于当前选择的子系统下",
     "TrackContentExist": "当前子系统下轨迹代码或轨迹内容或轨迹内容英文重复",
-    "TrackStatusExist": "当前子系统下轨迹状态代码或轨迹状态或轨迹状态英文重复"
+    "TrackStatusExist": "当前子系统下轨迹状态代码或轨迹状态或轨迹状态英文重复",
+    "TrackFlagExist": "当前子系统下代码或标记重复"
   }
 }
\ No newline at end of file
diff --git a/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs
index 66a2a423..886b458c 100644
--- a/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs
+++ b/src/SJZY.Track.Domain/Aggregates/TrackFlagAggregate/TrackFlagEntity.cs
@@ -33,6 +33,6 @@ public class TrackFlagEntity : IFullAuditedBasicEntitys, IAggregateRoot
     /// <summary>
     /// 是否完结
     /// </summary>
-    [SugarColumn(ColumnName = "SubSystemId")]
+    [SugarColumn(ColumnName = "IsCompleted")]
     public bool IsCompleted { get; set; }
 }
\ No newline at end of file