Merge branch 'dev' of http://git.12345lm.cn/Fengwo/hotline into dev

src/Hotline.Api/Controllers/OrderController.cs

@@ -680,6 +680,7 @@ public class OrderController : BaseController
             .WhereIF(dto.IsCountersign != null && dto.IsCountersign == true, d => d.Order.CounterSignType != null)
             .WhereIF(dto.IsCountersign != null && dto.IsCountersign == false, d => d.Order.CounterSignType == null)
             .WhereIF(dto.QuerySelf.HasValue && dto.QuerySelf.Value, d => d.EmployeeId == _sessionContext.RequiredUserId)
+            .WhereIF(!string.IsNullOrEmpty(dto.EmployeeName), d=> d.Employee != null && d.Employee.Name == dto.EmployeeName)
             .OrderByDescending(x => x.PublishTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
         return new PagedDto<OrderVisitDto>(total, _mapper.Map<IReadOnlyList<OrderVisitDto>>(items));
@@ -1670,6 +1671,7 @@ public class OrderController : BaseController
             .WhereIF(dto.CreationTimeStart.HasValue, d => d.CreationTime >= dto.CreationTimeStart)
             .WhereIF(dto.CreationTimeEnd.HasValue, d => d.CreationTime <= dto.CreationTimeEnd)
             .WhereIF(!string.IsNullOrEmpty(dto.OrderId), d => d.OrderId == dto.OrderId)
+            .WhereIF(!string.IsNullOrEmpty(dto.CreatorOrgName),d=>d.CreatorOrgName == dto.CreatorOrgName)
             .OrderByDescending(d => d.CreationTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
         return new PagedDto<OrderScreenListDto>(total, _mapper.Map<IReadOnlyList<OrderScreenListDto>>(items));
@@ -3389,6 +3391,7 @@ public class OrderController : BaseController
             .WhereIF(dto.ExpiredStatus is EExpiredStatus.Normal, d => DateTime.Now < d.NearlyExpiredTime)
             .WhereIF(dto.ExpiredStatus is EExpiredStatus.GoingToExpired, d => DateTime.Now > d.NearlyExpiredTime && DateTime.Now < d.ExpiredTime)
             .WhereIF(dto.ExpiredStatus is EExpiredStatus.Expired, d => DateTime.Now >= d.ExpiredTime)
+            .WhereIF(!string.IsNullOrEmpty(dto.CenterToOrgHandlerName),d=>d.CenterToOrgHandlerName == dto.CenterToOrgHandlerName)
             .WhereIF(dto.IsUrgent.HasValue, d => d.IsUrgent == dto.IsUrgent!.Value)
             .OrderBy(d => d.Status)
             .OrderBy(d => d.CreationTime, OrderByType.Desc)

src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -558,6 +558,15 @@ namespace Hotline.Share.Dtos.Order
 		/// </summary>
 		public List<OrderRemarksDto> OrderRemarks { get; set; }
 
+		/// <summary>
+		/// 交办人(派单员)
+		/// </summary>
+		public string? CenterToOrgHandlerId { get; set; }
+
+		/// <summary>
+		/// 交办人(派单员)
+		/// </summary>
+		public string? CenterToOrgHandlerName { get; set; }
 	}
 
     public class UpdateOrderDto : AddOrderDto

src/Hotline.Share/Dtos/Order/OrderVisitDto.cs

@@ -43,7 +43,12 @@ namespace Hotline.Share.Dtos.Order
         /// 是否只查询自己的待回访工单
         /// </summary>
         public bool? QuerySelf { get; set; }
-    }
+
+        /// <summary>
+        /// 回访人
+        /// </summary>
+        public string? EmployeeName { get; set; }
+	}
 
     public record VisitJudgeQueryReq:PagedKeywordRequest
     {

src/Hotline.Share/Dtos/Order/OrderWaitedDto.cs

@@ -94,9 +94,14 @@ namespace Hotline.Share.Dtos.Order
         public string? AcceptorName { get; set; }
 
         /// <summary>
-        /// 过期状态
+        /// 交办人(派单员)
         /// </summary>
-        public EExpiredStatus? ExpiredStatus { get; set; }
+        public string? CenterToOrgHandlerName { get; set; }
+
+		/// <summary>
+		/// 过期状态
+		/// </summary>
+		public EExpiredStatus? ExpiredStatus { get; set; }
 
         /// <summary>
         /// 是否紧急

src/Hotline.Share/Dtos/Order/QueryOrderDto.cs

@@ -458,7 +458,12 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public int source { get; set; }
 
-    }
+        /// <summary>
+        /// 甄别申请部门
+        /// </summary>
+        public string? CreatorOrgName { get; set; }
+
+	}
 
     public record MayScreenListDto : PagedKeywordRequest
     {