diff --git a/lzbi-common/src/main/java/com/lzbi/common/enums/ReportNameEnum.java b/lzbi-common/src/main/java/com/lzbi/common/enums/ReportNameEnum.java index 2e78676..a6d5963 100644 --- a/lzbi-common/src/main/java/com/lzbi/common/enums/ReportNameEnum.java +++ b/lzbi-common/src/main/java/com/lzbi/common/enums/ReportNameEnum.java @@ -26,7 +26,8 @@ public enum ReportNameEnum RETURN_WATER_TEMPERATURE("回水温度"), NUMBER_OF_STEAM_FURNACES_IN_OPERATION("汽炉运行台数"), NUMBER_OF_WATER_FURNACES_IN_OPERATION("水炉运行台数"), - SECOND_NETWORK_ELECTRICITY_CONSUMPTION_RATE("二次网耗水率"); + SECOND_NETWORK_ELECTRICITY_CONSUMPTION_RATE("二次网耗水率"), + WATER_CONSUMPTION_OF_SECONDARY_NETWORK("二次网耗水量"); private final String name; diff --git a/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiDataScreenMainService.java b/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiDataScreenMainService.java index ecd47c7..c8c96a3 100644 --- a/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiDataScreenMainService.java +++ b/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiDataScreenMainService.java @@ -206,7 +206,7 @@ public class DcBusiDataScreenMainService extends ServiceImpl reportNames = Stream.of(ReportNameEnum.FIRST_NETWORK_WATER_CONSUMPTION_RATE.getName(), ReportNameEnum.SECOND_NETWORK_WATER_CONSUMPTION_RATE.getName(), - ReportNameEnum.PRIMARY_NET_RECHARGE_WATER.getName(), ReportNameEnum.DATANG_PRIMARY_NET_RECHARGE_WATER.getName()).collect(Collectors.toList()); + ReportNameEnum.PRIMARY_NET_RECHARGE_WATER.getName(), ReportNameEnum.DATANG_PRIMARY_NET_RECHARGE_WATER.getName(), ReportNameEnum.WATER_CONSUMPTION_OF_SECONDARY_NETWORK.getName()).collect(Collectors.toList()); List orgIds = sysDepts.stream().map(SysDept::getDeptId).distinct().collect(Collectors.toList()); vo.setAssetType("0").setAssetLevel("10").setReportNames(reportNames).setOrgIds(orgIds); List targetDraftDaynewResVos = dcBusiTargetDraftDaynewService.selectTargetDraftDaynewList(vo); @@ -224,6 +224,7 @@ public class DcBusiDataScreenMainService extends ServiceImpl x.getReportName().equals(ReportNameEnum.WATER_CONSUMPTION_OF_SECONDARY_NETWORK.getName())).findFirst().orElse(new TargetDraftDaynewResVo()).getValueResult()); list.add(jo); }); ret.put("source",list);