diff --git a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPushPullParamsConfigEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPushPullParamsConfigEntity.cs index a603ad65..59ea07e1 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPushPullParamsConfigEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackPullAggregate/TrackPushPullParamsConfigEntity.cs @@ -12,12 +12,6 @@ public class TrackPushPullParamsConfigEntity : IFullAuditedBasicEntitys, IEntity [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } - /// - /// 扩展字段参数名 - /// - [SugarColumn(ColumnName = "ExpandFieldsName")] - public string ExpandFieldsName { get; set; } - /// /// 推拉模式,0拉取,1推送 /// @@ -28,7 +22,7 @@ public class TrackPushPullParamsConfigEntity : IFullAuditedBasicEntitys, IEntity /// 单号参数名 /// [SugarColumn(ColumnName = "OrderNoName")] - public string OrderNoName { get; set; } + public string OrderNoName { get; set; } = null!; /// /// 推拉配置id @@ -40,53 +34,59 @@ public class TrackPushPullParamsConfigEntity : IFullAuditedBasicEntitys, IEntity /// 轨迹时区参数名 /// [SugarColumn(ColumnName = "TrackTimeZoneName")] - public string TrackTimeZoneName { get; set; } + public string? TrackTimeZoneName { get; set; } /// /// 轨迹代码参数名 /// [SugarColumn(ColumnName = "TrackContentCodeName")] - public string TrackContentCodeName { get; set; } + public string? TrackContentCodeName { get; set; } /// /// 轨迹内容参数名 /// [SugarColumn(ColumnName = "TrackContentName")] - public string TrackContentName { get; set; } + public string? TrackContentName { get; set; } /// /// 轨迹内容英文参数名 /// [SugarColumn(ColumnName = "TrackEnContentName")] - public string TrackEnContentName { get; set; } + public string? TrackEnContentName { get; set; } /// /// 轨迹发生地参数名 /// [SugarColumn(ColumnName = "TrackPlaceName")] - public string TrackPlaceName { get; set; } + public string? TrackPlaceName { get; set; } /// /// 轨迹状态参数名 /// [SugarColumn(ColumnName = "TrackStatusName")] - public string TrackStatusName { get; set; } + public string? TrackStatusName { get; set; } /// /// 轨迹发生时间参数名 /// [SugarColumn(ColumnName = "TrackTimeName")] - public string TrackTimeName { get; set; } + public string? TrackTimeName { get; set; } /// /// 订单路径 /// [SugarColumn(ColumnName = "OrderPath")] - public string OrderPath { get; set; } + public string? OrderPath { get; set; } /// /// 轨迹明细路径 /// [SugarColumn(ColumnName = "TrackDetailsPath")] - public string TrackDetailsPath { get; set; } + public string? TrackDetailsPath { get; set; } + + /// + /// 扩展字段参数名 + /// + [SugarColumn(ColumnName = "ExpandFieldsName")] + public string? ExpandFieldsName { get; set; } } \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs index f9bbdaba..05d748fe 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackPull/GetTrackPullContentDetailOutputVO.cs @@ -5,14 +5,14 @@ public class GetTrackPullContentDetailOutputVO /// /// 轨迹内容代码 /// - public string Code { get; set; } + public string Code { get; set; } = null!; public int Id { get; set; } /// /// 拉取轨迹内容代码 /// - public string TrackContentCodeValue { get; set; } + public string? TrackContentCodeValue { get; set; } /// /// 轨迹内容id @@ -22,12 +22,12 @@ public class GetTrackPullContentDetailOutputVO /// /// 拉取轨迹内容 /// - public string TrackContentValue { get; set; } + public string? TrackContentValue { get; set; } /// /// 拉取轨迹关键字(正向) /// - public string TrackKeyword { get; set; } + public string? TrackKeyword { get; set; } /// /// 拉取轨迹关键字(正向) @@ -37,7 +37,7 @@ public class GetTrackPullContentDetailOutputVO /// /// 拉取轨迹关键字(反向) /// - public string TrackKeywordReverse { get; set; } + public string? TrackKeywordReverse { get; set; } /// /// 拉取轨迹关键字(反向) @@ -57,10 +57,15 @@ public class GetTrackPullContentDetailOutputVO /// /// 拉取轨迹状态 /// - public string TrackStatusValue { get; set; } + public string? TrackStatusValue { get; set; } /// /// 拉取轨迹时区 /// public double? TrackTimeZone { get; set; } + + /// + /// 是否完结 + /// + public bool IsCompleted { get; set; } } \ No newline at end of file