BUG修改
parent
b408547964
commit
3207fc225f
|
|
@ -143,16 +143,18 @@ public class ReservoirWaterService {
|
||||||
irrQw1.eq("stcd", stcd1).orderBy(true, false, "tm");
|
irrQw1.eq("stcd", stcd1).orderBy(true, false, "tm");
|
||||||
StWaterRReal stWaterRReal1 = stWaterRRealService.getOne(irrQw1);
|
StWaterRReal stWaterRReal1 = stWaterRRealService.getOne(irrQw1);
|
||||||
if(stWaterRReal1 != null){
|
if(stWaterRReal1 != null){
|
||||||
totalSum.add(stWaterRReal1.getQ());
|
totalSum = totalSum.add(stWaterRReal1.getQ());
|
||||||
}
|
}
|
||||||
String stcd2 = "1113";
|
String stcd2 = "1113";
|
||||||
QueryWrapper<StWaterRReal> irrQw2 = new QueryWrapper<>();
|
QueryWrapper<StWaterRReal> irrQw2 = new QueryWrapper<>();
|
||||||
irrQw2.eq("stcd", stcd2).orderBy(true, false, "tm");
|
irrQw2.eq("stcd", stcd2).orderBy(true, false, "tm");
|
||||||
StWaterRReal stWaterRReal2 = stWaterRRealService.getOne(irrQw2);
|
StWaterRReal stWaterRReal2 = stWaterRRealService.getOne(irrQw2);
|
||||||
if(stWaterRReal2 != null){
|
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";
|
String ecologyStcd = "1114";
|
||||||
QueryWrapper<StWaterRReal> ecologyQw = new QueryWrapper<>();
|
QueryWrapper<StWaterRReal> ecologyQw = new QueryWrapper<>();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue