换电订单类型增加导出

Entity/Api/Resp/SwapOrderResp.cs

@@ -185,5 +185,8 @@ namespace Entity.Api.Resp
         /// <returns></returns>
         public string? ManualStep { get; set; }
         
+        
+        public string? Remark { get; set; }
+
     }
 }

Entity/Dto/SwapOrderDto.cs

@@ -54,24 +54,7 @@ public class SwapOrderDto
     [ExporterHeader(DisplayName = "所属部门", IsBold = true)]
     public string? Departments {get;set;}
 
-    /// <summary>
-    /// Desc:换电类型:;1自动换电;2手动换电
-    /// Default:0
-    /// Nullable:True
-    /// </summary>
-    [ExporterHeader(DisplayName = "换电模式", IsBold = true)]
-    public string SwapWayDisplay
-    {
-        get
-        {
-            return SwapWay switch
-            {
-                1 => "自动换电",
-                2 => "手动换电",
-                _ => "未知"
-            };
-        }
-    }
+    
     /// <summary>
     /// Desc:换电类型:;1自动换电;2手动换电
     /// Default:0
@@ -244,6 +227,23 @@ public class SwapOrderDto
     [ExporterHeader(DisplayName = "总费用", IsBold = true)]
     public decimal? TotalFee { get; set; }
     
+    /// <summary>
+    /// Desc:换电类型:;1自动换电;2手动换电
+    /// Default:0
+    /// Nullable:True
+    /// </summary>
     [ExporterHeader(DisplayName = "备注", IsBold = true)]
-    public decimal? Remark { get; set; }
+    public string SwapWayDisplay
+    {
+        get
+        {
+            return SwapWay switch
+            {
+                1 => "自动换电",
+                2 => "手动换电",
+                3 => "半自动换电",
+                _ => "未知"
+            };
+        }
+    }
 }

Entity/Dto/SwapOrderDto2.cs

@@ -48,19 +48,7 @@ public class SwapOrderDto2
     public DateTime? SwapEndTime { get; set; }
     
 
-    [ExporterHeader(DisplayName = "Swap Type", IsBold = true)]
-    public string SwapWayDisplay
-    {
-        get
-        {
-            return SwapWay switch
-            {
-                1 => "Automatic Swap",
-                2 => "Manual Swap",
-                _ => "Unknown"
-            };
-        }
-    }
+    
 
     [ExporterHeader(IsIgnore = true)] public int? SwapWay { get; set; }
 
@@ -131,4 +119,19 @@ public class SwapOrderDto2
     /// </summary>
     [ExporterHeader(DisplayName = "TOTAL COST", IsBold = true)]
     public decimal? TotalFee { get; set; }
+    
+    [ExporterHeader(DisplayName = "REMARK", IsBold = true)]
+    public string SwapWayDisplay
+    {
+        get
+        {
+            return SwapWay switch
+            {
+                1 => "Automatic Swap",
+                2 => "Manual Swap",
+                3 => "SEMI AUTOMATIC SWITCHING",
+                _ => "Unknown"
+            };
+        }
+    }
 }

WebStarter/Controllers/SwapOrderController.cs

@@ -401,7 +401,6 @@ public class SwapOrderController : ControllerBase
         List<SwapOrderBatteryResp> swapOrderBattery = mapper.Map<List<SwapOrderBatteryResp>>(batteryList);
         // 换电订单
         List<SwapOrderResp> swapOrderResp = mapper.Map<List<SwapOrderResp>>(orderList);
-        
         foreach (var orderResp in swapOrderResp)
         {
             if (orderResp.ServiceTotalFee.HasValue)