From 9dc82f0523649a2cbf62d26938140c79bca33981 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 17 一月 2025 18:41:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 58883a0..574c936 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
@@ -172,12 +172,18 @@
break;
}
}
- 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);
+ if (chargingOrderListVO.getCreateTime()!=null){
+ String s1 = DateUtils.localDateTimeToString(chargingOrderListVO.getCreateTime());
+ tChargingOrderExport.setCreateTime(s1);
+ }
+ if (chargingOrderListVO.getStartTime()!=null){
+ String s2 = DateUtils.localDateTimeToString(chargingOrderListVO.getStartTime());
+ tChargingOrderExport.setStartTime(s2);
+ }
+ if (chargingOrderListVO.getEndTime()!=null){
+ String s3 = DateUtils.localDateTimeToString(chargingOrderListVO.getEndTime());
+ tChargingOrderExport.setEndTime(s3);
+ }
tChargingOrderExport.setRechargePaymentStatus(chargingOrderListVO.getRechargePaymentStatus()+"");
tChargingOrderExport.setType("充电订单");
tChargingOrderExport.setChargingType("单桩双充");
--
Gitblit v1.7.1