督办列表查询 催办列表查询

src/Hotline.Api/Controllers/OrderController.cs

@@ -631,18 +631,20 @@ public class OrderController : BaseController
 	/// <returns></returns>
 	[Permission(EPermission.SuperviseOrderList)]
     [HttpGet("supervise")]
-    public async Task<PagedDto<SuperviseOrderDto>> SuperviseList([FromQuery] SuperviseListDto dto)
+    public async Task<PagedDto<OrderSupervise>> SuperviseList([FromQuery] SuperviseListDto dto)
     {
         var (total, items) = await _orderSuperviseRepository.Queryable()
             .Includes(x => x.Order)
-            .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Order.Title.Contains(dto.Keyword!) || d.Order.No.Contains(dto.Keyword!))
+            .Includes(x => x.CrUser)
+            .Includes(x => x.ReUser)
+			.WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Order.Title.Contains(dto.Keyword!) || d.Order.No.Contains(dto.Keyword!))
             .WhereIF(dto.SuperviseState > 0, x => x.State == dto.SuperviseState)
             .WhereIF(dto.CreationTimeStart.HasValue, d => d.CreationTime >= dto.CreationTimeStart)
             .WhereIF(dto.CreationTimeEnd.HasValue, d => d.CreationTime <= dto.CreationTimeEnd)
 			.OrderByDescending(x => x.CreationTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 
-        return new PagedDto<SuperviseOrderDto>(total, _mapper.Map<IReadOnlyList<SuperviseOrderDto>>(items));
+        return new PagedDto<OrderSupervise>(total, items);
     }
 
     /// <summary>
@@ -733,18 +735,20 @@ public class OrderController : BaseController
     /// <returns></returns>
     [Permission(EPermission.UrgeOrderList)]
     [HttpGet("urge")]
-    public async Task<PagedDto<UrgeOrderDto>> UrgeList([FromQuery] UrgeListDto dto)
+    public async Task<PagedDto<OrderUrge>> UrgeList([FromQuery] UrgeListDto dto)
     {
         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!))
+            .Includes(x => x.CrUser)
+            .Includes(x => x.ReUser)
+			.WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Order.Title.Contains(dto.Keyword!) || d.Order.No.Contains(dto.Keyword!))
             .WhereIF(dto.SuperviseState > 0, x => x.State == dto.SuperviseState)
             .WhereIF(dto.CreationTimeStart.HasValue, d => d.CreationTime >= dto.CreationTimeStart)
             .WhereIF(dto.CreationTimeEnd.HasValue, d => d.CreationTime <= dto.CreationTimeEnd)
 			.OrderByDescending(x => x.CreationTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 
-        return new PagedDto<UrgeOrderDto>(total, _mapper.Map<IReadOnlyList<UrgeOrderDto>>(items));
+        return new PagedDto<OrderUrge>(total, items);
     }
 
     /// <summary>

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

@@ -2,6 +2,7 @@
 using Hotline.Share.Dtos.FlowEngine;
 using Hotline.Share.Dtos.Hotspots;
 using Hotline.Share.Dtos.Org;
+using Hotline.Share.Dtos.Users;
 using Hotline.Share.Enums.FlowEngine;
 using Hotline.Share.Enums.Order;
 using Hotline.Share.Enums.Settings;
@@ -675,168 +676,4 @@ namespace Hotline.Share.Dtos.Order
         public string ClientGuid { get; set; }
 	}
 
-    public class SuperviseOrderDto {
-
-        /// <summary>
-        /// 督办ID
-        /// </summary>
-		public string Id { get; set; }
-
-        /// <summary>
-        /// 工单ID
-        /// </summary>
-        public string OrderId { get; set; }
-
-        /// <summary>
-        /// 督办回复时限
-        /// </summary>
-        public DateTime ReplyLimitTime { get; set; }
-
-        /// <summary>
-        /// 被督办部门ID
-        /// </summary>
-        public string OrgId { get; set; }
-
-        /// <summary>
-        /// 被督办部门名称
-        /// </summary>
-        public string OrgName { get; set; }
-
-
-        /// <summary>
-        /// 创建部门名称
-        /// </summary>
-        public string? CreatorOrgName { get; set; }
-
-		/// <summary>
-		/// 督办状态
-		/// </summary>
-		public int State { get; set; }
-
-        /// <summary>
-        /// 督办签收时间
-        /// </summary>
-        public DateTime? SignTime { get; set; }
-
-        /// <summary>
-        /// 督办回复时间
-        /// </summary>
-        public DateTime? ReplyTime { get; set; }
-
-        /// <summary>
-        /// 督办申请内容
-        /// </summary>
-        public string? ApplyContent { get; set; }
-
-        /// <summary>
-        /// 督办回复内容
-        /// </summary>
-        public string? ReplyContent { get; set; }
-
-        /// <summary>
-        /// 回复人
-        /// </summary>
-        public string? ReplyId { get; set; }
-
-        /// <summary>
-        /// 附件
-        /// </summary>
-        public List<string>? Additions { get; set; } = new();
-
-        public DateTime? LastModificationTime { get; set; }
-
-        public string? CreatorId { get; set; }
-
-        public string? CreatorOrgId { get; set; }
-
-        public DateTime CreationTime { get; set; }
-
-		/// <summary>
-		/// 工单对象
-		/// </summary>
-		public OrderDto Order { get; set; }
-	}
-
-
-    public class UrgeOrderDto
-    {
-
-	    /// <summary>
-	    /// 催办ID
-	    /// </summary>
-	    public string Id { get; set; }
-
-	    /// <summary>
-	    /// 工单ID
-	    /// </summary>
-	    public string OrderId { get; set; }
-
-	    /// <summary>
-	    /// 催办回复时限
-	    /// </summary>
-	    public DateTime ReplyLimitTime { get; set; }
-
-	    /// <summary>
-	    /// 被催办部门ID
-	    /// </summary>
-	    public string OrgId { get; set; }
-
-		/// <summary>
-		/// 被催办部门名称
-		/// </summary>
-		public string OrgName { get; set; }
-
-		/// <summary>
-		/// 创建部门名称
-		/// </summary>
-		public string? CreatorOrgName { get; set; }
-
-		/// <summary>
-		/// 催办状态
-		/// </summary>
-		public int State { get; set; }
-
-	    /// <summary>
-	    /// 催办签收时间
-	    /// </summary>
-	    public DateTime? SignTime { get; set; }
-
-	    /// <summary>
-	    /// 催办回复时间
-	    /// </summary>
-	    public DateTime? ReplyTime { get; set; }
-
-	    /// <summary>
-	    /// 催办申请内容
-	    /// </summary>
-	    public string? ApplyContent { get; set; }
-
-	    /// <summary>
-	    /// 催办回复内容
-	    /// </summary>
-	    public string? ReplyContent { get; set; }
-
-	    /// <summary>
-	    /// 回复人
-	    /// </summary>
-	    public string? ReplyId { get; set; }
-
-	    /// <summary>
-	    /// 附件
-	    /// </summary>
-	    public List<string>? Additions { get; set; } = new();
-
-	    public DateTime? LastModificationTime { get; set; }
-
-	    public string? CreatorId { get; set; }
-
-	    public string? CreatorOrgId { get; set; }
-
-	    public DateTime CreationTime { get; set; }
-
-	    /// <summary>
-	    /// 工单对象
-	    /// </summary>
-	    public OrderDto Order { get; set; }
-	}
 }

src/Hotline/Orders/OrderSupervise.cs

@@ -80,5 +80,11 @@ namespace Hotline.Orders {
 		[Navigate(NavigateType.OneToOne, nameof(OrderId))]
 		public Order Order { get; set; }
 
+
+		[Navigate(NavigateType.OneToOne, nameof(ReplyId))]
+		public User ReUser { get; set; }
+
+		[Navigate(NavigateType.OneToOne, nameof(CreatorId))]
+		public User CrUser { get; set; }
 	}
 }

src/Hotline/Orders/OrderUrge.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using Hotline.Settings;
+using Hotline.Users;
 using NpgsqlTypes;
 using SqlSugar;
 using XF.Domain.Repository;
@@ -74,6 +75,12 @@ namespace Hotline.Orders {
 		[Navigate(NavigateType.OneToOne, nameof(OrderId))]
 		public Order? Order { get; set; }
 
+		[Navigate(NavigateType.OneToOne, nameof(ReplyId))]
+		public User ReUser { get; set; }
+
+		[Navigate(NavigateType.OneToOne, nameof(CreatorId))]
+		public User CrUser { get; set; }
+
 	}
 }