xf 2 gadi atpakaļ
vecāks
revīzija
e472399317

+ 3 - 2
src/Hotline.Api/Controllers/OrderController.cs

@@ -125,12 +125,13 @@ public class OrderController : BaseController
             .Includes(d => d.OrderReport)
             .FirstAsync(d => d.Id == id);
         if (!string.IsNullOrEmpty(order?.WorkflowId))
-            order.Workflow = await _workflowDomainService.GetWorkflowAsync(order.WorkflowId, withSupplements: true, cancellationToken: HttpContext.RequestAborted);
+            order.Workflow = await _workflowDomainService.GetWorkflowAsync(order.WorkflowId, withSteps: true, withSupplements: true, withAssigns: true, cancellationToken: HttpContext.RequestAborted);
 
         _mediator.Publish(new GetOrderDetailNotify(order.Workflow, _sessionContext.RequiredUserId,
             _sessionContext.UserName, _sessionContext.RequiredOrgCode, _sessionContext.OrgName));
 
-        return _mapper.Map<OrderDto>(order);
+        var dto = _mapper.Map<OrderDto>(order);
+        return dto;
     }
 
     /// <summary>

+ 5 - 0
src/Hotline.Application/Mappers/MapperConfigs.cs

@@ -52,6 +52,11 @@ namespace Hotline.Application.Mappers
             config.ForType<WorkflowSupplement, WorkflowSupplementDto>()
                 .IgnoreIf((s, d) => s.Creator == null, d => d.Creator);
 
+            config.ForType<Workflow, WorkflowDto>()
+                .IgnoreIf((s, d) => s.Assigns == null || !s.Assigns.Any(), d => d.AssignOrgs)
+                .Map(d => d.AssignOrgs, s => string.Join(',', s.Assigns.Select(d => d.OrgName)))
+                ;
+
             #endregion
 
             #region order

+ 33 - 1
src/Hotline.Share/Dtos/FlowEngine/WorkflowDto.cs

@@ -10,6 +10,13 @@ namespace Hotline.Share.Dtos.FlowEngine
 
         public string Title { get; set; }
 
+        /// <summary>
+        /// 业务模块名称
+        /// </summary>
+        public string? ModuleName { get; set; }
+
+        public string? ModuleCode { get; set; }
+
         /// <summary>
         /// 到期时间
         /// </summary>
@@ -25,11 +32,36 @@ namespace Hotline.Share.Dtos.FlowEngine
         /// <summary>
         /// 到达当前节点时间(stepBox创建时间)
         /// </summary>
-        public DateTime CurrentStepTime { get; set; }
+        public DateTime? CurrentStepTime { get; set; }
         
         public EWorkflowStatus Status { get; set; }
         public string StatusText => Status.ToString();
 
+        /// <summary>
+        /// 中心直办件
+        /// </summary>
+        public bool IsStraight { get; set; } = true;
+
+        /// <summary>
+        /// 交办时间
+        /// </summary>
+        public DateTime AssignTime { get; set; }
+
+        /// <summary>
+        /// 办理时间限制(如:24小时、7个工作日)
+        /// </summary>
+        public string TimeLimit { get; set; }
+
+        /// <summary>
+        /// 办理意见(冗余,办理中...or 最终办理意见)
+        /// </summary>
+        public string Opinion { get; set; }
+
+        /// <summary>
+        /// 接办部门
+        /// </summary>
+        public string AssignOrgs { get; set; }
+
         public DefinitionDto Definition { get; set; }
 
         /// <summary>