退回问题处理

src/Hotline.Api/Controllers/OrderController.cs

@@ -70,6 +70,7 @@ using MiniExcelLibs;
 using SqlSugar;
 using System.Text;
 using System.Text.Json;
+using System.Threading;
 using XF.Domain.Authentications;
 using XF.Domain.Cache;
 using XF.Domain.Exceptions;
@@ -5583,9 +5584,9 @@ public class OrderController : BaseController
             audit.AuditUser = "默认通过";
             audit.AuditTime = DateTime.Now;
             await _orderApplication.OrderPrevious(audit, order, HttpContext.RequestAborted);
-
-        }
-    }
+		}
+		await _orderSendBackAuditRepository.AddAsync(audit, HttpContext.RequestAborted);
+	}
 
     /// <summary>
     /// 工单业务退回审批
@@ -5637,9 +5638,10 @@ public class OrderController : BaseController
         {
             await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { Status = sendBack.Status.Value })
                 .Where(o => o.Id == sendBack.OrderId).ExecuteCommandAsync(HttpContext.RequestAborted);
-            await _orderSendBackAuditRepository.UpdateAsync(sendBack, HttpContext.RequestAborted);
+            
         }
-    }
+		await _orderSendBackAuditRepository.UpdateAsync(sendBack, HttpContext.RequestAborted);
+	}
 
     /// <summary>
     /// 工单业务批量退回审批
@@ -5692,11 +5694,9 @@ public class OrderController : BaseController
             {
                 await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { Status = sendBack.Status.Value })
                     .Where(o => o.Id == sendBack.OrderId).ExecuteCommandAsync(HttpContext.RequestAborted);
-                await _orderSendBackAuditRepository.UpdateAsync(sendBack, HttpContext.RequestAborted);
             }
-
-
-        }
+			await _orderSendBackAuditRepository.UpdateAsync(sendBack, HttpContext.RequestAborted);
+		}
     }
 
     /// <summary>

src/Hotline.Application/Orders/OrderApplication.cs

@@ -5155,41 +5155,6 @@ public class OrderApplication : IOrderApplication, IScopeDependency
 
     public async Task OrderPrevious(OrderSendBackAudit sendBack, Order order, CancellationToken cancellationToken)
     {
-
-        //var (workflow, currentStep, prevDefine, prevStep, newStep, flowDirection) =
-        //       await _workflowApplication.PreviousAsync(sendBack.SendBackData,
-        //           async (workflow1, currentStep1, prevStepDefine, prevStep1, newStep) =>
-        //           {
-        //               var stepAssignInfo =
-        //                   await GetOrderPreviousAssignInfoAsync(workflow1, prevStepDefine, prevStep1, cancellationToken);
-        //               if (stepAssignInfo is null) return;
-        //               var validator = new StepAssignInfoValidator();
-        //               await validator.ValidateAndThrowAsync(stepAssignInfo);
-        //               newStep.Assign(stepAssignInfo);
-        //               if (sendBack.AssignStepId != prevStep1.Id) prevStep1.HandleMode = EHandleMode.PreviousNoDisplay;
-        //           },
-        //           cancellationToken);
-
-        //if (sendBack.IsAssign.Value)
-        //{
-        //    while (sendBack.AssignStepId != prevStep.Id)
-        //    {
-        //        (workflow, currentStep, prevDefine, prevStep, newStep, flowDirection) =
-        //       await _workflowApplication.PreviousAsync(sendBack.SendBackData,
-        //           async (workflow1, currentStep1, prevStepDefine, prevStep1, newStep) =>
-        //           {
-        //               var stepAssignInfo =
-        //                   await GetOrderPreviousAssignInfoAsync(workflow1, prevStepDefine, prevStep1, cancellationToken);
-        //               if (stepAssignInfo is null) return;
-        //               var validator = new StepAssignInfoValidator();
-        //               await validator.ValidateAndThrowAsync(stepAssignInfo);
-        //               newStep.Assign(stepAssignInfo);
-        //               if (sendBack.AssignStepId != prevStep.Id) prevStep1.HandleMode = EHandleMode.PreviousNoDisplay;
-        //           },
-        //           cancellationToken);
-        //    }
-        //}
-
         var handleMode = EHandleMode.Previous;
         WorkflowStep? currentStep, prevStep, newStep, startStep = null;
         EFlowDirection flowDirection;
@@ -5248,9 +5213,6 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             await _orderRepository.Updateable().SetColumns(o => new Order() { ProcessType = processType, SendBackNum = order.SendBackNum })
             .Where(o => o.Id == order.Id).ExecuteCommandAsync(cancellationToken);
         }
-
-
-        await _orderSendBackAuditRepository.AddAsync(sendBack, cancellationToken);
     }
     #endregion
 }