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