From 4c62b64cc158ed07f18ae7060dae71f9d1e3d9fd Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 10 二月 2025 13:57:37 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 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..e8ca7ea 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
@@ -127,7 +127,7 @@
ChargingOrderTimeVO res = chargingOrderService.chargingList(dto);
List<TChargingOrderExport> tChargingOrderExports = new ArrayList<>();
- List<ChargingOrderListVO> exportList = res.getList().getRecords();
+ List<ChargingOrderListVO> exportList = res.getExportList();
int i = 0;
for (ChargingOrderListVO chargingOrderListVO : exportList) {
TChargingOrderExport tChargingOrderExport = new TChargingOrderExport();
@@ -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("单桩双充");
@@ -245,8 +251,6 @@
tChargingOrderExport.setCarNumber(data1.get(0).getLicensePlate());
tChargingOrderExport.setCarType(data1.get(0).getVehicleModel());
tChargingOrderExport.setCarBrand(data1.get(0).getVehicleBrand());
-
-
}
tChargingOrderExport.setOrderCode(chargingOrderListVO.getCode());
tChargingOrderExport.setIsSingle("是");
--
Gitblit v1.7.1