diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java index 62d4c3f18..4223ce883 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java @@ -392,7 +392,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl pollutionsubVO.setData(t.getValue())); + Optional.ofNullable(rStatPollutionSubstationYPO).ifPresent(a -> pollutionsubVO.setData(BigDecimal.valueOf(a.getValue()).setScale(2, RoundingMode.UP).doubleValue())); } else if (Objects.equals(harmonicPublicParam.getReportFlag(), BizParamConstant.STAT_BIZ_QUARTER)) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("substation_id", id). @@ -400,7 +400,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl pollutionsubVO.setData(t.getValue())); + Optional.ofNullable(rStatPollutionSubstationQPO).ifPresent(a -> pollutionsubVO.setData(BigDecimal.valueOf(a.getValue()).setScale(2, RoundingMode.UP).doubleValue())); } else if (Objects.equals(harmonicPublicParam.getReportFlag(), BizParamConstant.STAT_BIZ_MONTH)) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("substation_id", id). @@ -408,7 +408,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl pollutionsubVO.setData(t.getValue())); + Optional.ofNullable(rStatPollutionSubstationM).ifPresent(a -> pollutionsubVO.setData(BigDecimal.valueOf(a.getValue()).setScale(2, RoundingMode.UP).doubleValue())); } else if (Objects.equals(harmonicPublicParam.getReportFlag(), BizParamConstant.STAT_BIZ_DAY)) { QueryWrapper wrapper = new QueryWrapper<>(); @@ -417,7 +417,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl pollutionsubVO.setData(t.getValue())); + Optional.ofNullable(rStatPollutionSubstationDPO).ifPresent(a -> pollutionsubVO.setData(BigDecimal.valueOf(a.getValue()).setScale(2, RoundingMode.UP).doubleValue())); } else if (Objects.equals(harmonicPublicParam.getReportFlag(), BizParamConstant.STAT_BIZ_WEEK)) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("substation_id", id). @@ -425,7 +425,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl pollutionsubVO.setData(t.getValue())); + Optional.ofNullable(rStatPollutionSubstationDPO).ifPresent(a -> pollutionsubVO.setData(BigDecimal.valueOf(a.getValue()).setScale(2, RoundingMode.UP).doubleValue())); } }