|
@@ -66,6 +66,7 @@ using Hotline.EventBus;
|
|
using Hotline.Orders.Notifications;
|
|
using Hotline.Orders.Notifications;
|
|
using Hotline.OrderTranspond;
|
|
using Hotline.OrderTranspond;
|
|
using Newtonsoft.Json;
|
|
using Newtonsoft.Json;
|
|
|
|
+using static NPOI.SS.Format.CellNumberFormatter;
|
|
|
|
|
|
namespace Hotline.Application.Orders;
|
|
namespace Hotline.Application.Orders;
|
|
|
|
|
|
@@ -107,8 +108,9 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
private readonly ICalcExpireTime _expireTime;
|
|
private readonly ICalcExpireTime _expireTime;
|
|
private readonly IRepository<OrderObserve> _orderObserveRepository;
|
|
private readonly IRepository<OrderObserve> _orderObserveRepository;
|
|
private readonly IOrderTerminateRepository _orderTerminateRepository;
|
|
private readonly IOrderTerminateRepository _orderTerminateRepository;
|
|
|
|
+ private readonly IRepository<OrderPublishHistory> _orderPublishHistoryRepository;
|
|
|
|
|
|
- public OrderApplication(
|
|
|
|
|
|
+ public OrderApplication(
|
|
IOrderDomainService orderDomainService,
|
|
IOrderDomainService orderDomainService,
|
|
IOrderRepository orderRepository,
|
|
IOrderRepository orderRepository,
|
|
IWorkflowDomainService workflowDomainService,
|
|
IWorkflowDomainService workflowDomainService,
|
|
@@ -143,7 +145,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
ISessionContextProvider sessionContextProvider,
|
|
ISessionContextProvider sessionContextProvider,
|
|
IRepository<TranspondCityRawData> transpondCityRawDataRepository,
|
|
IRepository<TranspondCityRawData> transpondCityRawDataRepository,
|
|
IRepository<OrderObserve> orderObserveRepository,
|
|
IRepository<OrderObserve> orderObserveRepository,
|
|
- IOrderTerminateRepository orderTerminateRepository)
|
|
|
|
|
|
+ IOrderTerminateRepository orderTerminateRepository,
|
|
|
|
+ IRepository<OrderPublishHistory> orderPublishHistoryRepository)
|
|
{
|
|
{
|
|
_orderDomainService = orderDomainService;
|
|
_orderDomainService = orderDomainService;
|
|
_workflowDomainService = workflowDomainService;
|
|
_workflowDomainService = workflowDomainService;
|
|
@@ -179,7 +182,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
_transpondCityRawDataRepository = transpondCityRawDataRepository;
|
|
_transpondCityRawDataRepository = transpondCityRawDataRepository;
|
|
_orderObserveRepository = orderObserveRepository;
|
|
_orderObserveRepository = orderObserveRepository;
|
|
_orderTerminateRepository = orderTerminateRepository;
|
|
_orderTerminateRepository = orderTerminateRepository;
|
|
- }
|
|
|
|
|
|
+ _orderPublishHistoryRepository = orderPublishHistoryRepository;
|
|
|
|
+ }
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|
|
/// 更新工单办理期满时间(延期调用,其他不调用)
|
|
/// 更新工单办理期满时间(延期调用,其他不调用)
|
|
@@ -2380,6 +2384,30 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
order.Status = EOrderStatus.WaitForAccept;
|
|
order.Status = EOrderStatus.WaitForAccept;
|
|
}
|
|
}
|
|
await _orderRepository.UpdateAsync(order, cancellationToken);
|
|
await _orderRepository.UpdateAsync(order, cancellationToken);
|
|
|
|
+ //处理回访和发布信息
|
|
|
|
+
|
|
|
|
+ var publish = await _orderPublishRepository.GetAsync(x => x.OrderId == order.Id);
|
|
|
|
+ if (publish != null)
|
|
|
|
+ {
|
|
|
|
+ var publishHistory = _mapper.Map<OrderPublishHistory>(publish);
|
|
|
|
+ publishHistory.OrderPublishId = publish.Id;
|
|
|
|
+ publishHistory.ArrangeTitleAfter = publish.ArrangeTitle;
|
|
|
|
+ publishHistory.ArrangeTitleBefor = publish.ArrangeTitle;
|
|
|
|
+ publishHistory.ArrangeContentAfter = publish.ArrangeContent;
|
|
|
|
+ publishHistory.ArrangeContentBefor = publish.ArrangeContent;
|
|
|
|
+ publishHistory.ArrangeOpinionAfter = publish.ArrangeOpinion;
|
|
|
|
+ publishHistory.ArrangeOpinionBefor = publish.ArrangeOpinion;
|
|
|
|
+ await _orderPublishHistoryRepository.AddAsync(publishHistory, cancellationToken);
|
|
|
|
+ await _orderPublishRepository.RemoveAsync(publish, false, cancellationToken);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ var visit = await _orderVisitRepository.GetAsync(x => x.OrderId == order.Id&& x.VisitState != EVisitState.None);
|
|
|
|
+ if (visit != null)
|
|
|
|
+ {
|
|
|
|
+ visit.VisitState = EVisitState.None;
|
|
|
|
+ await _orderVisitRepository.UpdateAsync(visit,cancellationToken);
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|
|
//await _workflowDomainService.RecallToStartStepAsync(order.WorkflowId, "省工单重派", current, cancellationToken);
|
|
//await _workflowDomainService.RecallToStartStepAsync(order.WorkflowId, "省工单重派", current, cancellationToken);
|
|
}
|
|
}
|