diff --git a/src/main/java/com/gunshi/project/hsz/service/ReservoirWaterService.java b/src/main/java/com/gunshi/project/hsz/service/ReservoirWaterService.java index 0210be7..170064d 100644 --- a/src/main/java/com/gunshi/project/hsz/service/ReservoirWaterService.java +++ b/src/main/java/com/gunshi/project/hsz/service/ReservoirWaterService.java @@ -143,16 +143,18 @@ public class ReservoirWaterService { irrQw1.eq("stcd", stcd1).orderBy(true, false, "tm"); StWaterRReal stWaterRReal1 = stWaterRRealService.getOne(irrQw1); if(stWaterRReal1 != null){ - totalSum.add(stWaterRReal1.getQ()); + totalSum = totalSum.add(stWaterRReal1.getQ()); } String stcd2 = "1113"; QueryWrapper irrQw2 = new QueryWrapper<>(); irrQw2.eq("stcd", stcd2).orderBy(true, false, "tm"); StWaterRReal stWaterRReal2 = stWaterRRealService.getOne(irrQw2); if(stWaterRReal2 != null){ - totalSum.add(stWaterRReal2.getQ()); + totalSum = totalSum.add(stWaterRReal2.getQ()); + } + for (AttResBaseVo attResBaseVo : voList) { + attResBaseVo.setIrrigationFlowSum(totalSum); } - voList.stream().forEach(o -> o.setIrrigationFlowSum(totalSum)); //获取生态供水流量 String ecologyStcd = "1114"; QueryWrapper ecologyQw = new QueryWrapper<>();