|
@@ -13,6 +13,7 @@ using Microsoft.AspNetCore.Mvc;
|
|
using XF.Domain.Authentications;
|
|
using XF.Domain.Authentications;
|
|
using XF.Domain.Exceptions;
|
|
using XF.Domain.Exceptions;
|
|
using XF.Domain.Extensions;
|
|
using XF.Domain.Extensions;
|
|
|
|
+using XF.Utility.EnumExtensions;
|
|
|
|
|
|
namespace Hotline.Api.Controllers;
|
|
namespace Hotline.Api.Controllers;
|
|
|
|
|
|
@@ -37,7 +38,7 @@ public class OrderController : BaseController
|
|
_orderRepository = orderRepository;
|
|
_orderRepository = orderRepository;
|
|
_workflowApplication = workflowApplication;
|
|
_workflowApplication = workflowApplication;
|
|
_workflowDomainService = workflowDomainService;
|
|
_workflowDomainService = workflowDomainService;
|
|
- _hotSpotTypeRepository= hotSpotTypeRepository;
|
|
|
|
|
|
+ _hotSpotTypeRepository = hotSpotTypeRepository;
|
|
_mapper = mapper;
|
|
_mapper = mapper;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -79,7 +80,7 @@ public class OrderController : BaseController
|
|
{
|
|
{
|
|
var order = await _orderRepository.Queryable()
|
|
var order = await _orderRepository.Queryable()
|
|
.Includes(d => d.OrderComplain)
|
|
.Includes(d => d.OrderComplain)
|
|
- .Includes(d=>d.OrderReport)
|
|
|
|
|
|
+ .Includes(d => d.OrderReport)
|
|
.FirstAsync(d => d.Id == id);
|
|
.FirstAsync(d => d.Id == id);
|
|
var workflow = await _workflowDomainService.GetWorkflowAsync(WorkflowModuleConsts.Order, order.Id,
|
|
var workflow = await _workflowDomainService.GetWorkflowAsync(WorkflowModuleConsts.Order, order.Id,
|
|
withSupplements: true, cancellationToken: HttpContext.RequestAborted);
|
|
withSupplements: true, cancellationToken: HttpContext.RequestAborted);
|
|
@@ -135,9 +136,11 @@ public class OrderController : BaseController
|
|
{
|
|
{
|
|
return new
|
|
return new
|
|
{
|
|
{
|
|
- //ModuleOptions = WorkflowModule.Modules.ToList(),
|
|
|
|
- //GenderOptions = EnumExts.GetDescriptions<EHandlerType>(),
|
|
|
|
- //CountersignMode = EnumExts.GetDescriptions<ECountersignMode>().Where(d => d.Key != 1)
|
|
|
|
|
|
+ ChannelOptions = EnumExts.GetDescriptions<EChannel>(),
|
|
|
|
+ GenderOptions = EnumExts.GetDescriptions<EGender>(),
|
|
|
|
+ IdentityTypeOptions = EnumExts.GetDescriptions<EIdentityType>(),
|
|
|
|
+ LicenceTypeOptions = EnumExts.GetDescriptions<ELicenceType>(),
|
|
|
|
+ //AgeRangeOptions =
|
|
};
|
|
};
|
|
}
|
|
}
|
|
|
|
|
|
@@ -149,7 +152,7 @@ public class OrderController : BaseController
|
|
[HttpGet("hotspottype-list-parent")]
|
|
[HttpGet("hotspottype-list-parent")]
|
|
public async Task<List<HotSpotType>> GetHotSpotType(string? parentId)
|
|
public async Task<List<HotSpotType>> GetHotSpotType(string? parentId)
|
|
{
|
|
{
|
|
- return await _hotSpotTypeRepository.Queryable().Where(x => x.ParentId == parentId).ToListAsync();
|
|
|
|
|
|
+ return await _hotSpotTypeRepository.Queryable().Where(x => x.ParentId == parentId).ToListAsync();
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|