|
@@ -1,10 +1,20 @@
|
|
|
-using Hotline.Orders;
|
|
|
+using Hotline.Application.Orders;
|
|
|
+using Hotline.Caching.Services;
|
|
|
+using Hotline.FlowEngine.WorkflowModules;
|
|
|
+using Hotline.Orders;
|
|
|
using Hotline.Repository.SqlSugar.Extensions;
|
|
|
+using Hotline.Settings.TimeLimits;
|
|
|
+using Hotline.Settings;
|
|
|
using Hotline.Share.Dtos.Order;
|
|
|
+using Hotline.Share.Dtos.Order.CarbonCopy;
|
|
|
+using Hotline.Share.Enums.Order;
|
|
|
using Hotline.Share.Requests;
|
|
|
using MapsterMapper;
|
|
|
using Microsoft.AspNetCore.Mvc;
|
|
|
+using XF.Domain.Authentications;
|
|
|
using XF.Domain.Repository;
|
|
|
+using XF.Utility.EnumExtensions;
|
|
|
+using Hotline.Caching.Interfaces;
|
|
|
|
|
|
namespace Hotline.Api.Controllers.OrderModuleControllers
|
|
|
{
|
|
@@ -13,38 +23,51 @@ namespace Hotline.Api.Controllers.OrderModuleControllers
|
|
|
/// </summary>
|
|
|
public class OrderCarbonCopyController : BaseController
|
|
|
{
|
|
|
- private readonly IRepository<OrderCarboncopy> _orderccRepository;
|
|
|
+ private readonly IOrderCarbonCopyApplication _orderCarbonCopyApplication;
|
|
|
+ private readonly ISystemDicDataCacheManager _sysDicDataCacheManager;
|
|
|
private readonly IMapper _mapper;
|
|
|
|
|
|
public OrderCarbonCopyController(
|
|
|
- IRepository<OrderCarboncopy> orderccRepository,
|
|
|
+ IOrderCarbonCopyApplication orderCarbonCopyApplication,
|
|
|
+ ISystemDicDataCacheManager sysDicDataCacheManager,
|
|
|
IMapper mapper
|
|
|
)
|
|
|
{
|
|
|
- _orderccRepository = orderccRepository;
|
|
|
+ _orderCarbonCopyApplication = orderCarbonCopyApplication;
|
|
|
+ _sysDicDataCacheManager = sysDicDataCacheManager;
|
|
|
_mapper = mapper;
|
|
|
}
|
|
|
|
|
|
[HttpGet]
|
|
|
- public async Task<IReadOnlyList<OrderDto>> Query([FromQuery]PagedKeywordRequest dto)
|
|
|
+ public async Task<IReadOnlyList<OrderDto>> Query([FromQuery] QueryCarbonCopyRequest dto)
|
|
|
{
|
|
|
- var orderccs = await _orderccRepository.Queryable()
|
|
|
- .Includes(d => d.Order)
|
|
|
- //todo 按照抄送权限查询
|
|
|
- //.Where(d=> !string.IsNullOrEmpty())
|
|
|
- .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Order.No == dto.Keyword)
|
|
|
+ var orderccs = await _orderCarbonCopyApplication
|
|
|
+ .Query(dto)
|
|
|
.ToPageListWithoutTotalAsync(dto, HttpContext.RequestAborted);
|
|
|
|
|
|
return _mapper.Map<IReadOnlyList<OrderDto>>(orderccs);
|
|
|
}
|
|
|
|
|
|
[HttpGet("count")]
|
|
|
- public async Task<int> Count([FromQuery] PagedKeywordRequest dto)
|
|
|
+ public async Task<int> Count([FromQuery] QueryCarbonCopyRequest dto)
|
|
|
{
|
|
|
- return await _orderccRepository.Queryable()
|
|
|
- .Includes(d => d.Order)
|
|
|
- .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Order.No == dto.Keyword)
|
|
|
+ return await _orderCarbonCopyApplication
|
|
|
+ .Query(dto)
|
|
|
.CountAsync(HttpContext.RequestAborted);
|
|
|
}
|
|
|
+
|
|
|
+ /// <summary>
|
|
|
+ /// 列表页面基础数据
|
|
|
+ /// </summary>
|
|
|
+ /// <returns></returns>
|
|
|
+ [HttpGet("base-data")]
|
|
|
+ public async Task<object> BaseData()
|
|
|
+ {
|
|
|
+ var rsp = new
|
|
|
+ {
|
|
|
+ AcceptTypeOptions = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.AcceptType),
|
|
|
+ };
|
|
|
+ return rsp;
|
|
|
+ }
|
|
|
}
|
|
|
}
|