yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/tsg' into tsg

master
wany 2024-11-14 17:27:37 +08:00
parent 84bee22308 cd12073768
commit 8dc2d59fce
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java
View File

@ -153,7 +153,7 @@ public class StWaterRController {
if(CollectionUtils.isNotEmpty(list) && CollectionUtils.isNotEmpty(resMonthEcoFlows)){ if(CollectionUtils.isNotEmpty(list) && CollectionUtils.isNotEmpty(resMonthEcoFlows)){
Map<Integer, BigDecimal> resMonthEcoFlowMap = resMonthEcoFlows.stream().collect(Collectors.toMap(ResMonthEcoFlow::getMonth, ResMonthEcoFlow::getValue)); Map<Integer, BigDecimal> resMonthEcoFlowMap = resMonthEcoFlows.stream().collect(Collectors.toMap(ResMonthEcoFlow::getMonth, ResMonthEcoFlow::getValue));
list.stream().forEach(w -> { list.stream().forEach(w -> {
BigDecimal value = resMonthEcoFlowMap.get(w.getTm().getMonth()); BigDecimal value = resMonthEcoFlowMap.get(w.getTm().getMonth() + 1);
w.setApprovalV(value); w.setApprovalV(value);
w.setIsStandard(w.getQ().compareTo(value) >= 0 ? true : false); w.setIsStandard(w.getQ().compareTo(value) >= 0 ? true : false);
}); });