Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/OrderController.cs

@@ -1266,7 +1266,7 @@ public class OrderController : BaseController
     [HttpGet("delay")]
     public async Task<PagedDto<OrderDelayDto>> DelayList([FromQuery] DelayListDto dto)
     {
-        var (total, items) = await _orderDelayRepository.Queryable(permissionVerify: true)
+        var (total, items) = await _orderDelayRepository.Queryable()
             .Includes(x => x.Order)
             .Includes(x => x.Workflow)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
@@ -1860,7 +1860,7 @@ public class OrderController : BaseController
     [HttpGet("urge")]
     public async Task<PagedDto<UrgeOrderDto>> UrgeList([FromQuery] UrgeListDto dto)
     {
-        var (total, items) = await _orderUrgeRepository.Queryable(permissionVerify:true)
+        var (total, items) = await _orderUrgeRepository.Queryable()
             .Includes(x => x.Order)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
                 d => d.Order.Title.Contains(dto.Keyword!) || d.Order.No.Contains(dto.Keyword!))

src/Hotline.Application/Handlers/FlowEngine/WorkflowNextHandler.cs

@@ -18,6 +18,7 @@ using MapsterMapper;
 using MediatR;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using XF.Domain.Authentications;
 using XF.Domain.Repository;
 
 namespace Hotline.Application.Handlers.FlowEngine;
@@ -37,6 +38,7 @@ public class WorkflowNextHandler : INotificationHandler<NextStepNotify>
     private readonly IOrderDelayRepository _orderDelayRepository;
     private readonly IKnowledgeRepository _knowledgeRepository;
     private readonly IKnowledgeWorkFlowRepository _knowledgeWorkFlowRepository;
+    private readonly ISessionContext _sessionContext;
 
 	public WorkflowNextHandler(
         IOrderDomainService orderDomainService,
@@ -51,6 +53,7 @@ public class WorkflowNextHandler : INotificationHandler<NextStepNotify>
         IQualityApplication qualityApplication,
         IKnowledgeRepository knowledgeRepository,
         IKnowledgeWorkFlowRepository knowledgeWorkFlowRepository,
+        ISessionContext sessionContext,
 		IOrderDelayRepository orderDelayRepository)
     {
         _orderDomainService = orderDomainService;
@@ -66,6 +69,7 @@ public class WorkflowNextHandler : INotificationHandler<NextStepNotify>
         _orderDelayRepository = orderDelayRepository;
         _knowledgeRepository = knowledgeRepository;
         _knowledgeWorkFlowRepository = knowledgeWorkFlowRepository;
+        _sessionContext = sessionContext;
 	}
 
     /// <summary>Handles a notification</summary>
@@ -116,7 +120,7 @@ public class WorkflowNextHandler : INotificationHandler<NextStepNotify>
                     else if (data.FlowDirection is EFlowDirection.CenterToOrg)
                     {
                         order.CenterToOrg(expiredTimeConfig.TimeText, expiredTimeConfig.Count,
-                            expiredTimeConfig.TimeType, expiredTimeConfig.ExpiredTime, expiredTimeConfig.NearlyExpiredTime);
+                            expiredTimeConfig.TimeType, expiredTimeConfig.ExpiredTime, expiredTimeConfig.NearlyExpiredTime, _sessionContext.UserId, _sessionContext.UserName);
                         //写入质检
                         await _qualityApplication.AddQualityAsync(EQualitySource.Send, order.Id, cancellationToken);
                     }

src/Hotline/Orders/Order.cs

@@ -564,12 +564,29 @@ namespace Hotline.Orders
         /// </summary>
         public string? AcceptorOrgName { get; set; }
 
-        #endregion
+		#endregion
+		#region 派单人
+
+		/// <summary>
+		/// 派单人id
+		/// </summary>
+		public string? SendOrderId { get; set; }
+
+		/// <summary>
+		/// 派单人名称
+		/// </summary>
+		public string? SendOrderName { get; set; }
 
         /// <summary>
-        /// 会签类型
+        /// 派单次数
         /// </summary>
-        public ECounterSignType? CounterSignType { get; set; }
+        public int? SendOrderNumber { get; set; } = 0;
+		#endregion
+
+		/// <summary>
+		/// 会签类型
+		/// </summary>
+		public ECounterSignType? CounterSignType { get; set; }
 
         #region 签收
 
@@ -764,7 +781,7 @@ namespace Hotline.Orders
             Status = EOrderStatus.Visited;
         }
 
-        public void CenterToOrg(string timelimit, int timelimitCount, ETimeType timilimitUnit, DateTime expiredTime, DateTime nearlyExpiredTime)
+        public void CenterToOrg(string timelimit, int timelimitCount, ETimeType timilimitUnit, DateTime expiredTime, DateTime nearlyExpiredTime,string sendOrderId,string sendOrderName)
         {
             ProcessType = EProcessType.Jiaoban;
             TimeLimit = timelimit;
@@ -773,7 +790,10 @@ namespace Hotline.Orders
             ExpiredTime = expiredTime;
             CenterToOrgTime = DateTime.Now;
             NearlyExpiredTime = nearlyExpiredTime;
-        }
+            SendOrderId = sendOrderId;
+            SendOrderName = sendOrderName;
+            SendOrderNumber += 1;
+		}
 
         public void OrgToCenter(string timelimit, int timelimitCount, ETimeType timilimitUnit, DateTime expiredTime, DateTime nearlyExpiredTime)
         {