lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

企业大屏

Browse Source
This commit is contained in:
lcj
2025-09-12 22:16:33 +08:00
parent c662e1aa4d
commit c3899ae6a2
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/EnterpriseBigScreenController.java
View File

@ -183,6 +183,7 @@ public class EnterpriseBigScreenController {
} else { } else {
todayAttendanceCountVo.setAttendanceRate(0.0); todayAttendanceCountVo.setAttendanceRate(0.0);
} }
todayAttendanceCountVo.setAttendanceCount(Long.valueOf(countAttendance));
return R.ok(todayAttendanceCountVo); return R.ok(todayAttendanceCountVo);
} }

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/EnterpriseBigScreenServiceImpl.java
View File

@ -105,7 +105,7 @@ public class EnterpriseBigScreenServiceImpl implements EnterpriseBigScreenServic
.size(); .size();
BigDecimal photovoltaicTotalCapacity = projectList.stream() BigDecimal photovoltaicTotalCapacity = projectList.stream()
.filter(s -> s.getProjectType().equals("1")) .filter(s -> s.getProjectType().equals("1"))
.map(BusProject::getActual) .map(BusProject::getPlan)
.filter(s -> s != null && !s.isBlank()) // 过滤掉空值 .filter(s -> s != null && !s.isBlank()) // 过滤掉空值
.map(BigDecimal::new) // 转成 BigDecimal .map(BigDecimal::new) // 转成 BigDecimal
.reduce(BigDecimal.ZERO, BigDecimal::add); .reduce(BigDecimal.ZERO, BigDecimal::add);
@ -116,7 +116,7 @@ public class EnterpriseBigScreenServiceImpl implements EnterpriseBigScreenServic
.size(); .size();
BigDecimal windElectricityTotalCapacity = projectList.stream() BigDecimal windElectricityTotalCapacity = projectList.stream()
.filter(s -> s.getProjectType().equals("2")) .filter(s -> s.getProjectType().equals("2"))
.map(BusProject::getActual) .map(BusProject::getPlan)
.filter(s -> s != null && !s.isBlank()) // 过滤掉空值 .filter(s -> s != null && !s.isBlank()) // 过滤掉空值
.map(BigDecimal::new) // 转成 BigDecimal .map(BigDecimal::new) // 转成 BigDecimal
.reduce(BigDecimal.ZERO, BigDecimal::add); .reduce(BigDecimal.ZERO, BigDecimal::add);