diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java index 2f5bd6105..9aa2f2a7d 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java @@ -410,7 +410,7 @@ public interface LineMapper extends BaseMapper { "\t\tFROM\n", "\t\t\tpq_line a\n", "\t\tINNER JOIN pq_device b ON a.id = b.id\n", - "where b.Run_Flag = 0 and a.Pid in", + "where b.com_flag = 0 and a.Pid in", "", "#{item}", "", diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java index 92bcd455d..0e965efd7 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java @@ -712,10 +712,10 @@ public class GeneralDeviceService { List deptDeviceInfos = this.getDeviceInfoAsDept(deviceInfoParam, Stream.of(0, 1).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList())); - List DeviceIds = deptDeviceInfos.stream().map(GeneralDeviceDTO::getSubIndexes).flatMap(Collection::stream).collect(Collectors.toList()); - Integer substationCount = DeviceIds.size(); + List subIds = deptDeviceInfos.stream().map(GeneralDeviceDTO::getSubIndexes).flatMap(Collection::stream).collect(Collectors.toList()); + Integer substationCount = subIds.size(); - Integer count = lineMapper.queryOnlineSubstaion(DeviceIds); + Integer count = lineMapper.queryOnlineSubstaion(subIds); deptSubstationDetailVO.setSubstationCount(substationCount); deptSubstationDetailVO.setRunsubstationCount(count); BigDecimal rate = BigDecimal.valueOf(count).divide(BigDecimal.valueOf(substationCount), 4, BigDecimal.ROUND_HALF_UP);