From 029d92fc07b466c09b50b6bf48ede725a1587f05 Mon Sep 17 00:00:00 2001
From: cxw <1520264117@qq.com>
Date: Thu, 14 Nov 2024 16:20:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9C=88=E6=A0=B8=E5=AE=9A?=
 =?UTF-8?q?=E6=B5=81=E9=87=8F=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gunshi/project/xyt/controller/StWaterRController.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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<ResMonthEcoFlow>().eq("month", Integer.valueOf(DateUtil.getYM().substring(4))));
-            BigDecimal value = monthFlow.getValue();
+        List<ResMonthEcoFlow> resMonthEcoFlows = resMonthEcoFlowService.list();
+        if(CollectionUtils.isNotEmpty(list) && CollectionUtils.isNotEmpty(resMonthEcoFlows)){
+            Map<Integer, BigDecimal> 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);
             });