From 6db1505ab4ec5488855660a6aea4580f7e850dfe Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 02 十一月 2024 14:37:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
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 3a6cfcb..f178bcf 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
@@ -162,9 +162,12 @@
break;
}
}
- tChargingOrderExport.setCreateTime(simpleDateFormat.format(chargingOrderListVO.getCreateTime()));
- tChargingOrderExport.setStartTime(simpleDateFormat.format(chargingOrderListVO.getStartTime()));
- tChargingOrderExport.setEndTime(simpleDateFormat.format(chargingOrderListVO.getEndTime()));
+ String s1 = DateUtils.localDateTimeToString(chargingOrderListVO.getCreateTime());
+ String s2 = DateUtils.localDateTimeToString(chargingOrderListVO.getStartTime());
+ String s3 = DateUtils.localDateTimeToString(chargingOrderListVO.getEndTime());
+ tChargingOrderExport.setCreateTime(s1);
+ tChargingOrderExport.setStartTime(s2);
+ tChargingOrderExport.setEndTime(s3);
tChargingOrderExport.setRechargePaymentStatus(chargingOrderListVO.getRechargePaymentStatus()+"");
tChargingOrderExport.setType("充电订单");
tChargingOrderExport.setChargingType("单桩双充");
--
Gitblit v1.7.1