部门退回中心统计明细

src/Hotline.Application/OrderApp/OrderApplication.cs

@@ -5719,7 +5719,23 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                 .Where(x => x.State == ESendBackAuditState.End && x.ApplyOrgId != OrgSeedData.CenterId && x.SendBackOrgId == OrgSeedData.CenterId)
                 .WhereIF(dto.StartTime.HasValue && dto.EndTime.HasValue, x => x.AuditTime >= dto.StartTime && x.AuditTime <= dto.EndTime)
                 .WhereIF(!string.IsNullOrEmpty(dto.OrgId), x => x.ApplyOrgId == dto.OrgId)
-                .OrderByIF(string.IsNullOrEmpty(dto.SortField), x => x.CreationTime, OrderByType.Desc)
+				 .WhereIF(!string.IsNullOrEmpty(dto.No), x => x.Order.No.Contains(dto.No!))
+				.WhereIF(!string.IsNullOrEmpty(dto.Title), x => x.Order.Title.Contains(dto.Title!))
+				.WhereIF(!string.IsNullOrEmpty(dto.OrgId), x => x.ApplyOrgId == dto.OrgId)
+				.WhereIF(!string.IsNullOrEmpty(dto.AcceptType), x => x.Order.AcceptTypeCode == dto.AcceptType) //受理类型
+				.WhereIF(!string.IsNullOrEmpty(dto.Channel), x => x.Order.SourceChannelCode == dto.Channel) //来源渠道
+				.WhereIF(!string.IsNullOrEmpty(dto.Hotspot),
+					x => x.Order.HotspotSpliceName != null && x.Order.HotspotSpliceName.Contains(dto.Hotspot)) //热点分类
+				.WhereIF(dto.CreationTimeStart.HasValue, x => x.Order.CreationTime >= dto.CreationTimeStart) //受理时间开始
+				.WhereIF(dto.CreationTimeEnd.HasValue, x => x.Order.CreationTime <= dto.CreationTimeEnd) //受理时间结束
+				.WhereIF(!string.IsNullOrEmpty(dto.ApplyOrgName), x => x.ApplyOrgName == dto.ApplyOrgName!) //申请部门
+				.WhereIF(!string.IsNullOrEmpty(dto.ApplyUserName), x => x.CreatorName == dto.ApplyUserName!) //申请人
+				.WhereIF(dto.State.HasValue, x => x.State == dto.State) //退回审批状态
+				.WhereIF(!string.IsNullOrEmpty(dto.AuditUser), x => x.AuditUser == dto.AuditUser!) //审批人
+				.WhereIF(dto.AuditTimeStart.HasValue && dto.AuditTimeEnd.HasValue,
+					x => x.AuditTime >= dto.AuditTimeStart && x.AuditTime <= dto.AuditTimeEnd) // 审批时间
+				.WhereIF(!string.IsNullOrEmpty(dto.AuditContent), x => x.AuditContent.Contains(dto.AuditContent!)) //审批意见
+				.OrderByIF(string.IsNullOrEmpty(dto.SortField), x => x.CreationTime, OrderByType.Desc)
                 .OrderByIF(dto is { SortField: "order.startTime", SortRule: 0 }, x => x.Order.StartTime, OrderByType.Asc)
                 .OrderByIF(dto is { SortField: "order.startTime", SortRule: 1 }, x => x.Order.StartTime, OrderByType.Desc)
                 .OrderByIF(dto is { SortField: "creationTime", SortRule: 0 }, x => x.CreationTime, OrderByType.Asc)

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

@@ -927,6 +927,66 @@ namespace Hotline.Share.Dtos.Order
     {
 		public string? OrgName { get; set; }
 		public string? OrgId { get; set; }
+
+
+		public string? No { get; set; }
+
+		public string? Title { get; set; }
+
+
+		/// <summary>
+		/// 来源渠道（√）
+		/// </summary>
+		public string? Channel { get; set; }
+
+		/// <summary>
+		/// 受理类型（√）
+		/// </summary>
+		public string? AcceptType { get; set; }
+
+		/// <summary>
+		/// 热点分类
+		/// </summary>
+		public string? Hotspot { get; set; }
+
+
+		/// <summary>
+		/// 受理时间(工单创建时间)（√）
+		/// </summary>
+		public DateTime? CreationTimeStart { get; set; }
+		public DateTime? CreationTimeEnd { get; set; }
+
+		/// <summary>
+		/// 申请部门
+		/// </summary>
+		public string? ApplyOrgName { get; set; }
+
+		/// <summary>
+		/// 申请人
+		/// </summary>
+		public string? ApplyUserName { get; set; }
+
+		/// <summary>
+		/// 退回审批状态
+		/// </summary>
+		public ESendBackAuditState? State { get; set; }
+
+		/// <summary>
+		/// 审批人
+		/// </summary>
+		public string? AuditUser { get; set; }
+
+		/// <summary>
+		/// 审批时间
+		/// </summary>
+		public DateTime? AuditTimeStart { get; set; }
+
+		public DateTime? AuditTimeEnd { get; set; }
+
+		/// <summary>
+		/// 审批意见
+		/// </summary>
+		public string? AuditContent { get; set; }
 	}