orderdelay

src/Hotline.Api/Controllers/ArticleController.cs

@@ -163,7 +163,7 @@ namespace Hotline.Api.Controllers
                 startDto.DefinitionModuleCode = WorkflowModuleConsts.CircularApply;
                 startDto.Title = model.Title;
                 var workFlowId = await _workflowApplication.StartWorkflowAsync(startDto, id, HttpContext.RequestAborted);
-                model.WorkFlowId = workFlowId;
+                model.WorkflowId = workFlowId;
                 await _circularRepository.UpdateAsync(model,HttpContext.RequestAborted);
             }
             catch (Exception ex)
@@ -346,7 +346,7 @@ namespace Hotline.Api.Controllers
                 startDto.DefinitionModuleCode = WorkflowModuleConsts.BulletinApply;
                 startDto.Title = model.Title;
                 string workFlowId = await _workflowApplication.StartWorkflowAsync(startDto, id, HttpContext.RequestAborted);
-                model.WorkFlowId = workFlowId;
+                model.WorkflowId = workFlowId;
                 await _bulletinRepository.UpdateAsync(model, HttpContext.RequestAborted);
             }
             catch (Exception ex)

src/Hotline.Api/Controllers/OrderController.cs

@@ -756,7 +756,7 @@ public class OrderController : BaseController
             startDto.DefinitionModuleCode = WorkflowModuleConsts.OrderDelay;
             startDto.Title = model.DelayReason;
             string workFlowId = await _workflowApplication.StartWorkflowAsync(startDto, id, HttpContext.RequestAborted);
-            model.WorkFlowId = workFlowId;
+            model.WorkflowId = workFlowId;
             await _orderDelayRepository.UpdateAsync(model, HttpContext.RequestAborted);
         }
         catch (Exception ex)
@@ -772,7 +772,7 @@ public class OrderController : BaseController
     /// <returns></returns>
     //[Permission(EPermission.DelayList)]
     [HttpGet("delay")]
-    public async Task<PagedDto<OrderDelay>> DelayList([FromQuery] DelayListDto dto)
+    public async Task<PagedDto<OrderDelayDto>> DelayList([FromQuery] DelayListDto dto)
     {
         var (total, items) = await _orderDelayRepository.Queryable()
             .Includes(x => x.Order)
@@ -785,7 +785,7 @@ public class OrderController : BaseController
             .OrderByDescending(x => x.CreationTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 
-        return new PagedDto<OrderDelay>(total, items);
+        return new PagedDto<OrderDelayDto>(total, _mapper.Map<IReadOnlyList<OrderDelayDto>>(items));
     }
 
     /// <summary>

src/Hotline.Application/Mappers/OrderMapperConfigs.cs

@@ -91,7 +91,9 @@ public class OrderMapperConfigs : IRegister
             .Map(d => d.VoiceEvaluate, s => s.VoiceEvaluate)
             .Map(d => d.SeatEvaluate, s => s.SeatEvaluate);
 
-        
+        config.ForType<OrderDelay, OrderDelayDto>()
+            //.Inherits<Order, OrderDto>()
+            .IgnoreIf((s, d) => s.Employee == null, d => d.EmployeeName);
 
     }
 }

src/Hotline.Share/Dtos/Article/BulletinDto.cs

@@ -46,7 +46,7 @@ namespace Hotline.Share.Dtos.Article
         /// <summary>
         /// 流程ID
         /// </summary>
-        public string? WorkFlowId { get; set; }
+        public string? WorkflowId { get; set; }
 
         /// <summary>
         /// 发布范围（多选）  位枚举  EPushRange
@@ -160,7 +160,7 @@ namespace Hotline.Share.Dtos.Article
         /// <summary>
         /// 流程ID
         /// </summary>
-        public string? WorkFlowId { get; set; }
+        public string? WorkflowId { get; set; }
 
         /// <summary>
         /// 阅读明细

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

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using Hotline.Share.Enums.Order;
 using Hotline.Share.Enums.Settings;
 using Hotline.Share.Requests;
+using XF.Utility.EnumExtensions;
 
 namespace Hotline.Share.Dtos.Order
 {
@@ -249,6 +250,112 @@ namespace Hotline.Share.Dtos.Order
         public List<string> FileIds { get; set; }
     }
 
+
+    public record OrderDelayDto
+    {
+        /// <summary>
+        /// 工单编号（冗余）
+        /// </summary>
+        public string No { get; set; }
+
+        /// <summary>
+        /// 工单ID
+        /// </summary>
+        public string OrderId { get; set; }
+
+        public OrderDto? Order { get; set; }
+
+        /// <summary>
+        /// 延期申请时间
+        /// </summary>
+        public DateTime ApplyDelayTime { get; set; }
+
+        /// <summary>
+        /// 申请部门Code
+        /// </summary>
+        public string ApplyOrgCode { get; set; }
+
+        /// <summary>
+        /// 申请部门名称
+        /// </summary>
+        public string ApplyOrgName { get; set; }
+
+        /// <summary>
+        /// 申请人
+        /// </summary>
+        public string EmployeeId { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string? EmployeeName { get; set; }
+
+        /// <summary>
+        /// 延期申请时限
+        /// </summary>
+        public int DelayNum { get; set; }
+
+        /// <summary>
+        /// 延期申请单位
+        /// </summary>
+        public ETimeType DelayUnit { get; set; }
+
+        public string DelayUnitText => DelayState.GetDescription();
+
+        /// <summary>
+        /// 延期申请理由
+        /// </summary>
+        public string DelayReason { get; set; }
+
+        /// <summary>
+        /// 申请前期满时间
+        /// </summary>
+        public DateTime? BeforeDelay { get; set; }
+
+        /// <summary>
+        /// 申请后期满时间
+        /// </summary>
+        public DateTime? AfterDelay { get; set; }
+
+        /// <summary>
+        /// 审批状态
+        /// </summary>
+        public EDelayState DelayState { get; set; }
+
+        public string DelayStateText => DelayState.GetDescription();
+
+        /// <summary>
+        /// 是否省延期
+        /// </summary>
+        public bool IsProDelay { get; set; }
+
+        /// <summary>
+        /// 流程ID
+        /// </summary>
+        public string? WorkflowId { get; set; }
+
+        public DateTime CreationTime { get; set; }
+
+        public string Id { get; set; }
+
+        public string? CreatorId { get; set; }
+
+        public string? CreatorName { get; set; }
+
+        public string? CreatorOrgId { get; set; }
+
+        public string? CreatorOrgName { get; set; }
+
+        public int CreatorOrgLevel { get; set; }
+
+        /// <summary>
+        /// 一级部门Id
+        /// </summary>
+        public string? AreaId { get; set; }
+    }
+
+
+
     public record DelayCalcEndTimeDto
     {
         public DateTime BeginTime { get; set; }

src/Hotline/Article/Bulletin.cs

@@ -58,7 +58,7 @@ namespace Hotline.Article
         /// <summary>
         /// 流程ID
         /// </summary>
-        public string? WorkFlowId { get; set; }
+        public string? WorkflowId { get; set; }
 
         /// <summary>
         /// 阅读量+1

src/Hotline/Article/Circular.cs

@@ -78,7 +78,7 @@ namespace Hotline.Article
         /// <summary>
         /// 流程ID
         /// </summary>
-        public string? WorkFlowId { get; set; }
+        public string? WorkflowId { get; set; }
 
         /// <summary>
         /// 阅读明细

src/Hotline/Orders/OrderDelay.cs

@@ -98,6 +98,6 @@ namespace Hotline.Orders
         /// <summary>
         /// 流程ID
         /// </summary>
-        public string? WorkFlowId { get; set; }
+        public string? WorkflowId { get; set; }
     }
 }