diff --git a/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java b/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java index 0947cba..784cb9d 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java @@ -149,10 +149,11 @@ public class StWaterRController { wrapper.orderBy(true, ObjectUtils.isEmpty(stWaterR.getIsAsc()) ? false : stWaterR.getIsAsc(), stWaterR.getOrderField()); } list = service.list(wrapper); - if(CollectionUtils.isNotEmpty(list)){ - ResMonthEcoFlow monthFlow = resMonthEcoFlowService.getOne(new QueryWrapper().eq("month", Integer.valueOf(DateUtil.getYM().substring(4)))); - BigDecimal value = monthFlow.getValue(); + List resMonthEcoFlows = resMonthEcoFlowService.list(); + if(CollectionUtils.isNotEmpty(list) && CollectionUtils.isNotEmpty(resMonthEcoFlows)){ + Map resMonthEcoFlowMap = resMonthEcoFlows.stream().collect(Collectors.toMap(ResMonthEcoFlow::getMonth, ResMonthEcoFlow::getValue)); list.stream().forEach(w -> { + BigDecimal value = resMonthEcoFlowMap.get(w.getTm().getMonth()); w.setApprovalV(value); w.setIsStandard(w.getQ().compareTo(value) >= 0 ? true : false); });