督办

src/Hotline.Api/Controllers/OrderController.cs

@@ -631,7 +631,7 @@ public class OrderController : BaseController
     /// <returns></returns>
     [Permission(EPermission.SuperviseOrderList)]
     [HttpGet("supervise")]
-    public async Task<PagedDto<OrderSupervise>> SuperviseList([FromQuery] SuperviseListDto dto)
+    public async Task<PagedDto<SuperviseOrderDto>> SuperviseList([FromQuery] SuperviseListDto dto)
     {
         var (total, items) = await _orderSuperviseRepository.Queryable()
             .Includes(x => x.Order)
@@ -644,7 +644,7 @@ public class OrderController : BaseController
             .OrderByDescending(x => x.CreationTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 
-        return new PagedDto<OrderSupervise>(total, items);
+        return new PagedDto<SuperviseOrderDto>(total, _mapper.Map<IReadOnlyList<SuperviseOrderDto>>(items));
     }
 
     /// <summary>
@@ -741,7 +741,7 @@ public class OrderController : BaseController
     /// <returns></returns>
     [Permission(EPermission.UrgeOrderList)]
     [HttpGet("urge")]
-    public async Task<PagedDto<OrderUrge>> UrgeList([FromQuery] UrgeListDto dto)
+    public async Task<PagedDto<UrgeOrderDto>> UrgeList([FromQuery] UrgeListDto dto)
     {
         var (total, items) = await _orderUrgeRepository.Queryable()
             .Includes(x => x.Order)
@@ -754,7 +754,7 @@ public class OrderController : BaseController
             .OrderByDescending(x => x.CreationTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 
-        return new PagedDto<OrderUrge>(total, items);
+        return new PagedDto<UrgeOrderDto>(total, _mapper.Map<IReadOnlyList<UrgeOrderDto>>(items));
     }
 
     /// <summary>

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

@@ -678,4 +678,175 @@ 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 RestDto ReUser { get; set; }
+        public RestDto CrUser { 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; }
+
+		public RestDto ReUser { get; set; }
+
+		public RestDto CrUser { get; set; }
+	}
 }

src/Hotline/Orders/Order.cs

@@ -201,8 +201,6 @@ namespace Hotline.Orders
         /// </summary>
         public EOrderStatus Status { get; set; }
 
-        public string StatusText => Status.GetDescription();
-
 		/// <summary>
 		/// 过期状态 //todo 延迟消息更新此字段
 		/// </summary>