From b3674cefbeb8ffaf49f96d0c8fe7a6694ed86eec Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期二, 25 二月 2025 15:05:32 +0800 Subject: [PATCH] 模拟调整 远程调用 --- iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ElectricityPriceSegmentedServiceImpl.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 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..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 @@ -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) @@ -79,7 +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) + 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