From b09534d85ab2344151f570fd51889aca4da396b3 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 05 六月 2025 09:10:12 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QrCodeDeliveryServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QrCodeDeliveryServiceImpl.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QrCodeDeliveryServiceImpl.java
index 61ccf5a..4442a7f 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QrCodeDeliveryServiceImpl.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/impl/QrCodeDeliveryServiceImpl.java
@@ -12,7 +12,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
@@ -40,10 +42,10 @@
}
@Override
- public List<QrCodeDelivery> getRangeTimeData(String startTime, String endTime) {
+ public List<QrCodeDelivery> getRangeTimeData(Date startTime, Date endTime) {
Query query = new Query();
// 根据时间范围查询
- if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+ if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
query.addCriteria(Criteria.where("create_time").gte(startTime).lte(endTime));
}
List<QrCodeDelivery> list = mongoTemplate.find(
--
Gitblit v1.7.1