From c00444789847c188b36739d107e022218e15e802 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 23 一月 2025 15:26:47 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ElectricityPriceSegmentedServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 d4fac7b..7949549 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
@@ -70,7 +70,7 @@
}
@Override
- public List<ElectricityPriceSegmentedDTO> getElectricityPriceList(String year) {
+ public List<ElectricityPriceSegmentedDTO> getElectricityPriceList(String year, String time) {
List<ElectricityPriceSegmentedDTO> result = new ArrayList<>();
QueryWrapper<ElectricityPriceSegmentedEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(year), "year", year)
@@ -80,6 +80,8 @@
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)
.orderByDesc( "create_time");
result = ConvertUtils.sourceToTarget(baseDao.selectList(wrapper1), ElectricityPriceSegmentedDTO.class);
}
--
Gitblit v1.9.3