yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增一个求和字段

master
yangzhe123 2025-11-28 10:32:24 +08:00
parent edae909b8b
commit 1913d30300
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/gunshi/project/hsz/entity/vo/RiceRqWaterCaculateVo.java
View File

@ -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;
}

10
src/main/java/com/gunshi/project/hsz/service/RiceRqWaterService.java
View File

@ -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);