Mercurial > dive4elements > river
changeset 9153:910334e2eadd
Merge
| author | mschaefer |
|---|---|
| date | Thu, 14 Jun 2018 17:03:53 +0200 |
| parents | bb929b444ea5 (current diff) 8d4e7e08dbc0 (diff) |
| children | cd24db77f044 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/model/sinfo/CollisionAggregateValue.java Thu Jun 14 16:57:14 2018 +0200 +++ b/backend/src/main/java/org/dive4elements/river/model/sinfo/CollisionAggregateValue.java Thu Jun 14 17:03:53 2018 +0200 @@ -106,7 +106,7 @@ + " FROM collision_values v INNER JOIN collision s ON v.collision_id=s.id" + " WHERE (collision_id=:parent)" + " AND (station BETWEEN (:kmLo - 0.0001) AND (:kmHi + 0.0001))" - + " GROUP BY FLOOR(station+0.4999);").addScalar("station", StandardBasicTypes.DOUBLE) + + " GROUP BY FLOOR(station+0.4999)").addScalar("station", StandardBasicTypes.DOUBLE) .addScalar("count", StandardBasicTypes.INTEGER).addScalar("date_min", StandardBasicTypes.DATE) .addScalar("date_max", StandardBasicTypes.DATE).addScalar("gauge_w", StandardBasicTypes.DOUBLE); query.setInteger("parent", parent.getId());