From 7e383cd9001f48141449c2f4e7e007348217f4f8 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 31 十月 2024 16:11:14 +0800
Subject: [PATCH] merge
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java
index 529427e..6d56cff 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java
@@ -88,21 +88,21 @@
query.addCriteria(Criteria.where("status").is(mongoChargingOrderQuery.getStatus()));
}
- if (mongoChargingOrderQuery.getStartTime() != null) {
- String[] split = mongoChargingOrderQuery.getStartTime().split(" - ");
+ if (mongoChargingOrderQuery.getCreateTime() != null) {
+ String[] split = mongoChargingOrderQuery.getCreateTime().split(" - ");
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date start = dateFormat.parse(split[0]);
Date end = dateFormat.parse(split[1]);
- query.addCriteria(Criteria.where("startTime").gte(start).lt(end));
+ query.addCriteria(Criteria.where("create_time").gte(start).lt(end));
}
- if (mongoChargingOrderQuery.getEndTime() != null && mongoChargingOrderQuery.getEndTime() != null) {
- String[] split = mongoChargingOrderQuery.getEndTime().split(" - ");
+ if (mongoChargingOrderQuery.getLastTime() != null && mongoChargingOrderQuery.getLastTime() != null) {
+ String[] split = mongoChargingOrderQuery.getLastTime().split(" - ");
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date start = dateFormat.parse(split[0]);
Date end = dateFormat.parse(split[1]);
- query.addCriteria(Criteria.where("lastTime").gte(start).lt(end));
+ query.addCriteria(Criteria.where("last_time").gte(start).lt(end));
}
--
Gitblit v1.7.1