解决布置图-渗流查询报错
parent
9151c708fa
commit
3702da0c36
|
|
@ -392,6 +392,7 @@ public class OsmoticPressRService extends ServiceImpl<OsmoticPressRMapper, Osmot
|
||||||
}
|
}
|
||||||
OsmoticQuerySo so = new OsmoticQuerySo();
|
OsmoticQuerySo so = new OsmoticQuerySo();
|
||||||
List<String> stationCodes = list.stream().map(OsmoticPressVo::getStationCode).collect(Collectors.toList());
|
List<String> stationCodes = list.stream().map(OsmoticPressVo::getStationCode).collect(Collectors.toList());
|
||||||
|
if(list.stream().filter(o->o.getTm() != null).collect(Collectors.toList()).size() > 0 ){
|
||||||
String maxTm = list.stream().filter(o->o.getTm() != null).max(Comparator.comparing(OsmoticPressVo::getTm)).get().getTm();
|
String maxTm = list.stream().filter(o->o.getTm() != null).max(Comparator.comparing(OsmoticPressVo::getTm)).get().getTm();
|
||||||
String minTm = list.stream().filter(o->o.getTm() != null).min(Comparator.comparing(OsmoticPressVo::getTm)).get().getTm();
|
String minTm = list.stream().filter(o->o.getTm() != null).min(Comparator.comparing(OsmoticPressVo::getTm)).get().getTm();
|
||||||
so.setStationCodes(stationCodes);
|
so.setStationCodes(stationCodes);
|
||||||
|
|
@ -410,6 +411,7 @@ public class OsmoticPressRService extends ServiceImpl<OsmoticPressRMapper, Osmot
|
||||||
}
|
}
|
||||||
return o;
|
return o;
|
||||||
}).collect(Collectors.toList());
|
}).collect(Collectors.toList());
|
||||||
|
}
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue