1.河北临时台账调整

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityStatServiceImpl.java

@@ -109,12 +109,6 @@ public class DataQualityStatServiceImpl implements DataQualityStatService {
     @Override
     public List<ROperatingIndexVO> getMonitoringIndexDataQualityStat(StatisticsBizBaseParam param) {
 
-
-//        // 获取当前用户的部门的子部门信息
-//        List<PmsGeneralDeviceDTO> data = getPmsGeneralDeviceDTOList(param);
-//        // 取出单位id
-//        List<String> deptIdList = data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList());
-        //单位code集合
         /*获取下级子部门信息*/
         List<DeptDTO> deptDTOList = deptFeignClient.getDepSonDetailByDeptId (param.getId ()).getData ( );
         if (CollUtil.isEmpty(deptDTOList)) {

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java

@@ -316,9 +316,18 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
         BeanUtils.copyProperties(monitorParam, monitor);
         checkOther(monitorParam, monitor, true);
 
-        monitor.setIsUploadHead(3);
-        monitor.setMonitorUploadStatus(3);
-        monitor.setMonitorOverlimitStatus(3);
+
+        Monitor tem = this.getById(monitorParam.getId());
+        if(tem.getIsUploadHead() == 1){
+            monitor.setIsUploadHead(3);
+        }
+        if(tem.getMonitorUploadStatus() == 1){
+            monitor.setMonitorUploadStatus(3);
+        }
+        if(tem.getMonitorOverlimitStatus() == 1){
+            monitor.setMonitorOverlimitStatus(3);
+        }
+
         this.updateById(monitor);
 
         //修改监测点同时修改pms_special_monitor