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