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(MemberList.None); CreateMap(MemberList.None); - CreateMap, UnifyPageResultDto>(MemberList.None); + CreateMap, UnifyPageResultDto>(MemberList.None); + CreateMap(MemberList.None); + + //var pageResultDto = + // ObjectMapper.Map, UnifyPageResultDto>( + // 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 /// public int SubSystemId { get; set; } - /// - /// 关键字 - /// - public string keywords { get; set; } + ///// + ///// 关键字 + ///// + //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 /// /// 是否完结 /// - [SugarColumn(ColumnName = "SubSystemId")] + [SugarColumn(ColumnName = "IsCompleted")] public bool IsCompleted { get; set; } } \ No newline at end of file