From fde8c4151cacb77a39edab5a4e3b5c69c03974d9 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Wed, 15 May 2024 17:16:10 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=AF=8F=E6=97=A5=E4=B8=AD=E5=8F=B0=E6=AF=8D?= =?UTF-8?q?=E7=BA=BF=E7=BB=9F=E8=AE=A1=E7=AE=97=E6=B3=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=94=B5=E5=8E=8B=E7=AD=89=E7=BA=A7=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mysql/upload/impl/PmsRunStatisticServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticServiceImpl.java index 27e4aadc3..4b98cab57 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticServiceImpl.java @@ -168,9 +168,12 @@ public class PmsRunStatisticServiceImpl extends MppServiceImpl getBusBarAndStationInfo(Integer type) { + List dicDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData(); + List list = dicDataList.stream().map(DictData::getId).collect(Collectors.toList()); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(PmsMidLedger::getLevel,type) - .eq(PmsMidLedger::getState, DataStateEnum.ENABLE.getCode()); + .eq(PmsMidLedger::getState, DataStateEnum.ENABLE.getCode()) + .in(PmsMidLedger::getVoltageLevel, list); return pmsMidLedgerMapper.selectList(lambdaQueryWrapper); } }