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

修复了一点小BUG

master
yangzhe123 2025-12-22 16:13:14 +08:00
parent e5d6f25789
commit e37b74fd08
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gunshi/project/hsz/service/ReservoirWaterService.java
View File

@ -211,6 +211,7 @@ public class ReservoirWaterService {
if(tm != null && tm.before(currentHour)){ if(tm != null && tm.before(currentHour)){
vo.setRz(null); vo.setRz(null);
vo.setTm(null); vo.setTm(null);
vo.setDrpTm(null);
}else if (tm != null && rz != null){ }else if (tm != null && rz != null){
if (rz != null) { if (rz != null) {
//BigDecimal w = stZvarlBService.getWFromZvarl(rz, null, zvarlList); //BigDecimal w = stZvarlBService.getWFromZvarl(rz, null, zvarlList);
@ -263,6 +264,9 @@ public class ReservoirWaterService {
}else if(stWaterRReal2 != null){ }else if(stWaterRReal2 != null){
attResBaseVo.setIrrigationFlowTm(stWaterRReal2.getTm()); attResBaseVo.setIrrigationFlowTm(stWaterRReal2.getTm());
} }
if(totalSum == null){
attResBaseVo.setIrrigationFlowTm(null);
}
} }
//获取新建生态供水流量站最新得流量 //获取新建生态供水流量站最新得流量
String ecologyStcd = "1114"; String ecologyStcd = "1114";

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

@ -645,6 +645,7 @@ public class RiceRqWaterService extends ServiceImpl<RiceRqWaterMapper, RiceRqWat
cycleTotal = cycleTotal.add(riceWaterForecastCycle.getIrrigationUse()); cycleTotal = cycleTotal.add(riceWaterForecastCycle.getIrrigationUse());
// riceWaterForecastCycle.setIrrigationUse(riceWaterForecastCycle.getIrrigationUse().setScale(2,RoundingMode.HALF_UP)); // riceWaterForecastCycle.setIrrigationUse(riceWaterForecastCycle.getIrrigationUse().setScale(2,RoundingMode.HALF_UP));
} }
monthTotal = cycleTotal;
vo.setIrrigationMonthTotalUse(monthTotal.setScale(2,RoundingMode.HALF_UP)); vo.setIrrigationMonthTotalUse(monthTotal.setScale(2,RoundingMode.HALF_UP));
vo.setIrrigationCycleTotalUse(cycleTotal.setScale(2,RoundingMode.HALF_UP)); vo.setIrrigationCycleTotalUse(cycleTotal.setScale(2,RoundingMode.HALF_UP));
vo.setRiceWaterKis(riceWaterKis); vo.setRiceWaterKis(riceWaterKis);