fix:修复新增轨迹时轨迹内容为空字符串没有使用默认的轨迹内容
fix:修复运输时效预警明细最新轨迹发生地反参错误
This commit is contained in:
parent
d2dd8e6eb1
commit
569aeece66
@ -386,8 +386,8 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
|
|||||||
|
|
||||||
//允许二次修改,在修改了轨迹内容后进行修改轨迹操作,如果输入的轨迹内容则以输入为准
|
//允许二次修改,在修改了轨迹内容后进行修改轨迹操作,如果输入的轨迹内容则以输入为准
|
||||||
//跨子系统?
|
//跨子系统?
|
||||||
track.TrackContent = @event.Content ?? trackContent.TrackContent;
|
track.TrackContent = string.IsNullOrWhiteSpace(@event.Content) ? trackContent.TrackContent : @event.Content;
|
||||||
track.TrackEnContent = @event.EnStatus ?? trackContent.TrackEnContent;
|
track.TrackEnContent = string.IsNullOrWhiteSpace(@event.EnStatus) ? trackContent.TrackEnContent : @event.EnStatus;
|
||||||
//S06新增
|
//S06新增
|
||||||
track.IsVisibility = @event.IsVisibility;
|
track.IsVisibility = @event.IsVisibility;
|
||||||
//当传入的IsExternal为空,则使用轨迹内容中的IsExternal
|
//当传入的IsExternal为空,则使用轨迹内容中的IsExternal
|
||||||
@ -435,8 +435,8 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
|
|||||||
TrackStatusCode = trackContent.TrackStatusCode,
|
TrackStatusCode = trackContent.TrackStatusCode,
|
||||||
//跨子系统?
|
//跨子系统?
|
||||||
TrackContentId = trackContent.TrackContentId,
|
TrackContentId = trackContent.TrackContentId,
|
||||||
TrackContent = @event.Content ?? trackContent.TrackContent,
|
TrackContent = string.IsNullOrWhiteSpace(@event.Content) ? trackContent.TrackContent : @event.Content,
|
||||||
TrackEnContent = @event.EnStatus ?? trackContent.TrackEnContent,
|
TrackEnContent = string.IsNullOrWhiteSpace(@event.EnStatus) ? trackContent.TrackEnContent : @event.EnStatus,
|
||||||
//S06新增轨迹明细字段
|
//S06新增轨迹明细字段
|
||||||
IsVisibility = @event.IsVisibility,
|
IsVisibility = @event.IsVisibility,
|
||||||
//当传入的IsExternal为空,则使用轨迹内容中的IsExternal
|
//当传入的IsExternal为空,则使用轨迹内容中的IsExternal
|
||||||
|
|||||||
@ -224,7 +224,7 @@ public class TransportWarningService : ApplicationService
|
|||||||
LatestTrackContent = orderIdTrack?.TrackContent,
|
LatestTrackContent = orderIdTrack?.TrackContent,
|
||||||
LatestTrackTime = orderIdTrack?.TrackTime,
|
LatestTrackTime = orderIdTrack?.TrackTime,
|
||||||
LatestTrackTimeZone = FormatTimeZone(orderIdTrack?.TrackTimeZone),
|
LatestTrackTimeZone = FormatTimeZone(orderIdTrack?.TrackTimeZone),
|
||||||
LatestTrackPlace = orderIdTrack?.TrackContent,
|
LatestTrackPlace = orderIdTrack?.TrackPlace,
|
||||||
|
|
||||||
// 起始轨迹
|
// 起始轨迹
|
||||||
StartTrackStatus = x.StartTrackStatus,
|
StartTrackStatus = x.StartTrackStatus,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user