Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/OrderController.cs

@@ -1215,9 +1215,9 @@ public class OrderController : BaseController
     /// <returns></returns>
     [HttpPost("delay/cancel")]
     [LogFilter("取消工单延期")]
-    public async Task CancelDelay([FromBody]string id)
+    public async Task CancelDelay([FromBody] CancelDelayDto dto)
     {
-        var orderDelay = await _orderDelayRepository.GetAsync(id, HttpContext.RequestAborted);
+        var orderDelay = await _orderDelayRepository.GetAsync(x=>x.OrderId== dto.Id && x.DelayState == EDelayState.Examining, HttpContext.RequestAborted);
         if (orderDelay != null)
         {
             await _workflowDomainService.TerminateAsync(new TerminateDto() { WorkflowId = orderDelay.WorkflowId, Opinion = "" }, HttpContext.RequestAborted);

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

@@ -163,6 +163,10 @@ namespace Hotline.Share.Dtos.Order
 
     }
 
+    public record CancelDelayDto
+    {
+        public string Id { get; set; }
+    }
 
     public record ApplyDelayDto
     {