From c3899ae6a251bbb83c9870685aa48558722374cd Mon Sep 17 00:00:00 2001 From: lcj <2331845269@qq.com> Date: Fri, 12 Sep 2025 22:16:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bigscreen/controller/EnterpriseBigScreenController.java | 1 + .../service/impl/EnterpriseBigScreenServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/EnterpriseBigScreenController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/EnterpriseBigScreenController.java index d8986d0d..4ff7e489 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/EnterpriseBigScreenController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/EnterpriseBigScreenController.java @@ -183,6 +183,7 @@ public class EnterpriseBigScreenController { } else { todayAttendanceCountVo.setAttendanceRate(0.0); } + todayAttendanceCountVo.setAttendanceCount(Long.valueOf(countAttendance)); return R.ok(todayAttendanceCountVo); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/EnterpriseBigScreenServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/EnterpriseBigScreenServiceImpl.java index c928c400..75211478 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/EnterpriseBigScreenServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/EnterpriseBigScreenServiceImpl.java @@ -105,7 +105,7 @@ public class EnterpriseBigScreenServiceImpl implements EnterpriseBigScreenServic .size(); BigDecimal photovoltaicTotalCapacity = projectList.stream() .filter(s -> s.getProjectType().equals("1")) - .map(BusProject::getActual) + .map(BusProject::getPlan) .filter(s -> s != null && !s.isBlank()) // 过滤掉空值 .map(BigDecimal::new) // 转成 BigDecimal .reduce(BigDecimal.ZERO, BigDecimal::add); @@ -116,7 +116,7 @@ public class EnterpriseBigScreenServiceImpl implements EnterpriseBigScreenServic .size(); BigDecimal windElectricityTotalCapacity = projectList.stream() .filter(s -> s.getProjectType().equals("2")) - .map(BusProject::getActual) + .map(BusProject::getPlan) .filter(s -> s != null && !s.isBlank()) // 过滤掉空值 .map(BigDecimal::new) // 转成 BigDecimal .reduce(BigDecimal.ZERO, BigDecimal::add);