changeset 8780:85f36f9f1bd3

Issue1854: Adapt statement to QualityMeasurementFactory
author Tom Gottfried <tom@intevation.de>
date Mon, 07 Dec 2015 17:03:34 +0100
parents 50ff99266e0e
children 9530a00056dd
files artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedOverview.java
diffstat 1 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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;

http://dive4elements.wald.intevation.org