jiahan.wu[CR] 集团大屏热好率和煤耗率排行

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;

lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiDataScreenMainService.java

@@ -206,7 +206,7 @@ public class DcBusiDataScreenMainService extends ServiceImpl<DcBusiDataScreenMai
             return ret;
         }
         List<String> 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<Long> orgIds = sysDepts.stream().map(SysDept::getDeptId).distinct().collect(Collectors.toList());
         vo.setAssetType("0").setAssetLevel("10").setReportNames(reportNames).setOrgIds(orgIds);
         List<TargetDraftDaynewResVo> targetDraftDaynewResVos = dcBusiTargetDraftDaynewService.selectTargetDraftDaynewList(vo);
@@ -224,6 +224,7 @@ public class DcBusiDataScreenMainService extends ServiceImpl<DcBusiDataScreenMai
             primary_net_recharge_water_value = ObjUtil.isNotEmpty(primary_net_recharge_water_value)?primary_net_recharge_water_value:BigDecimal.ZERO;
             datang_primary_net_recharge_water_value = ObjUtil.isNotEmpty(datang_primary_net_recharge_water_value)?datang_primary_net_recharge_water_value:BigDecimal.ZERO;
             jo.put("field3", primary_net_recharge_water_value.add(datang_primary_net_recharge_water_value));
+            jo.put("field4", entry.getValue().stream().filter(x -> x.getReportName().equals(ReportNameEnum.WATER_CONSUMPTION_OF_SECONDARY_NETWORK.getName())).findFirst().orElse(new TargetDraftDaynewResVo()).getValueResult());
             list.add(jo);
         });
         ret.put("source",list);