update: 下拉轨迹内容增加推送操作类型,返回所有轨迹内容,
- 补充逻辑:删除行为下拉,过滤外部服务商轨迹
This commit is contained in:
parent
4e87546ed1
commit
f694364754
@ -13,7 +13,7 @@ public class GetAvailableContentInput
|
|||||||
public string? OrderNo { get; set; }
|
public string? OrderNo { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 操作类型 1=创建 2=修改 3=删除
|
/// 操作类型 1=创建 2=修改 3=删除 4=推送
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public TrackOptionType TrackOptionType { get; set; }
|
public TrackOptionType TrackOptionType { get; set; }
|
||||||
}
|
}
|
||||||
@ -22,5 +22,6 @@ public enum TrackOptionType
|
|||||||
{
|
{
|
||||||
创建 = 1,
|
创建 = 1,
|
||||||
修改 = 2,
|
修改 = 2,
|
||||||
删除 = 3
|
删除 = 3,
|
||||||
|
推送 = 4,
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,6 +14,7 @@ using SJZY.Track.Domain.Aggregates.TrackStatusAggregate;
|
|||||||
using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate;
|
using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate;
|
||||||
using SJZY.Track.Domain.Dtos.TrackContents;
|
using SJZY.Track.Domain.Dtos.TrackContents;
|
||||||
using SJZY.Track.Domain.Dtos.TrackTemplate;
|
using SJZY.Track.Domain.Dtos.TrackTemplate;
|
||||||
|
using SJZY.Track.Domain.Enums;
|
||||||
using SJZY.Track.Domain.Queries;
|
using SJZY.Track.Domain.Queries;
|
||||||
|
|
||||||
namespace SJZY.Track.Application.Services.TrackContents;
|
namespace SJZY.Track.Application.Services.TrackContents;
|
||||||
@ -292,6 +293,12 @@ public class TrackContentService : ApplicationService
|
|||||||
//获取轨迹详情
|
//获取轨迹详情
|
||||||
var trackDetails = await _trackDetailsEsRepository.GetListAsync(order.Id);
|
var trackDetails = await _trackDetailsEsRepository.GetListAsync(order.Id);
|
||||||
|
|
||||||
|
// 删除时去除掉外部服务商轨迹
|
||||||
|
if (input.TrackOptionType == TrackOptionType.删除)
|
||||||
|
{
|
||||||
|
trackDetails = trackDetails.Where(m => m.Source != (int) TrackSourceEnum.ExternalServiceProvide).ToList();
|
||||||
|
}
|
||||||
|
|
||||||
//获取当前子系统下所有的轨迹内容
|
//获取当前子系统下所有的轨迹内容
|
||||||
var contentList = await _trackContentRepository.GetListBySystemIdAsync(input.SystemId);
|
var contentList = await _trackContentRepository.GetListBySystemIdAsync(input.SystemId);
|
||||||
if (contentList == null)
|
if (contentList == null)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user