From 2728b57cb93706c59a6d98701775a3f0a899724c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Wed, 24 Jan 2024 19:01:41 +0800
Subject: [PATCH] =?UTF-8?q?1.pmsBug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/device/pms/pojo/vo/ROperatingIndexCommonVO.java  | 3 +++
 .../majornetwork/impl/ROperatingIndexMServiceImpl.java    | 4 +++-
 .../impl/RUploadPointStatisticalDataDServiceImpl.java     | 8 +++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ROperatingIndexCommonVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ROperatingIndexCommonVO.java
index eeba83716..d0aacd7cf 100644
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ROperatingIndexCommonVO.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ROperatingIndexCommonVO.java
@@ -1,5 +1,6 @@
 package com.njcn.device.pms.pojo.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -24,6 +25,8 @@ public class ROperatingIndexCommonVO {
 
     @ApiModelProperty(name = "orgName", value = "单位名称")
     private String orgName;
+
+    private Integer sort;
     /**
      * 时间
      */
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/ROperatingIndexMServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/ROperatingIndexMServiceImpl.java
index 0f0b0750d..c6f47ad72 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/ROperatingIndexMServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/ROperatingIndexMServiceImpl.java
@@ -19,6 +19,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.text.DecimalFormat;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -69,6 +70,7 @@ public class ROperatingIndexMServiceImpl extends ServiceImpl<ROperatingIndexMMap
             BeanUtils.copyProperties(item, rOperatingIndexCommonVO);
 
             rOperatingIndexCommonVO.setOrgName(deptDTOMap.get(item.getOrgNo()).getName()); //单位名称
+            rOperatingIndexCommonVO.setSort(deptDTOMap.get(item.getOrgNo()).getSort());
             //在线监测率
             Integer measurementRunPoints = item.getMeasurementRunPoints(); //监测点数
             Integer transitMeasurementPoints = item.getTransitMeasurementPoints(); //在线监测点数
@@ -79,7 +81,7 @@ public class ROperatingIndexMServiceImpl extends ServiceImpl<ROperatingIndexMMap
                 rOperatingIndexCommonVO.setTransitMeasurementRate(0.0);
             }
             return rOperatingIndexCommonVO;
-        }).collect(Collectors.toList());
+        }).sorted(Comparator.comparing(ROperatingIndexCommonVO::getSort)).collect(Collectors.toList());
         return resultList;
     }
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java
index 4dfb2c604..55b6a40b1 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java
@@ -22,6 +22,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -105,7 +106,12 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
                 int real = l3.stream().mapToInt(RStatIntegrityD::getRealTime).sum();
                 rUploadPointStatisticalDataD.setExpectCollectNum(due);
                 rUploadPointStatisticalDataD.setActualCollectNum(real);
-                rUploadPointStatisticalDataD.setDataFullRate(BigDecimal.valueOf(real*100.0/due).setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue());
+
+                if(due == 0 || real == 0){
+                    rUploadPointStatisticalDataD.setDataFullRate(BigDecimal.valueOf(0).setScale(4, RoundingMode.HALF_UP).doubleValue());
+                }else {
+                    rUploadPointStatisticalDataD.setDataFullRate(BigDecimal.valueOf(real*100.0/due).setScale(4, RoundingMode.HALF_UP).doubleValue());
+                }
                 rUploadPointStatisticalDataD.setStationMonitorNum(l3.size());
             }
             result.add(rUploadPointStatisticalDataD);