|
@@ -112,8 +112,9 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
private readonly IRepository<OrderSpecial> _orderSpecialRepository;
|
|
|
private readonly IWorkflowApplication _workflowApplication;
|
|
|
private readonly ICircularRecordDomainService _circularRecordDomainService;
|
|
|
+ private readonly IRepository<User> _userRepository;
|
|
|
|
|
|
- public OrderApplication(
|
|
|
+ public OrderApplication(
|
|
|
IOrderDomainService orderDomainService,
|
|
|
IOrderRepository orderRepository,
|
|
|
IWorkflowDomainService workflowDomainService,
|
|
@@ -158,7 +159,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
IRepository<KnowledgeQuote> knowledgeQuoteRepository,
|
|
|
IRepository<OrderSpecial> orderSpecialRepository,
|
|
|
IWorkflowApplication workflowApplication,
|
|
|
- ICircularRecordDomainService circularRecordDomainService)
|
|
|
+ ICircularRecordDomainService circularRecordDomainService,
|
|
|
+ IRepository<User> userRepository)
|
|
|
{
|
|
|
_orderDomainService = orderDomainService;
|
|
|
_workflowDomainService = workflowDomainService;
|
|
@@ -205,7 +207,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
_orderSpecialRepository = orderSpecialRepository;
|
|
|
_workflowApplication = workflowApplication;
|
|
|
_circularRecordDomainService = circularRecordDomainService;
|
|
|
- }
|
|
|
+ _userRepository = userRepository;
|
|
|
+ }
|
|
|
|
|
|
/// <summary>
|
|
|
/// 更新工单办理期满时间(延期调用,其他不调用)
|
|
@@ -5230,7 +5233,24 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
await _orderRepository.Updateable().SetColumns(o => new Order() { ProcessType = processType, SendBackNum = order.SendBackNum })
|
|
|
.Where(o => o.Id == order.Id).ExecuteCommandAsync(cancellationToken);
|
|
|
}
|
|
|
- }
|
|
|
+
|
|
|
+ if (_appOptions.Value.IsYiBin && order.IsProvince && sendBack.ApplyOrgId.Length == 6 && sendBack.SendBackOrgId == OrgSeedData.CenterId )
|
|
|
+ {
|
|
|
+ if (currentStep.FlowAssignType == EFlowAssignType.User)
|
|
|
+ {
|
|
|
+ await _circularRecordDomainService.OrderSendBackCircularMessage(currentStep.HandlerId, currentStep.HandlerName, order, cancellationToken);
|
|
|
+ }
|
|
|
+ else if (currentStep.FlowAssignType == EFlowAssignType.Role && !string.IsNullOrEmpty(currentStep.RoleId))
|
|
|
+ {
|
|
|
+
|
|
|
+ var users = await _userRepository.Queryable().Includes(x => x.Roles).Where(x => x.Roles.Where(x => x.Id == currentStep.RoleId).Any()).ToListAsync();
|
|
|
+ foreach (var user in users)
|
|
|
+ {
|
|
|
+ await _circularRecordDomainService.OrderSendBackCircularMessage(user.Id, user.Name, order, cancellationToken);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
#endregion
|
|
|
}
|