From 18381ab2ccfc1fd96d1c1efe760be5dd91535530 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Wed, 9 Jul 2025 15:06:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../relation/RelationDataLimitRateDetailImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataLimitRateDetailImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataLimitRateDetailImpl.java index 8393d4d..70b1603 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataLimitRateDetailImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataLimitRateDetailImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.dataProcess.dao.relation.mapper.RStatLimitRateDetailRelationMapper; import com.njcn.dataProcess.pojo.dto.*; @@ -116,13 +117,14 @@ public class RelationDataLimitRateDetailImpl extends MppServiceImpl getRawData(LineCountEvaluateParam lineParam) { List result = new ArrayList<>(); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(CollUtil.isNotEmpty(lineParam.getLineId()), RStatLimitRateDetailD::getLineId, lineParam.getLineId()) + QueryWrapper queryWrapper = new QueryWrapper<>(); + if(StrUtil.isNotBlank(lineParam.getColumnName())){ + queryWrapper.select(lineParam.getColumnName()); + } + queryWrapper.lambda().in(CollUtil.isNotEmpty(lineParam.getLineId()), RStatLimitRateDetailD::getLineId, lineParam.getLineId()) .ge(RStatLimitRateDetailD::getTime, lineParam.getStartTime()) .le(RStatLimitRateDetailD::getTime, lineParam.getEndTime()); - - List list = this.list(lambdaQueryWrapper); - + List list = this.list(queryWrapper); list.forEach(item -> { DataLimitRateDetailDto dto = new DataLimitRateDetailDto(); BeanUtils.copyProperties(item, dto);