换电订单,列表和导出优化

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; }
 }

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; }
 }

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)