From 6f3f3da77e0a5b7ee5ae7f56c83e196e4af57969 Mon Sep 17 00:00:00 2001
From: tq <1916474859@qq,com>
Date: Mon, 7 Oct 2024 11:57:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E7=94=B5=E8=AE=A2=E5=8D=95,=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=92=8C=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Entity/Dto/SwapLoseOrderDto.cs                | 2 +-
 Entity/Dto/SwapLoseOrderDto2.cs               | 4 ++++
 WebStarter/Controllers/SwapOrderController.cs | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Entity/Dto/SwapLoseOrderDto.cs b/Entity/Dto/SwapLoseOrderDto.cs
index e6baf16..4b511e4 100644
--- a/Entity/Dto/SwapLoseOrderDto.cs
+++ b/Entity/Dto/SwapLoseOrderDto.cs
@@ -74,5 +74,5 @@ public class SwapLoseOrderDto
     public string FailReason { get; set; }
     
     [ExporterHeader(DisplayName = "备注", IsBold = true)]
-    public decimal? Remark { get; set; }
+    public string? Remark { get; set; }
 }
\ No newline at end of file
diff --git a/Entity/Dto/SwapLoseOrderDto2.cs b/Entity/Dto/SwapLoseOrderDto2.cs
index 47c4b74..5d91f55 100644
--- a/Entity/Dto/SwapLoseOrderDto2.cs
+++ b/Entity/Dto/SwapLoseOrderDto2.cs
@@ -34,4 +34,8 @@ public class SwapLoseOrderDto2
     
     [ExporterHeader(DisplayName = "Failure Reason", IsBold = true)]
     public string FailReason { get; set; }
+    
+    
+    [ExporterHeader(DisplayName = "Remark", IsBold = true)]
+    public string? Remark { get; set; }
 }
\ No newline at end of file
diff --git a/WebStarter/Controllers/SwapOrderController.cs b/WebStarter/Controllers/SwapOrderController.cs
index d83e007..c90650f 100644
--- a/WebStarter/Controllers/SwapOrderController.cs
+++ b/WebStarter/Controllers/SwapOrderController.cs
@@ -75,6 +75,11 @@ public class SwapOrderController : ControllerBase
         // 给换电订单赋值车的公司和部门
         foreach (var swapOrder in list)
         {
+            if (swapOrder.SwapResult == 2)
+            {
+                swapOrder.ManualStep = swapOrder.Remark;
+            }
+            
             var matchingVehicle = vehicleList.FirstOrDefault(v => v.VehicleNo == swapOrder.VehicleNo);
 
             if (matchingVehicle != null)