From 0777f188bf60b0190a242bb4358919d4aac703bb Mon Sep 17 00:00:00 2001
From: tq <1916474859@qq,com>
Date: Tue, 24 Sep 2024 18:49:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Entity/Dto/ChargeOrderDto.cs | 6 +++++-
Entity/Dto/ChargeOrderDto2.cs | 5 +++++
Entity/Dto/SwapLoseOrderDto.cs | 7 +++++++
Entity/Dto/SwapOrderDto.cs | 13 ++++++++-----
Service/Station/ChargeOrderService.cs | 14 ++++++++++++++
5 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/Entity/Dto/ChargeOrderDto.cs b/Entity/Dto/ChargeOrderDto.cs
index 9ff15ab..25cb6ce 100644
--- a/Entity/Dto/ChargeOrderDto.cs
+++ b/Entity/Dto/ChargeOrderDto.cs
@@ -25,6 +25,10 @@ public class ChargeOrderDto
[ExporterHeader(DisplayName = "充电桩编号", IsBold = true)]
public string ChargerNo { get; set; }
+
+ [ExporterHeader(DisplayName = "仓位号", IsBold = true)]
+ public string BinNO { get; set; }
+
///
/// Desc:电池编号
/// Default:
@@ -56,7 +60,7 @@ public class ChargeOrderDto
/// Default:
/// Nullable:True
///
- [ExporterHeader(DisplayName = "充电时长", IsBold = true)]
+ [ExporterHeader(DisplayName = "充电时长/min", IsBold = true)]
public int ChargeTimeCount { get; set; }
///
diff --git a/Entity/Dto/ChargeOrderDto2.cs b/Entity/Dto/ChargeOrderDto2.cs
index e45f7ae..2eda1b7 100644
--- a/Entity/Dto/ChargeOrderDto2.cs
+++ b/Entity/Dto/ChargeOrderDto2.cs
@@ -14,6 +14,8 @@ public class ChargeOrderDto2
[ExporterHeader(DisplayName = "Order Number", IsBold = true)]
public string Sn { get; set; }
+
+
[ExporterHeader(DisplayName = "Battery Number", IsBold = true)]
public string BatteryNo { get; set; }
@@ -21,6 +23,9 @@ public class ChargeOrderDto2
[ExporterHeader(DisplayName = "Charger Number", IsBold = true)]
public string ChargerNo { get; set; }
+ [ExporterHeader(DisplayName = "Location Number", IsBold = true)]
+ public string BinNO { get; set; }
+
[ExporterHeader(DisplayName = "Start Time", IsBold = true, Width = 30, Format = "yyyy-MM-dd HH:mm:ss",
AutoCenterColumn = true)]
diff --git a/Entity/Dto/SwapLoseOrderDto.cs b/Entity/Dto/SwapLoseOrderDto.cs
index 9b07b0f..e6baf16 100644
--- a/Entity/Dto/SwapLoseOrderDto.cs
+++ b/Entity/Dto/SwapLoseOrderDto.cs
@@ -18,6 +18,10 @@ public class SwapLoseOrderDto
[ExporterHeader(DisplayName = "站号", IsBold = true)]
public string StationNumber { get; set; } = "2号站";
+ [ExporterHeader(DisplayName = "创建时间", IsBold = true, Width = 30, Format = "yyyy-MM-dd HH:mm:ss",
+ AutoCenterColumn = true)]
+ public DateTime? CreatedTime { get; set; }
+
[ExporterHeader(DisplayName = "开始时间", IsBold = true, Width = 30, Format = "yyyy-MM-dd HH:mm:ss",
AutoCenterColumn = true)]
@@ -68,4 +72,7 @@ public class SwapLoseOrderDto
///
[ExporterHeader(DisplayName = "失败原因", IsBold = true)]
public string FailReason { get; set; }
+
+ [ExporterHeader(DisplayName = "备注", IsBold = true)]
+ public decimal? Remark { get; set; }
}
\ No newline at end of file
diff --git a/Entity/Dto/SwapOrderDto.cs b/Entity/Dto/SwapOrderDto.cs
index 12b7a3e..fc68985 100644
--- a/Entity/Dto/SwapOrderDto.cs
+++ b/Entity/Dto/SwapOrderDto.cs
@@ -166,7 +166,7 @@ public class SwapOrderDto
/// Default:
/// Nullable:True
///
- [ExporterHeader(DisplayName = "soc（取）", IsBold = true)]
+ [ExporterHeader(DisplayName = "soc（取）%", IsBold = true)]
public decimal? UpBatterySoc { get; set; }
@@ -199,7 +199,7 @@ public class SwapOrderDto
/// Default:
/// Nullable:True
///
- [ExporterHeader(DisplayName = "soc（存）", IsBold = true)]
+ [ExporterHeader(DisplayName = "soc（存）%", IsBold = true)]
public decimal? DownBatterySoc { get; set; }
@@ -216,14 +216,14 @@ public class SwapOrderDto
/// Default:
/// Nullable:True
///
- [ExporterHeader(DisplayName = "订单编号", IsBold = true)]
+ [ExporterHeader(IsIgnore = true)]
public string Sn { get; set; }
///
/// 换电服务费用
///
- [ExporterHeader(DisplayName = "换电服务费用", IsBold = true)]
+ [ExporterHeader(DisplayName = "服务费", IsBold = true)]
public decimal? ServiceTotalFee { get; set; }
///
@@ -241,6 +241,9 @@ public class SwapOrderDto
///
/// 总费用(所有的总费用)
///
- [ExporterHeader(DisplayName = "总费用(所有的总费用)", IsBold = true)]
+ [ExporterHeader(DisplayName = "总费用", IsBold = true)]
public decimal? TotalFee { get; set; }
+
+ [ExporterHeader(DisplayName = "备注", IsBold = true)]
+ public decimal? Remark { get; set; }
}
\ No newline at end of file
diff --git a/Service/Station/ChargeOrderService.cs b/Service/Station/ChargeOrderService.cs
index 4a3f2fc..e9859f5 100644
--- a/Service/Station/ChargeOrderService.cs
+++ b/Service/Station/ChargeOrderService.cs
@@ -70,6 +70,13 @@ public class ChargeOrderService : BaseServices
if (language == "en")
{
List list2 = mapper.Map>(chargeOrders);
+ foreach (var chargeOrderDto in list2)
+ {
+ if (!string.IsNullOrEmpty(chargeOrderDto.ChargerNo))
+ {
+ chargeOrderDto.BinNO = chargeOrderDto.ChargerNo;
+ }
+ }
IExcelExporter excelExporter = new ExcelExporter();
var res = await excelExporter.ExportAsByteArray(list2);
return new FileStreamResult(new MemoryStream(res), "application/octet-stream")
@@ -78,6 +85,13 @@ public class ChargeOrderService : BaseServices
else
{
List list = mapper.Map>(chargeOrders);
+ foreach (var chargeOrderDto in list)
+ {
+ if (!string.IsNullOrEmpty(chargeOrderDto.ChargerNo))
+ {
+ chargeOrderDto.BinNO = chargeOrderDto.ChargerNo;
+ }
+ }
IExcelExporter excelExporter = new ExcelExporter();
var res = await excelExporter.ExportAsByteArray(list);
return new FileStreamResult(new MemoryStream(res), "application/octet-stream")