From 47ae7fa7e163fba0603f3270ae51d6b082216b26 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期三, 02 四月 2025 16:36:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ElectricityPriceSegmentedServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ElectricityPriceSegmentedServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ElectricityPriceSegmentedServiceImpl.java
index 7949549..86981ea 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ElectricityPriceSegmentedServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ElectricityPriceSegmentedServiceImpl.java
@@ -79,9 +79,9 @@
if(CollectionUtils.isNotEmpty(list)){
String itimeId = list.get(0).getITimeId();
QueryWrapper<ElectricityPriceSegmentedEntity> wrapper1 = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(itimeId), "i_time_id", itimeId)
- .ge(StringUtils.isNotBlank(time),"start_time", time)
- .lt(StringUtils.isNotBlank(time),"end_time", time)
+ wrapper1.eq(StringUtils.isNotBlank(itimeId), "i_time_id", itimeId)
+ .apply(StringUtils.isNotBlank(time),"TIME(start_time) <= TIME({0})", time)
+ .apply(StringUtils.isNotBlank(time),"TIME(end_time) > TIME({0})", time)
.orderByDesc( "create_time");
result = ConvertUtils.sourceToTarget(baseDao.selectList(wrapper1), ElectricityPriceSegmentedDTO.class);
}
--
Gitblit v1.9.3