fix: 修复查询轨迹内容时缺失是否对外字段,导致的新增/修改轨迹,中的轨迹明细缺省值错误
fix: 修复中台内部查询轨迹明细接口,中的是否对外标识错误
This commit is contained in:
parent
6e059604d6
commit
d585f799bd
@ -141,24 +141,6 @@ public class TrackOrderService : ApplicationService
|
|||||||
|
|
||||||
var list = ObjectMapper.Map<List<TrackDetailsIndex>, List<TrackOrderDetailDto>>(trackDetails);
|
var list = ObjectMapper.Map<List<TrackDetailsIndex>, List<TrackOrderDetailDto>>(trackDetails);
|
||||||
|
|
||||||
var trackCodes = list.Select(x => x.Code)
|
|
||||||
.Where(x => x != GlobalConst.EmptyString)
|
|
||||||
.Distinct()
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
// 是否对外
|
|
||||||
if (!trackCodes.IsNullOrEmpty())
|
|
||||||
{
|
|
||||||
var trackContents = await _trackContentRepository.GetListAsync(x =>
|
|
||||||
x.SubSystemId == order.SubSystemId && trackCodes.Contains(x.Code), x => new
|
|
||||||
{
|
|
||||||
x.Code,
|
|
||||||
x.IsExternal
|
|
||||||
});
|
|
||||||
|
|
||||||
list.ForEach(x => x.IsExternal = trackContents.FirstOrDefault(y => y.Code == x.Code)?.IsExternal ?? false);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 计算时区
|
// 计算时区
|
||||||
list.ForEach(a =>
|
list.ForEach(a =>
|
||||||
{
|
{
|
||||||
|
|||||||
@ -186,12 +186,15 @@ public class OrderEntity : IFullAuditedBasicEntitys, IAggregateRoot
|
|||||||
[SugarColumn(ColumnName = "TemplateCodes")]
|
[SugarColumn(ColumnName = "TemplateCodes")]
|
||||||
public string? TemplateCodes { get; set; }
|
public string? TemplateCodes { get; set; }
|
||||||
|
|
||||||
[SugarColumn(IsIgnore = true)] public List<OrderFlightEntity> OrderFlights { get; set; }
|
[SugarColumn(IsIgnore = true)]
|
||||||
|
public List<OrderFlightEntity> OrderFlights { get; set; }
|
||||||
|
|
||||||
[SugarColumn(IsIgnore = true)] public List<OrderPullStatusEntity> OrderPullStatus { get; set; }
|
[SugarColumn(IsIgnore = true)]
|
||||||
|
public List<OrderPullStatusEntity> OrderPullStatus { get; set; }
|
||||||
|
|
||||||
[Navigate(NavigateType.OneToMany, nameof(OrderPlatformNumberEntity.OrderId))]
|
[Navigate(NavigateType.OneToMany, nameof(OrderPlatformNumberEntity.OrderId))]
|
||||||
[SugarColumn(IsIgnore = true)] public List<OrderPlatformNumberEntity> OrderPlatformNumbers { get; set; }
|
[SugarColumn(IsIgnore = true)]
|
||||||
|
public List<OrderPlatformNumberEntity> OrderPlatformNumbers { get; set; }
|
||||||
|
|
||||||
public void ResetTrackInfo()
|
public void ResetTrackInfo()
|
||||||
{
|
{
|
||||||
|
|||||||
@ -115,6 +115,7 @@ public class ProvideQueries : ISugarRepository, IProvideQueries, ITransientDepen
|
|||||||
TrackEnContent = x.EnContent,
|
TrackEnContent = x.EnContent,
|
||||||
IsCompleted = y.IsCompleted,
|
IsCompleted = y.IsCompleted,
|
||||||
IsRepeatable = x.IsRepeatable,
|
IsRepeatable = x.IsRepeatable,
|
||||||
|
IsExternal = x.IsExternal,
|
||||||
IsAllowManuallyUpdate = x.IsAllowManuallyUpdate,
|
IsAllowManuallyUpdate = x.IsAllowManuallyUpdate,
|
||||||
IsAllowManuallyCreate = x.IsAllowManuallyCreate,
|
IsAllowManuallyCreate = x.IsAllowManuallyCreate,
|
||||||
IsToMq = y.IsToMq || k.IsToMq,
|
IsToMq = y.IsToMq || k.IsToMq,
|
||||||
@ -142,6 +143,7 @@ public class ProvideQueries : ISugarRepository, IProvideQueries, ITransientDepen
|
|||||||
TrackEnContent = x.EnContent,
|
TrackEnContent = x.EnContent,
|
||||||
IsCompleted = y.IsCompleted,
|
IsCompleted = y.IsCompleted,
|
||||||
IsRepeatable = x.IsRepeatable,
|
IsRepeatable = x.IsRepeatable,
|
||||||
|
IsExternal = x.IsExternal,
|
||||||
IsAllowManuallyUpdate = x.IsAllowManuallyUpdate,
|
IsAllowManuallyUpdate = x.IsAllowManuallyUpdate,
|
||||||
IsAllowManuallyCreate = x.IsAllowManuallyCreate,
|
IsAllowManuallyCreate = x.IsAllowManuallyCreate,
|
||||||
IsToMq = y.IsToMq || k.IsToMq,
|
IsToMq = y.IsToMq || k.IsToMq,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user