From eefd4026fd08fa0f1b57d1ad21164f394d449159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= Date: Tue, 5 Feb 2013 19:06:21 +0100 Subject: [PATCH] Modified getOrdersIdsByDates query to get the intersecting projects between start and end dates In this way it's possible to get all the projects for wich some part of their lenght is comprehended between the defined start and end dates, with the previous strategy only the projects which were completely included in the interval were being listed. FEA: ItEr77S15FilteringEnhancements --- .../java/org/libreplan/business/orders/daos/OrderDAO.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java index deb472008..eae72f169 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java @@ -320,11 +320,11 @@ public class OrderDAO extends IntegrationEntityDAO implements String strQuery = "SELECT t.taskSource.schedulingData.orderElement.id " + "FROM TaskElement t " + "WHERE t.parent IS NULL "; - if (startDate != null) { - strQuery += "AND t.startDate.date >= :startDate "; - } if (endDate != null) { - strQuery += "AND t.endDate.date <= :endDate "; + strQuery += "AND t.startDate.date <= :endDate "; + } + if (startDate != null) { + strQuery += "AND t.endDate.date >= :startDate "; } Query query = getSession().createQuery(strQuery);