From 22c09b7cfee0ea19f2988c793bb420c7fa62c5c2 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Wed, 7 Jun 2023 09:46:01 +0800
Subject: [PATCH] =?UTF-8?q?pms=E5=8A=A0=E4=B8=8A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/RStatOrgMServiceImpl.java            | 35 ++++++++++++++-----
 .../impl/RStatOrgQServiceImpl.java            | 24 +++++++++----
 .../impl/RStatOrgYServiceImpl.java            | 22 ++++++++----
 3 files changed, 60 insertions(+), 21 deletions(-)

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java
index 8a6df4673..0ed573760 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java
@@ -1,6 +1,7 @@
 package com.njcn.harmonic.service.majornetwork.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
@@ -72,19 +73,35 @@ public class RStatOrgMServiceImpl extends ServiceImpl<RStatOrgMMapper, RStatOrgM
                     DeptDTO deptDTO = deptMap.get(key);
                     RStatOrgVO rStatOrgVO = new RStatOrgVO();
                     rStatOrgVO.setOrgName(deptDTO.getName());
-                    Float averageOverDay = Float.parseFloat(
-                            df.format(rStatOrgM.getOverDayAccrued() / (rStatOrgM.getEffectiveMeasurementAccrued() * 1.0)));
-                    rStatOrgVO.setAverageOverDay(averageOverDay);
+                    if(rStatOrgM.getOverDayAccrued()!=null&&rStatOrgM.getEffectiveMeasurementAccrued()!=null&&
+                            rStatOrgM.getOverDayAccrued()!=0&&rStatOrgM.getEffectiveMeasurementAccrued()!=0){
+                        Float averageOverDay = Float.parseFloat(
+                                df.format(rStatOrgM.getOverDayAccrued() / (rStatOrgM.getEffectiveMeasurementAccrued() * 1.0)));
+                        rStatOrgVO.setAverageOverDay(averageOverDay);
+                    }else{
+                        rStatOrgVO.setAverageOverDay(0.0f);
+                    }
+
                     rStatOrgVO.setEffectiveMeasurementAverage(rStatOrgM.getEffectiveMeasurementAverage());
                     rStatOrgVO.setEffectiveMeasurementAccrued(rStatOrgM.getEffectiveMeasurementAccrued());
                     rStatOrgVO.setOverLimitMeasurementAverage(rStatOrgM.getHarmonicMeasurementAverage());
                     rStatOrgVO.setOverLimitMeasurementAccrued(rStatOrgM.getHarmonicMeasurementAccrued());
-                    Float harmonicMeasurementRatioAverage = Float.parseFloat(
-                            df.format(rStatOrgM.getHarmonicMeasurementAverage() / (rStatOrgM.getEffectiveMeasurementAverage() * 1.0)));
-                    rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage);
-                    Float harmonicMeasurementRatioAccrued = Float.parseFloat(
-                            df.format(rStatOrgM.getHarmonicMeasurementAccrued() / (rStatOrgM.getEffectiveMeasurementAccrued() * 1.0)));
-                    rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued);
+                    if(rStatOrgM.getHarmonicMeasurementAverage()!=null&&rStatOrgM.getEffectiveMeasurementAverage()!=null&&
+                            rStatOrgM.getHarmonicMeasurementAverage()!=0&&rStatOrgM.getEffectiveMeasurementAverage()!=0){
+                        Float harmonicMeasurementRatioAverage = Float.parseFloat(
+                                df.format(rStatOrgM.getHarmonicMeasurementAverage() / (rStatOrgM.getEffectiveMeasurementAverage() * 1.0)));
+                        rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage);
+                    }else{
+                        rStatOrgVO.setHarmonicMeasurementRatioAverage(0.0f);
+                    }
+                    if(rStatOrgM.getHarmonicMeasurementAccrued()!=null&&rStatOrgM.getEffectiveMeasurementAccrued()!=null&&
+                            rStatOrgM.getHarmonicMeasurementAccrued()!=0&&rStatOrgM.getEffectiveMeasurementAccrued()!=0){
+                        Float harmonicMeasurementRatioAccrued = Float.parseFloat(
+                                df.format(rStatOrgM.getHarmonicMeasurementAccrued() / (rStatOrgM.getEffectiveMeasurementAccrued() * 1.0)));
+                        rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued);
+                    }else{
+                        rStatOrgVO.setHarmonicMeasurementRatioAccrued(0.0f);
+                    }
                     newList.add(rStatOrgVO);
                 }
             }
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgQServiceImpl.java
index 7aba335c8..1c9317d36 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgQServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgQServiceImpl.java
@@ -74,12 +74,24 @@ public class RStatOrgQServiceImpl extends ServiceImpl<RStatOrgQMapper, RStatOrgQ
                     rStatOrgVO.setOverLimitMeasurementAverage(rStatOrgQ.getHarmonicMeasurementAverage());
                     rStatOrgVO.setOverLimitMeasurementAccrued(rStatOrgQ.getHarmonicMeasurementAccrued());
                     DecimalFormat df = new DecimalFormat("###.00");
-                    Float harmonicMeasurementRatioAverage = Float.parseFloat(
-                            df.format(rStatOrgQ.getHarmonicMeasurementAverage() / (rStatOrgQ.getEffectiveMeasurementAverage() * 1.0)));
-                    rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage);
-                    Float harmonicMeasurementRatioAccrued = Float.parseFloat(
-                            df.format(rStatOrgQ.getHarmonicMeasurementAccrued() / (rStatOrgQ.getEffectiveMeasurementAccrued() * 1.0)));
-                    rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued);
+                    if(rStatOrgQ.getHarmonicMeasurementAverage()!=null&&rStatOrgQ.getEffectiveMeasurementAverage()!=null&&
+                            rStatOrgQ.getHarmonicMeasurementAverage()!=0&&rStatOrgQ.getEffectiveMeasurementAverage()!=0){
+                        Float harmonicMeasurementRatioAverage = Float.parseFloat(
+                                df.format(rStatOrgQ.getHarmonicMeasurementAverage() / (rStatOrgQ.getEffectiveMeasurementAverage() * 1.0)));
+                        rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage);
+                    }else{
+                        rStatOrgVO.setHarmonicMeasurementRatioAverage(0.0f);
+                    }
+                    if(rStatOrgQ.getHarmonicMeasurementAccrued()!=null&&rStatOrgQ.getEffectiveMeasurementAccrued()!=null&&
+                            rStatOrgQ.getHarmonicMeasurementAccrued()!=0&&rStatOrgQ.getEffectiveMeasurementAccrued()!=0){
+                        Float harmonicMeasurementRatioAccrued = Float.parseFloat(
+                                df.format(rStatOrgQ.getHarmonicMeasurementAccrued() / (rStatOrgQ.getEffectiveMeasurementAccrued() * 1.0)));
+                        rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued);
+                    }else{
+                        rStatOrgVO.setHarmonicMeasurementRatioAccrued(0.0f);
+                    }
+
+
                     newList.add(rStatOrgVO);
                 }
             }
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgYServiceImpl.java
index 3106bb964..99d9f752b 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgYServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgYServiceImpl.java
@@ -99,12 +99,22 @@ public class RStatOrgYServiceImpl extends ServiceImpl<RStatOrgYMapper, RStatOrgY
                     rStatOrgVO.setOverLimitMeasurementAverage(rStatOrgY.getOverLimitMeasurementAverage());
                     rStatOrgVO.setOverLimitMeasurementAccrued(rStatOrgY.getOverLimitMeasurementAccrued());
                     DecimalFormat df = new DecimalFormat("###.00");
-                    Float harmonicMeasurementRatioAverage = Float.parseFloat(
-                            df.format(rStatOrgY.getOverLimitMeasurementAverage() / (rStatOrgY.getEffectiveMeasurementAverage() * 1.0)));
-                    rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage);
-                    Float harmonicMeasurementRatioAccrued = Float.parseFloat(
-                            df.format(rStatOrgY.getOverLimitMeasurementAccrued() / (rStatOrgY.getEffectiveMeasurementAccrued() * 1.0)));
-                    rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued);
+                    if(rStatOrgY.getOverLimitMeasurementAverage()!=null&&rStatOrgY.getEffectiveMeasurementAverage()!=null&&
+                            rStatOrgY.getOverLimitMeasurementAverage()!=0&&rStatOrgY.getEffectiveMeasurementAverage()!=0){
+                        Float harmonicMeasurementRatioAverage = Float.parseFloat(
+                                df.format(rStatOrgY.getOverLimitMeasurementAverage() / (rStatOrgY.getEffectiveMeasurementAverage() * 1.0)));
+                        rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage);
+                    }else{
+                        rStatOrgVO.setHarmonicMeasurementRatioAverage(0.0f);
+                    }
+                    if(rStatOrgY.getOverLimitMeasurementAccrued()!=null&&rStatOrgY.getEffectiveMeasurementAccrued()!=null&&
+                            rStatOrgY.getOverLimitMeasurementAccrued()!=0&&rStatOrgY.getEffectiveMeasurementAccrued()!=0){
+                        Float harmonicMeasurementRatioAccrued = Float.parseFloat(
+                                df.format(rStatOrgY.getOverLimitMeasurementAccrued() / (rStatOrgY.getEffectiveMeasurementAccrued() * 1.0)));
+                        rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued);
+                    }else{
+                        rStatOrgVO.setHarmonicMeasurementRatioAccrued(0.0f);
+                    }
                     newList.add(rStatOrgVO);
                 }
             }