From 87bebb13e0f88c5930792d3fc721f659c5467ca8 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Wed, 8 Mar 2023 10:43:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../majornetwork/impl/RMpBenchmarkLevelMServiceImpl.java        | 2 ++
 .../majornetwork/impl/RMpBenchmarkLevelQServiceImpl.java        | 2 ++
 .../majornetwork/impl/RMpBenchmarkLevelYServiceImpl.java        | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelMServiceImpl.java
index 2cb86a5e7..ee7a79553 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelMServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelMServiceImpl.java
@@ -135,6 +135,8 @@ implements RMpBenchmarkLevelMService {
                 rMpBenchmarkLevelVO.setOrgName (v.get (0).getOrgName ());
                 rMpBenchmarkLevelVO.setVoltageLevel (v.get (0).getVoltageLevel ());
                 rMpBenchmarkLevelVO.setVoltageLevelName (v.get (0).getVoltageLevelName ());
+                rMpBenchmarkLevelVO.setBenchmarkIndicator(v.get (0).getBenchmarkIndicator ());
+                rMpBenchmarkLevelVO.setBenchmarkIndicatorName(v.get (0).getBenchmarkIndicatorName ());
                 rMpBenchmarkLevelVO.setVoltageAvg (Double.valueOf (df.format (v.stream ().
                         mapToDouble (RMpBenchmarkLevelVO::getVoltageAvg).
                         average ().
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelQServiceImpl.java
index c1c84edaa..69c3b1043 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelQServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelQServiceImpl.java
@@ -135,6 +135,8 @@ implements RMpBenchmarkLevelQService {
                 rMpBenchmarkLevelVO.setOrgName (v.get (0).getOrgName ());
                 rMpBenchmarkLevelVO.setVoltageLevel (v.get (0).getVoltageLevel ());
                 rMpBenchmarkLevelVO.setVoltageLevelName (v.get (0).getVoltageLevelName ());
+                rMpBenchmarkLevelVO.setBenchmarkIndicator(v.get (0).getBenchmarkIndicator ());
+                rMpBenchmarkLevelVO.setBenchmarkIndicatorName(v.get (0).getBenchmarkIndicatorName ());
                 rMpBenchmarkLevelVO.setVoltageAvg (Double.valueOf (df.format (v.stream ().
                         mapToDouble (RMpBenchmarkLevelVO::getVoltageAvg).
                         average ().
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelYServiceImpl.java
index 4f956c089..6b1d36ea0 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelYServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelYServiceImpl.java
@@ -136,6 +136,8 @@ implements RMpBenchmarkLevelYService {
                 rMpBenchmarkLevelVO.setOrgName (v.get (0).getOrgName ());
                 rMpBenchmarkLevelVO.setVoltageLevel (v.get (0).getVoltageLevel ());
                 rMpBenchmarkLevelVO.setVoltageLevelName (v.get (0).getVoltageLevelName ());
+                rMpBenchmarkLevelVO.setBenchmarkIndicator(v.get (0).getBenchmarkIndicator ());
+                rMpBenchmarkLevelVO.setBenchmarkIndicatorName(v.get (0).getBenchmarkIndicatorName ());
                 rMpBenchmarkLevelVO.setVoltageAvg (Double.valueOf (df.format (v.stream ().
                         mapToDouble (RMpBenchmarkLevelVO::getVoltageAvg).
                         average ().