From f9765f11ac497aa8fbcddf5d79630a9233975d5b Mon Sep 17 00:00:00 2001
From: yangzhe123 <2824096059@qq.com>
Date: Tue, 2 Dec 2025 15:44:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=9C=E4=B8=9A=E9=9C=80=E6=B0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hsz/entity/vo/RiceRqWaterCaculateVo.java        | 13 ++++++++-----
 .../project/hsz/service/RiceRqWaterService.java     | 12 ++++++++++--
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/gunshi/project/hsz/entity/vo/RiceRqWaterCaculateVo.java b/src/main/java/com/gunshi/project/hsz/entity/vo/RiceRqWaterCaculateVo.java
index 7d58c59..22b61f0 100644
--- a/src/main/java/com/gunshi/project/hsz/entity/vo/RiceRqWaterCaculateVo.java
+++ b/src/main/java/com/gunshi/project/hsz/entity/vo/RiceRqWaterCaculateVo.java
@@ -1,6 +1,7 @@
 package com.gunshi.project.hsz.entity.vo;
 
 
+import com.gunshi.project.hsz.model.RiceGrowConfig;
 import com.gunshi.project.hsz.model.RiceWaterForecastCycle;
 import com.gunshi.project.hsz.model.RiceWaterForecastMonth;
 import com.gunshi.project.hsz.model.RiceWaterKi;
@@ -13,13 +14,15 @@ import java.util.List;
 public class RiceRqWaterCaculateVo {
 
 
-    private List<RiceWaterKi> riceWaterKis;
+    private List<RiceWaterKi> riceWaterKis;// 灌水定额配置
 
-    private List<RiceWaterForecastCycle> riceWaterForecastCycles;
+    private List<RiceWaterForecastCycle> riceWaterForecastCycles;//周期数据
 
-    private List<RiceWaterForecastMonth> riceWaterForecastMonths;
+    private List<RiceWaterForecastMonth> riceWaterForecastMonths;//月份数据
 
-    private BigDecimal irrigationCycleTotalUse;
+    private BigDecimal irrigationCycleTotalUse;//按年份统计总水量
 
-    private BigDecimal irrigationMonthTotalUse;
+    private BigDecimal irrigationMonthTotalUse;//按月份统计总水量
+
+    private RiceGrowConfig riceGrowConfig;//水稻生长参数配置表
 }
diff --git a/src/main/java/com/gunshi/project/hsz/service/RiceRqWaterService.java b/src/main/java/com/gunshi/project/hsz/service/RiceRqWaterService.java
index 7635b4b..16e60ca 100644
--- a/src/main/java/com/gunshi/project/hsz/service/RiceRqWaterService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/RiceRqWaterService.java
@@ -425,9 +425,15 @@ public class RiceRqWaterService extends ServiceImpl<RiceRqWaterMapper, RiceRqWat
     }
 
     public List<RiceWaterForecastMonth> irrigationComprehensiveCaculateMonth(RiceWaterCaculateDto dto) {
-        List<RiceIrrigationUse> riceIrrigationUses = irrigationCaculate(dto);//获取灌区水稻用水量
-        List<RiceWaterForecastMonth> res = new ArrayList<>();
         RiceGrowConfig riceGrowConfig = dto.getRiceGrowConfig();
+        List<RiceIrrigationUse> riceIrrigationUses = irrigationCaculate(dto);//获取灌区水稻用水量
+        BigDecimal totalWaterUse = BigDecimal.ZERO;
+        for (RiceIrrigationUse riceIrrigationUs : riceIrrigationUses) {
+            totalWaterUse = totalWaterUse.add(riceIrrigationUs.getIrrigationUse());
+        }
+        riceGrowConfig.setWaterUse(totalWaterUse);
+        List<RiceWaterForecastMonth> res = new ArrayList<>();
+
         //灌溉区面积（亩）
         BigDecimal sArea = riceGrowConfig.getArea();
 
@@ -571,6 +577,7 @@ public class RiceRqWaterService extends ServiceImpl<RiceRqWaterMapper, RiceRqWat
 
     public RiceRqWaterCaculateVo caculate(RiceWaterCaculateDto dto) {
         //先计算阶段耗水量
+        RiceGrowConfig riceGrowConfig = dto.getRiceGrowConfig();
         RiceRqWaterCaculateVo vo = new RiceRqWaterCaculateVo();
         List<RiceWaterKi> riceWaterKis = stageCaculate(dto);
         dto.setRiceWaterKis(riceWaterKis);
@@ -580,6 +587,7 @@ public class RiceRqWaterService extends ServiceImpl<RiceRqWaterMapper, RiceRqWat
         for (RiceWaterForecastMonth riceWaterForecastMonth : riceWaterForecastMonths) {
             monthTotal = monthTotal.add(riceWaterForecastMonth.getIrrigationUse());
         }
+        riceGrowConfig.setIrrigationUse(monthTotal);
         //计算灌区水稻用水量-按周期
         List<RiceWaterForecastCycle> riceWaterForecastCycles = irrigationComprehensiveCaculateCycle(dto);
         BigDecimal cycleTotal = BigDecimal.ZERO;