From e4c8611f03630aff76c584edeff95f9c90acbf7f Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Sun, 23 Apr 2023 10:30:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BC=82=E5=B8=B8=E9=99=A4?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/RStatHarmonicOrgMServiceImpl.java    | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

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 72e4227ab..2cea457c5 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,7 +115,7 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
                     if (ObjectUtil.isNotNull(data1)) {
                         r.setHarmonicName(data1.getName());
                         r.setSort(data1.getSort());
-                        if(r.getOverDay()!=0){
+                        if(r.getOverDay()!=0&&r.getOverLimitMeasurementAccrued()!=0){
                             DecimalFormat df = new DecimalFormat("###.00");
                             Float averageOverDay = Float.parseFloat(
                                     df.format(r.getOverDay() / (r.getOverLimitMeasurementAccrued() * 1.0)));
@@ -202,9 +202,14 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
                         rIconVO.setOverLimitMeasurementRatioAccrued(orgM.getOverLimitMeasurementRatioAccrued());
                         rIconVO.setOverLimitMeasurementRatioAverage(orgM.getOverLimitMeasurementRatioAverage());
                         DecimalFormat df = new DecimalFormat("###.00");
-                        Float averageOverDay = Float.parseFloat(
-                                df.format(orgM.getOverDay() / (orgM.getOverLimitMeasurementAccrued() * 1.0)));
-                        rIconVO.setAverageOverDay(averageOverDay);
+                        if(orgM.getOverDay()!=0&&orgM.getOverLimitMeasurementAccrued()!=0){
+                            Float averageOverDay = Float.parseFloat(
+                                    df.format(orgM.getOverDay() / (orgM.getOverLimitMeasurementAccrued() * 1.0)));
+                            rIconVO.setAverageOverDay(averageOverDay);
+                        }else{
+                            rIconVO.setAverageOverDay(0f);
+                        }
+
                         arrayVOList.add(rIconVO);
                     }
 
@@ -273,10 +278,14 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
                             DeptDTO deptDTO = deptMap.get(statHarmonic.getOrgNo());
                             r.setHarmonicName(deptDTO.getName());
                             r.setSort(deptDTO.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&&r.getOverLimitMeasurementAccrued()!=0){
+                                DecimalFormat df = new DecimalFormat("###.00");
+                                Float averageOverDay = Float.parseFloat(
+                                        df.format(r.getOverDay() / (r.getOverLimitMeasurementAccrued() * 1.0)));
+                                r.setAverageOverDay(averageOverDay);
+                            }else{
+                                r.setAverageOverDay(0f);
+                            }
                             eventVO.add(r);
                         }
 
@@ -362,10 +371,14 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
                         rIconVO.setOverLimitMeasurementAverage(orgM.getOverLimitMeasurementAverage());
                         rIconVO.setOverLimitMeasurementRatioAccrued(orgM.getOverLimitMeasurementRatioAccrued());
                         rIconVO.setOverLimitMeasurementRatioAverage(orgM.getOverLimitMeasurementRatioAverage());
-                        DecimalFormat df = new DecimalFormat("###.00");
-                        Float averageOverDay = Float.parseFloat(
-                                df.format(orgM.getOverDay() / (orgM.getOverLimitMeasurementAccrued() * 1.0)));
-                        rIconVO.setAverageOverDay(averageOverDay);
+                        if(orgM.getOverDay()!=0&&orgM.getOverLimitMeasurementAccrued()!=0){
+                            DecimalFormat df = new DecimalFormat("###.00");
+                            Float averageOverDay = Float.parseFloat(
+                                    df.format(orgM.getOverDay() / (orgM.getOverLimitMeasurementAccrued() * 1.0)));
+                            rIconVO.setAverageOverDay(averageOverDay);
+                        }else{
+                            rIconVO.setAverageOverDay(0f);
+                        }
                         arrayVOList.add(rIconVO);
                     }