[PATCH] Issue1854: Adapt statement to QualityMeasurementFactory

[Wald Commits]

# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1449504214 -3600
# Node ID 85f36f9f1bd31138258e7a529f6ef9af3d609b0a
# Parent  50ff99266e0e0dc6cd97858004d176e8cc8fc2c6
Issue1854: Adapt statement to QualityMeasurementFactory

diff -r 50ff99266e0e -r 85f36f9f1bd3 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedOverview.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedOverview.java	Thu Dec 03 14:44:35 2015 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedOverview.java	Mon Dec 07 17:03:34 2015 +0100
@@ -90,16 +90,17 @@
         "    so.km    AS km," +
         "    so.datum AS datum " +
         "FROM sohltest so " +
-        "    JOIN station s" +
-        "       ON so.stationid = s.stationid " +
-        "    JOIN gewaesser g " +
-        "       ON s.gewaesserid = g.gewaesserid " +
+        "    JOIN station s ON so.stationid = s.stationid " +
+        "    JOIN gewaesser g ON s.gewaesserid = g.gewaesserid " +
+        "    JOIN sohlprobe sp ON sp.sohltestid = so.sohltestid " +
+        "    JOIN siebanalyse sa ON sa.sohlprobeid = sp.sohlprobeid " +
         "WHERE" +
         "    g.name = :name" +
         "    AND so.km IS NOT NULL" +
         "    AND so.km BETWEEN :from AND :to " +
-        "ORDER by" +
-        "    so.km, so.datum";
+        "    AND sp.tiefevon IS NOT NULL " +
+        "    AND sp.tiefebis IS NOT NULL " +
+        "ORDER BY so.km, so.datum";
 
     protected String riverName;
     protected String SeddbRiverName;