瀏覽代碼

特提优化

田爽 5 月之前
父節點
當前提交
d655dfb738
共有 1 個文件被更改,包括 6 次插入5 次删除
  1. 6 5
      src/Hotline.Api/Controllers/OrderController.cs

+ 6 - 5
src/Hotline.Api/Controllers/OrderController.cs

@@ -4709,7 +4709,8 @@ public class OrderController : BaseController
         var specialAny = await _orderSpecialRepository.Queryable().Where(x => x.OrderId == dto.OrderId && x.State == 0)
             .AnyAsync();
         if (specialAny) throw UserFriendlyException.SameMessage("工单已存在待审批特提信息!");
-        SpecialVerify(dto);
+        var order = await _orderRepository.Queryable().Includes(d => d.Workflow).FirstAsync(d => d.Id == dto.OrderId);
+		SpecialVerify(dto, order);
 
 		var model = _mapper.Map<OrderSpecial>(dto);
         var orgs = order.HandlerOrgs;
@@ -4889,9 +4890,9 @@ public class OrderController : BaseController
     /// 特提验证
     /// </summary>
     /// <param name="dto"></param>
-    public async void SpecialVerify(OrderSpecialAddDto dto) {
+    public async void SpecialVerify(OrderSpecialAddDto dto,Order order) {
 	    var screen = await _orderScreenRepository.Queryable().Where(x => x.OrderId == dto.OrderId && (int)x.Status < 2).ToListAsync(HttpContext.RequestAborted);
-	    var order = await _orderRepository.Queryable().Includes(d => d.Workflow).FirstAsync(d => d.Id == dto.OrderId);
+	    //var order = await _orderRepository.Queryable().Includes(d => d.Workflow).FirstAsync(d => d.Id == dto.OrderId);
         var sendBackAudit = await _orderSendBackAuditRepository.Queryable().Where(x => x.OrderId == dto.OrderId && x.State == ESendBackAuditState.Apply).ToListAsync(HttpContext.RequestAborted);
 		if (_appOptions.Value.IsYiBin)
         {
@@ -4909,8 +4910,8 @@ public class OrderController : BaseController
                 var workflowStep = await _workflowStepRepository.Queryable().Where(x => x.Id == order.Workflow.TopCountersignStepId).FirstAsync(HttpContext.RequestAborted);
                 if (workflowStep != null)
                 {
-                    var dto = new EndCountersignDto() { CountersignId = workflowStep.StartCountersignId };
-                    await EndCountersign(dto);
+                    var dtoEnd = new EndCountersignDto() { CountersignId = workflowStep.StartCountersignId };
+                    await EndCountersign(dtoEnd);
 				}
             }
 		}