From 9a5bc44df690414f7b99c835449f49b2b88154f6 Mon Sep 17 00:00:00 2001 From: shenyijian <1178253012@qq.com> Date: Fri, 18 Oct 2024 10:45:55 +0800 Subject: [PATCH] 湖北水库：解决施工项目列表报错 --- skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java index d48235a..f42b712 100644 --- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java +++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java @@ -240,7 +240,7 @@ double sum = deviceDOS.stream().mapToDouble(s -> Double.parseDouble(s.getProgress())).sum(); BigDecimal deviceOver = BigDecimal.valueOf(sum); BigDecimal divideDevice = deviceOver.divide(deviceSize, 2, RoundingMode.HALF_UP); - List<SgDeviceDO> sortDeviceDOs = deviceDOS.stream().sorted(Comparator.comparing(SgDeviceDO::getPrice)).collect(Collectors.toList()); + List<SgDeviceDO> sortDeviceDOs = deviceDOS.stream().filter(s->s.getPrice()!=null).sorted(Comparator.comparing(SgDeviceDO::getPrice)).collect(Collectors.toList()); typeVO.setDeviceDOS(sortDeviceDOs); typeVO.setTypeProgress(getBigDecimalPercent(divideDevice)); typeVO.setProgress(divideDevice.toString()); -- Gitblit v1.9.3