From 54f80183581b6a89d3f9a5e61e8ee823f47feb34 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 13 三月 2025 17:53:25 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index f269681..0632ce4 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -522,12 +522,6 @@
}
- public static void main(String[] args) {
- ;
- System.err.println(Integer.parseInt("01"));
- System.err.println(Integer.valueOf("01"));
- ;
- }
@RequiresPermissions(value = {"/chargingPileOrder/monitoring_record"}, logical = Logical.OR)
@ResponseBody
@GetMapping(value = "/chargingOrderInfo")
@@ -556,18 +550,18 @@
for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : list) {
String format = "";
String format1 = "";
-// String temp1=list.get(0).getStartTime().split(":")[0];
+ String temp1=list.get(0).getStartTime().split(":")[0];
System.err.println("订单详情时间第一条"+list.get(0).getStartTime());
System.err.println("订单详情时间开始"+tChargingOrderAccountingStrategy.getStartTime());
System.err.println("订单详情时间结束"+tChargingOrderAccountingStrategy.getEndTime());
- String temp1=list.get(0).getStartTime().split(" ")[1].split(":")[0];
- String[] split = tChargingOrderAccountingStrategy.getStartTime().split(" ")[1].split(":");
+// String temp1=list.get(0).getStartTime().split(":")[0];
+ String[] split = tChargingOrderAccountingStrategy.getStartTime().split(":");
if (Integer.parseInt(split[0])>=Integer.parseInt(temp1)){
format = byId.getCreateTime().format(formatter);
}else {
format = byId.getEndTime().format(formatter);
}
- String[] split1 = tChargingOrderAccountingStrategy.getEndTime().split(" ")[1].split(":");
+ String[] split1 = tChargingOrderAccountingStrategy.getEndTime().split(":");
if (Integer.parseInt(split1[0])<Integer.parseInt(temp1)){
format1 = byId.getCreateTime().format(formatter);
}else {
@@ -1031,6 +1025,10 @@
}
+
+
+
+
@RequiresPermissions(value = {"/platformRevenueAnalysis"}, logical = Logical.OR)
@ResponseBody
@GetMapping(value = "/six/total")
@@ -1050,7 +1048,7 @@
siteIds.add(-1);
}
Map<String,Object> map = chargingOrderService.countAll(sixBefore,siteIds);
- BigDecimal data = parkingLotClient.getRecordAmount(sixBefore).getData();
+ BigDecimal data = parkingLotClient.getRecordAmount(sixBefore.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))).getData();
if (map ==null){
map = new HashMap<String,Object>();
}
--
Gitblit v1.7.1