From 1913d303004413111326ecd93e4b1a88e3cb5e36 Mon Sep 17 00:00:00 2001
From: yangzhe123 <2824096059@qq.com>
Date: Fri, 28 Nov 2025 10:32:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E4=B8=AA=E6=B1=82?=
 =?UTF-8?q?=E5=92=8C=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/hsz/entity/vo/RiceRqWaterCaculateVo.java   |  5 +++++
 .../gunshi/project/hsz/service/RiceRqWaterService.java | 10 ++++++++++
 2 files changed, 15 insertions(+)

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 315770e..7d58c59 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
@@ -6,6 +6,7 @@ import com.gunshi.project.hsz.model.RiceWaterForecastMonth;
 import com.gunshi.project.hsz.model.RiceWaterKi;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -17,4 +18,8 @@ public class RiceRqWaterCaculateVo {
     private List<RiceWaterForecastCycle> riceWaterForecastCycles;
 
     private List<RiceWaterForecastMonth> riceWaterForecastMonths;
+
+    private BigDecimal irrigationCycleTotalUse;
+
+    private BigDecimal irrigationMonthTotalUse;
 }
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 a3a9cc3..7635b4b 100644
--- a/src/main/java/com/gunshi/project/hsz/service/RiceRqWaterService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/RiceRqWaterService.java
@@ -576,8 +576,18 @@ public class RiceRqWaterService extends ServiceImpl<RiceRqWaterMapper, RiceRqWat
         dto.setRiceWaterKis(riceWaterKis);
         //计算灌区水稻用水量-按月份
         List<RiceWaterForecastMonth> riceWaterForecastMonths = irrigationComprehensiveCaculateMonth(dto);
+        BigDecimal monthTotal = BigDecimal.ZERO;
+        for (RiceWaterForecastMonth riceWaterForecastMonth : riceWaterForecastMonths) {
+            monthTotal = monthTotal.add(riceWaterForecastMonth.getIrrigationUse());
+        }
         //计算灌区水稻用水量-按周期
         List<RiceWaterForecastCycle> riceWaterForecastCycles = irrigationComprehensiveCaculateCycle(dto);
+        BigDecimal cycleTotal = BigDecimal.ZERO;
+        for (RiceWaterForecastCycle riceWaterForecastCycle : riceWaterForecastCycles) {
+            cycleTotal = cycleTotal.add(riceWaterForecastCycle.getIrrigationUse());
+        }
+        vo.setIrrigationMonthTotalUse(monthTotal);
+        vo.setIrrigationCycleTotalUse(cycleTotal);
         vo.setRiceWaterKis(riceWaterKis);
         vo.setRiceWaterForecastMonths(riceWaterForecastMonths);
         vo.setRiceWaterForecastCycles(riceWaterForecastCycles);