orderdelay

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

@@ -673,6 +673,27 @@ namespace Hotline.Api.Controllers.Bi
             return list;
         }
 
+
+
+        /// <summary>
+        /// 子部门满意度明细
+        /// </summary>
+        /// <param name="StartDate"></param>
+        /// <param name="EndDate"></param>
+        /// <param name="OrgCode"></param>
+        /// <param name="TypeId"></param>
+        /// <param name="LineNum"></param>
+        /// <returns></returns>
+        [HttpGet("visit-org-statisfaction-org-detail")]
+        public async Task VisitAndOrgStatisfactionOrgDetail(DateTime StartDate, DateTime EndDate, string OrgCode, int TypeId, string? LineNum)
+        {
+            //EndDate = EndDate.AddDays(1).AddSeconds(-1);
+            //var list = await _orderVisitDetailRepository.Queryable()
+            //     .Where(x => x.OrderVisit.VisitTime >= StartDate && x.OrderVisit.VisitTime <= EndDate && x.VisitTarget == EVisitTarget.Org && x.OrderVisit.VisitState == EVisitState.Visited && !string.IsNullOrEmpty(x.VisitOrgCode))
+            //     .Where(x=>x.VisitOrgCode.StartsWith(OrgCode) && )
+        }
+
+
         /// <summary>
         /// 部门满意度明细
         /// </summary>
@@ -697,20 +718,7 @@ namespace Hotline.Api.Controllers.Bi
             return _mapper.Map<List<OrderVisitDetailDto>>(list);
         }
 
-        /// <summary>
-        /// 子部门满意度明细
-        /// </summary>
-        /// <param name="StartDate"></param>
-        /// <param name="EndDate"></param>
-        /// <param name="OrgCode"></param>
-        /// <param name="TypeId"></param>
-        /// <param name="LineNum"></param>
-        /// <returns></returns>
-        [HttpGet("visit-org-statisfaction-org-detail")]
-        public async Task VisitAndOrgStatisfactionOrgDetail(DateTime StartDate,DateTime EndDate,string OrgCode,int TypeId,string? LineNum)
-        {
-
-        }
+        
 
 
         /// <summary>

src/Hotline.Api/Controllers/OrderController.cs

@@ -1238,6 +1238,32 @@ public class OrderController : BaseController
         }
     }
 
+    /// <summary>
+    ///  延期查询流程办理下一步可选节点
+    /// </summary>
+    /// <param name="workflowId"></param>
+    /// <returns></returns>
+    [HttpGet("delay/{workflowId}/nextsteps")]
+    public async Task<NextStepsDto> OrderDelayNextsteps(string workflowId)
+    {
+        var workflow = await _workflowRepository.GetAsync(workflowId,HttpContext.RequestAborted);
+        if (workflow!=null)
+        {
+            var orderDelay = await _orderDelayRepository.Queryable().Includes(x=>x.Order).Where(x => x.Id == workflow.ExternalId).FirstAsync(HttpContext.RequestAborted);
+            if (orderDelay!=null)
+            {
+                var result = await _workflowApplication.GetNextStepsAsync(workflowId, HttpContext.RequestAborted);
+                if (orderDelay.Order.IsProvince)
+                {
+                    result.Steps.Remove(result.Steps.First(x => x.Value == "省审批"));
+                }
+                return result;
+            }
+        }
+        return null;
+    }
+
+
     /// <summary>
     /// 取消工单延期
     /// </summary>

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

@@ -33,7 +33,7 @@ public class NextStepsDto
 
 public class NextStepsDto<TSteps> : NextStepsDto
 {
-    public IReadOnlyList<TSteps> Steps { get; set; }
+    public List<TSteps> Steps { get; set; }
 }
 
 public class GetNextStepItemsDto