浏览代码

退回修改工单状态 更新

田爽 8 月之前
父节点
当前提交
50cae9e95c
共有 2 个文件被更改,包括 16 次插入2 次删除
  1. 11 2
      src/Hotline.Api/Controllers/OrderController.cs
  2. 5 0
      src/Hotline/Orders/OrderSendBackAudit.cs

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

@@ -3861,6 +3861,7 @@ public class OrderController : BaseController
             WorkflowOrgId = _sessionContext.RequiredOrgId,
             WorkflowUserId = _sessionContext.RequiredUserId,
             WorkflowRoleIds = _sessionContext.Roles.ToList(),
+            Status =  order.Status,
             TraceId = currentStep.Id
         };
         if (oneSendBack || twoSendBack)
@@ -3950,6 +3951,10 @@ public class OrderController : BaseController
                 .Where(o => o.Id == sendBack.OrderId).ExecuteCommandAsync(HttpContext.RequestAborted);
             //发送短信TODO
         }
+        else {
+			await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { Status = sendBack.Status.Value })
+				.Where(o => o.Id == order.Id).ExecuteCommandAsync(HttpContext.RequestAborted);
+        }
         await _orderSendBackAuditRepository.UpdateAsync(sendBack, HttpContext.RequestAborted);
     }
 
@@ -3990,8 +3995,12 @@ public class OrderController : BaseController
                     .Where(o => o.Id == sendBack.OrderId).ExecuteCommandAsync(HttpContext.RequestAborted);
                 //发送短信TODO
             }
-
-            await _orderSendBackAuditRepository.UpdateAsync(sendBack, HttpContext.RequestAborted);
+            else
+            {
+	            await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { Status = sendBack.Status.Value })
+		            .Where(o => o.Id == order.Id).ExecuteCommandAsync(HttpContext.RequestAborted);
+            }
+			await _orderSendBackAuditRepository.UpdateAsync(sendBack, HttpContext.RequestAborted);
         }
     }
 

+ 5 - 0
src/Hotline/Orders/OrderSendBackAudit.cs

@@ -32,6 +32,11 @@ namespace Hotline.Orders
 		[SugarColumn(ColumnDescription = "状态")]
 		public ESendBackAuditState? State { get; set; }
 
+		/// <summary>
+		/// 工单状态
+		/// </summary>
+		public EOrderStatus? Status { get; set; }
+
 		/// <summary>
 		/// 退回原因
 		/// </summary>