BiController

src/Hotline.Api/Controllers/Bi/BiCallController.cs

@@ -0,0 +1,8 @@
+namespace Hotline.Api.Controllers.Bi;
+
+/// <summary>
+/// 话务报表
+/// </summary>
+public class BiCallController : BaseController
+{
+}

src/Hotline.Api/Controllers/IPPbxController.cs

@@ -325,6 +325,16 @@ namespace Hotline.Api.Controllers
 
 
 
+        #endregion
+
+        #region Bi
+
+        [HttpGet("bi/calls")]
+        public async Task BiQueryCallsAsync()
+        {
+            throw new NotImplementedException();
+        }
+
         #endregion
 
         #endregion

src/Hotline.Api/Controllers/OrderController.cs

@@ -1976,7 +1976,7 @@ public class OrderController : BaseController
         {
             if (dto.CurrentStepBusinessType is not EBusinessType.Send ||
                 step.BusinessType is not EBusinessType.Department) continue;
-            var org = await _organizeRepository.GetAsync(d => d.AreaCode == order.AreaCode, HttpContext.RequestAborted);
+            var org = await _organizeRepository.GetAsync(d => d.Id == order.AreaCode, HttpContext.RequestAborted);
             if (org is null) continue;
             step.RecommendOrgId = org.Id;
             step.RecommendOrgName = org.Name;

src/Hotline.Application/FlowEngine/WorkflowApplication.cs

@@ -814,6 +814,8 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
         {
             Key = stepDefine.Code,
             Value = stepDefine.Name,
+            StepType = stepDefine.StepType,
+            BusinessType = stepDefine.BusinessType,
             Items = handlers
         };
     }

src/Hotline.Share/Dtos/FlowEngine/NextStepOption.cs

@@ -0,0 +1,44 @@
+using Hotline.Share.Enums.FlowEngine;
+
+namespace Hotline.Share.Dtos.FlowEngine;
+
+public class NextStepOption : Kv
+{
+    /// <summary>
+    /// 是否回到会签发起节点汇总
+    /// </summary>
+    public bool BackToCountersignEnd { get; set; }
+
+    /// <summary>
+    /// 是否需要填写真实办理人信息
+    /// </summary>
+    public bool InputRealHandler { get; set; }
+
+    /// <summary>
+    /// 流转方向
+    /// </summary>
+    public EFlowDirection? FlowDirection { get; set; }
+
+    /// <summary>
+    /// 模板配置节点类型
+    /// </summary>
+    public EStepType StepType { get; set; }
+
+    /// <summary>
+    /// 模板配置节点业务类型
+    /// </summary>
+    public EBusinessType BusinessType { get; set; }
+
+    /// <summary>
+    /// 节点下可选办理对象
+    /// </summary>
+    public IReadOnlyList<Kv> Items { get; set; }
+}
+
+public class RecallStepOption : NextStepOption
+{
+    /// <summary>
+    /// 该节点原办理对象
+    /// </summary>
+    public Kv Handler { get; set; }
+}

src/Hotline.Share/Dtos/FlowEngine/NextStepsDto.cs

@@ -30,39 +30,6 @@ public class NextStepsDto<TSteps> : NextStepsDto
     public IReadOnlyList<TSteps> Steps { get; set; }
 }
 
-public class NextStepOption : Kv
-{
-    /// <summary>
-    /// 是否回到会签发起节点汇总
-    /// </summary>
-    public bool BackToCountersignEnd { get; set; }
-
-    /// <summary>
-    /// 是否需要填写真实办理人信息
-    /// </summary>
-    public bool InputRealHandler { get; set; }
-
-    /// <summary>
-    /// 流转方向
-    /// </summary>
-    public EFlowDirection? FlowDirection { get; set; }
-
-    /// <summary>
-    /// 模板配置节点类型
-    /// </summary>
-    public EStepType StepType { get; set; }
-
-    /// <summary>
-    /// 模板配置节点业务类型
-    /// </summary>
-    public EBusinessType BusinessType { get; set; }
-
-    /// <summary>
-    /// 节点下可选办理对象
-    /// </summary>
-    public IReadOnlyList<Kv> Items { get; set; }
-}
-
 public class GetNextStepItemsDto
 {
     public string DefinitionId { get; set; }
@@ -95,11 +62,3 @@ public class GetNextStepItemsDto
 //     /// </summary>
 //     public IReadOnlyList<KeyValuePair<int, string>> TimeTypeOptions { get; set; }
 // }
-
-public class RecallStepOption : NextStepOption
-{
-    /// <summary>
-    /// 该节点原办理对象
-    /// </summary>
-    public Kv Handler { get; set; }
-}