From 160f41d31cee95e300eb27b9223b8a56a61eb1a9 Mon Sep 17 00:00:00 2001
From: eric777 <wujiahan_vip@163.com>
Date: Sun, 4 Feb 2024 09:06:30 +0800
Subject: [PATCH] =?UTF-8?q?jiahan.wu[CR]=20=E9=9B=86=E5=9B=A2=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E7=83=AD=E5=A5=BD=E7=8E=87=E5=92=8C=E7=85=A4=E8=80=97?=
 =?UTF-8?q?=E7=8E=87=E6=8E=92=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lzbi/common/enums/ReportNameEnum.java    | 3 ++-
 .../java/com/lzbi/bi/service/DcBusiDataScreenMainService.java  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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