From 913349c0edbb1e256271639019558817b566e95e Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Tue, 18 Apr 2023 09:33:21 +0800
Subject: [PATCH] =?UTF-8?q?pms=20bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../majornetwork/mapping/RStatOrgMMapper.xml  | 19 ++++++++++++++-----
 .../majornetwork/mapping/RStatOrgQMapper.xml  | 18 +++++++++++++-----
 .../majornetwork/mapping/RStatOrgYMapper.xml  | 18 +++++++++++++-----
 .../impl/RStatHarmonicOrgMServiceImpl.java    | 12 ++++++++----
 4 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgMMapper.xml
index b9b034d39..7609a1d4d 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgMMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgMMapper.xml
@@ -48,7 +48,10 @@
                 FROM
                     r_stat_harmonic_org_m a
                 WHERE
-                    a.org_no=c.org_no and
+                    a.org_no=c.org_no
+                    and a.data_Type = #{dataType}
+
+                    and
                     a.harmonic_type=c.harmonic_type
                 <if test="param!=null and param.startTime != null and param.startTime !=''">
                     AND (data_date >= date(
@@ -66,7 +69,9 @@
                 FROM
                     r_stat_harmonic_org_m a
                 WHERE
-                    a.org_no=c.org_no and
+                    a.org_no=c.org_no
+                    and a.data_Type = #{dataType}
+                    and
                     a.harmonic_type=c.harmonic_type
                     <if test="param!=null and param.startTime != null and param.startTime !=''">
                         AND (data_date >= date(
@@ -79,11 +84,13 @@
         ) chainAccrued ,
         (
                 SELECT
-                    over_limit_measurement_accrued
+                    over_limit_measurement_average
                 FROM
                     r_stat_harmonic_org_m a
                 WHERE
-                    a.org_no=c.org_no and
+                    a.org_no=c.org_no
+                    and a.data_Type = #{dataType}
+                    and
                     a.harmonic_type=c.harmonic_type
                     <if test="param!=null and param.startTime != null and param.startTime !=''">
                         AND (data_date >= date(
@@ -100,7 +107,9 @@
                 FROM
                     r_stat_harmonic_org_m a
                 WHERE
-                    a.org_no=c.org_no and
+                    a.org_no=c.org_no
+                    and a.data_Type = #{dataType}
+                    and
                     a.harmonic_type=c.harmonic_type
                     <if test="param!=null and param.startTime != null and param.startTime !=''">
                         AND (data_date >= date(
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgQMapper.xml
index c65f51ded..26eb9d457 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgQMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgQMapper.xml
@@ -48,7 +48,9 @@
             FROM
             r_stat_harmonic_org_q a
             WHERE
-            a.org_no=c.org_no and
+            a.org_no=c.org_no
+            and a.data_Type = #{dataType}
+              and
             a.harmonic_type=c.harmonic_type
             <if test="param!=null and param.startTime != null and param.startTime !=''">
                 AND (data_date >= date(
@@ -66,7 +68,9 @@
             FROM
             r_stat_harmonic_org_q a
             WHERE
-            a.org_no=c.org_no and
+            a.org_no=c.org_no
+             and a.data_Type = #{dataType}
+            and
             a.harmonic_type=c.harmonic_type
             <if test="param!=null and param.startTime != null and param.startTime !=''">
                 AND (data_date >= date(
@@ -79,11 +83,13 @@
         ) chainAccrued ,
         (
             SELECT
-            over_limit_measurement_accrued
+            over_limit_measurement_average
             FROM
             r_stat_harmonic_org_q a
             WHERE
-            a.org_no=c.org_no and
+            a.org_no=c.org_no
+            and a.data_Type = #{dataType}
+            and
             a.harmonic_type=c.harmonic_type
             <if test="param!=null and param.startTime != null and param.startTime !=''">
                 AND (data_date >= date(
@@ -100,7 +106,9 @@
             FROM
             r_stat_harmonic_org_q a
             WHERE
-            a.org_no=c.org_no and
+            a.org_no=c.org_no
+            and a.data_Type = #{dataType}
+            and
             a.harmonic_type=c.harmonic_type
             <if test="param!=null and param.startTime != null and param.startTime !=''">
                 AND (data_date >= date(
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgYMapper.xml
index 620f0f063..c0306e4c5 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgYMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgYMapper.xml
@@ -48,7 +48,9 @@
             FROM
             r_stat_harmonic_org_y a
             WHERE
-            a.org_no=c.org_no and
+            a.org_no=c.org_no
+        and a.data_Type = #{dataType}
+        and
             a.harmonic_type=c.harmonic_type
             <if test="param!=null and param.startTime != null and param.startTime !=''">
                 AND (data_date >= date(
@@ -66,7 +68,9 @@
             FROM
             r_stat_harmonic_org_y a
             WHERE
-            a.org_no=c.org_no and
+            a.org_no=c.org_no
+            and a.data_Type = #{dataType}
+            and
             a.harmonic_type=c.harmonic_type
             <if test="param!=null and param.startTime != null and param.startTime !=''">
                 AND (data_date >= date(
@@ -79,11 +83,13 @@
         ) chainAccrued ,
         (
             SELECT
-            over_limit_measurement_accrued
+            over_limit_measurement_average
             FROM
             r_stat_harmonic_org_y a
             WHERE
-            a.org_no=c.org_no and
+            a.org_no=c.org_no
+            and a.data_Type = #{dataType}
+            and
             a.harmonic_type=c.harmonic_type
             <if test="param!=null and param.startTime != null and param.startTime !=''">
                 AND (data_date >= date(
@@ -100,7 +106,9 @@
             FROM
             r_stat_harmonic_org_y a
             WHERE
-            a.org_no=c.org_no and
+            a.org_no=c.org_no
+            and a.data_Type = #{dataType}
+            and
             a.harmonic_type=c.harmonic_type
             <if test="param!=null and param.startTime != null and param.startTime !=''">
                 AND (data_date >= date(
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgMServiceImpl.java
index c4ac34e42..72e4227ab 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgMServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgMServiceImpl.java
@@ -115,10 +115,14 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
                     if (ObjectUtil.isNotNull(data1)) {
                         r.setHarmonicName(data1.getName());
                         r.setSort(data1.getSort());
-                        DecimalFormat df = new DecimalFormat("###.00");
-                        Float averageOverDay = Float.parseFloat(
-                                df.format(r.getOverDay() / (r.getOverLimitMeasurementAccrued() * 1.0)));
-                        r.setAverageOverDay(averageOverDay);
+                        if(r.getOverDay()!=0){
+                            DecimalFormat df = new DecimalFormat("###.00");
+                            Float averageOverDay = Float.parseFloat(
+                                    df.format(r.getOverDay() / (r.getOverLimitMeasurementAccrued() * 1.0)));
+                            r.setAverageOverDay(averageOverDay);
+                        }else{
+                            r.setAverageOverDay(0.0f);
+                        }
                         b.add(r);
                     }
                 }