|
@@ -8,6 +8,7 @@ using Hotline.Application.Orders;
|
|
|
using Hotline.Application.Quality;
|
|
|
using Hotline.Application.Snapshot;
|
|
|
using Hotline.Application.Systems;
|
|
|
+using Hotline.Article;
|
|
|
using Hotline.Authentications;
|
|
|
using Hotline.Caching.Interfaces;
|
|
|
using Hotline.CallCenter.Calls;
|
|
@@ -156,6 +157,7 @@ public class OrderController : BaseController
|
|
|
private readonly IRepository<SystemDicData> _sysDicDataRepository;
|
|
|
private readonly IRepository<SystemOrganize> _systemOrganizeRepository;
|
|
|
private readonly IRepository<OrderComplement> _orderComplementRepository;
|
|
|
+ private readonly ICircularRecordDomainService _circularRecordDomainService;
|
|
|
|
|
|
public OrderController(
|
|
|
IOrderDomainService orderDomainService,
|
|
@@ -229,7 +231,8 @@ public class OrderController : BaseController
|
|
|
IOrderSnapshotApplication orderSnapshotApplication,
|
|
|
IRepository<SystemDicData> sysDicDataRepository,
|
|
|
IRepository<SystemOrganize> systemOrganizeRepository,
|
|
|
- IRepository<OrderComplement> orderComplementRepository)
|
|
|
+ IRepository<OrderComplement> orderComplementRepository,
|
|
|
+ ICircularRecordDomainService circularRecordDomainService)
|
|
|
{
|
|
|
_orderDomainService = orderDomainService;
|
|
|
_orderRepository = orderRepository;
|
|
@@ -303,6 +306,7 @@ public class OrderController : BaseController
|
|
|
_sysDicDataRepository = sysDicDataRepository;
|
|
|
_systemOrganizeRepository = systemOrganizeRepository;
|
|
|
_orderComplementRepository = orderComplementRepository;
|
|
|
+ _circularRecordDomainService = circularRecordDomainService;
|
|
|
}
|
|
|
|
|
|
#endregion
|
|
@@ -3165,7 +3169,7 @@ public class OrderController : BaseController
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.ActualHandleOrgName), d => d.Order.ActualHandleOrgName.Contains(dto.ActualHandleOrgName)) //接办部门(综合查询模糊)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.CurrentStepCode), d => d.Order.CurrentStepCode == dto.CurrentStepCode) //当前办理节点
|
|
|
.WhereIF(_sessionContext.OrgIsCenter == false, d =>
|
|
|
- (SqlFunc.IsNullOrEmpty(d.RoleId)==true&& d.OrgId.StartsWith(_sessionContext.RequiredOrgId)) ||
|
|
|
+ (SqlFunc.IsNullOrEmpty(d.RoleId) == true && d.OrgId.StartsWith(_sessionContext.RequiredOrgId)) ||
|
|
|
(SqlFunc.IsNullOrEmpty(d.RoleId) == false && d.OrgId.StartsWith(_sessionContext.RequiredOrgId) && _sessionContext.Roles.Contains(d.RoleId))
|
|
|
)
|
|
|
|
|
@@ -8890,6 +8894,7 @@ public class OrderController : BaseController
|
|
|
{
|
|
|
circularDto.CircularReadGroups = users;
|
|
|
//调用推送消息通用接口
|
|
|
+ await _circularRecordDomainService.AddCircularMessage(circularDto, HttpContext.RequestAborted);
|
|
|
}
|
|
|
}
|
|
|
}
|