1.pmsBug修改

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;
     /**
      * 时间
      */

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;
     }
 }