Author: bleny Date: 2011-06-06 10:15:32 +0000 (Mon, 06 Jun 2011) New Revision: 1317 Log: use contact creation date instead of topiaCreateDate in queries Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2011-06-06 08:40:33 UTC (rev 1316) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2011-06-06 10:15:32 UTC (rev 1317) @@ -65,7 +65,7 @@ // Construct a subQuery to get the date of the most recent contact done by company for this boat TopiaQuery subQuery = createQuery(subContactProperty.$alias()). setSelect(WaoQueryHelper.format( - "MAX($1)", subContactProperty.topiaCreateDate())). // Max will give us the most recent contact + "MAX($1)", subContactProperty.creationDate())). // Max will give us the most recent contact addWhere(WaoQueryHelper.format( "$1 = $2", subContactProperty.boat(), mainContactProperty.boat())). addEquals(subContactProperty.obsProgramOrdinal(), obsProgram.ordinal()). Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2011-06-06 08:40:33 UTC (rev 1316) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2011-06-06 10:15:32 UTC (rev 1317) @@ -560,7 +560,7 @@ "($1 IS NOT NULL AND $1 BETWEEN :fromDate AND :thruDate)" + " OR ($1 IS NULL AND $2 BETWEEN :fromDate AND :thruDate)", contactProperty.observationBeginDate(), - contactProperty.topiaCreateDate()) + contactProperty.creationDate()) ).addParam("fromDate", period.getFromDate()). addParam("thruDate", period.getThruDate()); }