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);
        }