From 8a9aa826d470fca44b64302f203c03c03666522c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 23 十月 2024 21:28:04 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java | 2 +-
ruoyi-service/ruoyi-chargingPile/src/main/resources/template/结算汇总.xlsx | 0
ruoyi-service/ruoyi-chargingPile/src/main/resources/template/充电桩申请记录.xlsx | 0
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/TChargingOrderExport.java | 3 +++
4 files changed, 4 insertions(+), 1 deletions(-)
diff --git "a/ruoyi-service/ruoyi-chargingPile/src/main/resources/template/\345\205\205\347\224\265\346\241\251\347\224\263\350\257\267\350\256\260\345\275\225.xlsx" "b/ruoyi-service/ruoyi-chargingPile/src/main/resources/template/\345\205\205\347\224\265\346\241\251\347\224\263\350\257\267\350\256\260\345\275\225.xlsx"
index fc621e2..763334e 100644
--- "a/ruoyi-service/ruoyi-chargingPile/src/main/resources/template/\345\205\205\347\224\265\346\241\251\347\224\263\350\257\267\350\256\260\345\275\225.xlsx"
+++ "b/ruoyi-service/ruoyi-chargingPile/src/main/resources/template/\345\205\205\347\224\265\346\241\251\347\224\263\350\257\267\350\256\260\345\275\225.xlsx"
Binary files differ
diff --git "a/ruoyi-service/ruoyi-chargingPile/src/main/resources/template/\347\273\223\347\256\227\346\261\207\346\200\273.xlsx" "b/ruoyi-service/ruoyi-chargingPile/src/main/resources/template/\347\273\223\347\256\227\346\261\207\346\200\273.xlsx"
index 738da66..e66c778 100644
--- "a/ruoyi-service/ruoyi-chargingPile/src/main/resources/template/\347\273\223\347\256\227\346\261\207\346\200\273.xlsx"
+++ "b/ruoyi-service/ruoyi-chargingPile/src/main/resources/template/\347\273\223\347\256\227\346\261\207\346\200\273.xlsx"
Binary files differ
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
index e589fe1..4d6a7b9 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -114,7 +114,7 @@
tChargingOrderExport.setCity(data.get(0).getCity());
tChargingOrderExport.setCityName(data.get(0).getDistricts());
tChargingOrderExport.setSiteType(data.get(0).getSiteType());
-
+ tChargingOrderExport.setStatus(data.get(0).getStatus()+"");
Partner data2 = siteClient.getPartnerR(data.get(0).getPartnerId()).getData();
if (data2!=null){
tChargingOrderExport.setPartner(data2.getName());
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/TChargingOrderExport.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/TChargingOrderExport.java
index 08c1165..8ea61be 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/TChargingOrderExport.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/TChargingOrderExport.java
@@ -18,6 +18,7 @@
private String siteCode;
@Excel(name = "电站名称",width = 30)
private String siteName;
+
@Excel(name = "终端名称",width = 30)
private String terminalName;
@Excel(name = "所属城市",width = 30)
@@ -30,6 +31,8 @@
private Integer siteType;
@Excel(name = "售电模式",width = 30,replace = {"正常使用_1","维修中_2","关闭下线_3"})
private String saleType;
+ @Excel(name = "站点状态",width = 30,replace = {"正常使用_1","维修中_2","关闭下线_3"})
+ private String status;
@Excel(name = "运营类型",width = 30,replace = {"直营_1","非直营_2"})
private String businessCategory;
@Excel(name = "计费模板",width = 30)
--
Gitblit v1.7.1