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 riceWaterForecastCycles; private List 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 riceWaterForecastMonths = irrigationComprehensiveCaculateMonth(dto); + BigDecimal monthTotal = BigDecimal.ZERO; + for (RiceWaterForecastMonth riceWaterForecastMonth : riceWaterForecastMonths) { + monthTotal = monthTotal.add(riceWaterForecastMonth.getIrrigationUse()); + } //计算灌区水稻用水量-按周期 List 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);