Author: echatellier Date: 2014-07-03 15:14:43 +0200 (Thu, 03 Jul 2014) New Revision: 336 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/336 Log: Prise en compte des dates seulement (et non des heures) Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-07-03 11:50:49 UTC (rev 335) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-07-03 13:14:43 UTC (rev 336) @@ -24,6 +24,8 @@ * #L% */ +import java.util.Calendar; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,6 +33,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; @@ -55,14 +58,16 @@ // email minReceptionDate if (emailFilter.getMinReceptionDate() != null) { + Date date = DateUtils.truncate(emailFilter.getMinReceptionDate(), Calendar.DAY_OF_MONTH); query.append(" AND E." + Email.PROPERTY_RECEPTION_DATE + " >= :" + EmailFilter.PROPERTY_MIN_RECEPTION_DATE); - args.put(EmailFilter.PROPERTY_MIN_RECEPTION_DATE, emailFilter.getMinReceptionDate()); + args.put(EmailFilter.PROPERTY_MIN_RECEPTION_DATE, date); } // email maxReceptionDate if (emailFilter.getMaxReceptionDate() != null) { + Date date = DateUtils.ceiling(emailFilter.getMaxReceptionDate(), Calendar.DAY_OF_MONTH); query.append(" AND E." + Email.PROPERTY_RECEPTION_DATE + " <= :" + EmailFilter.PROPERTY_MAX_RECEPTION_DATE); - args.put(EmailFilter.PROPERTY_MAX_RECEPTION_DATE, emailFilter.getMaxReceptionDate()); + args.put(EmailFilter.PROPERTY_MAX_RECEPTION_DATE, date); } // email taken by @@ -77,8 +82,9 @@ query.append(" AND H." + History.PROPERTY_TYPE + " = :modificationType"); args.put("modificationType", HistoryType.MODIFICATION); if (emailFilter.getMinModificationDate() != null) { + Date date = DateUtils.truncate(emailFilter.getMinModificationDate(), Calendar.DAY_OF_MONTH); query.append(" AND H." + History.PROPERTY_MODIFICATION_DATE + " >= :" + EmailFilter.PROPERTY_MIN_MODIFICATION_DATE); - args.put(EmailFilter.PROPERTY_MIN_MODIFICATION_DATE, emailFilter.getMinModificationDate()); + args.put(EmailFilter.PROPERTY_MIN_MODIFICATION_DATE, date); } if (emailFilter.getModifiedBy() != null) { query.append(" AND H." + History.PROPERTY_FAX_TO_MAIL_USER + " = :" + EmailFilter.PROPERTY_MODIFIED_BY); @@ -93,8 +99,9 @@ query.append(" AND H." + History.PROPERTY_TYPE + " = :modificationType"); args.put("modificationType", HistoryType.MODIFICATION); if (emailFilter.getMaxModificationDate() != null) { + Date date = DateUtils.ceiling(emailFilter.getMaxModificationDate(), Calendar.DAY_OF_MONTH); query.append(" AND H." + History.PROPERTY_MODIFICATION_DATE + " <= :" + EmailFilter.PROPERTY_MAX_MODIFICATION_DATE); - args.put(EmailFilter.PROPERTY_MAX_MODIFICATION_DATE, emailFilter.getMaxModificationDate()); + args.put(EmailFilter.PROPERTY_MAX_MODIFICATION_DATE, date); } if (emailFilter.getModifiedBy() != null) { query.append(" AND H." + History.PROPERTY_FAX_TO_MAIL_USER + " = :" + EmailFilter.PROPERTY_MODIFIED_BY); @@ -109,8 +116,9 @@ query.append(" AND H." + History.PROPERTY_TYPE + " = :transmissionType"); args.put("transmissionType", HistoryType.TRANSMISSION); if (emailFilter.getMinTransferDate() != null) { + Date date = DateUtils.truncate(emailFilter.getMinTransferDate(), Calendar.DAY_OF_MONTH); query.append(" AND H." + History.PROPERTY_MODIFICATION_DATE + " >= :" + EmailFilter.PROPERTY_MIN_TRANSFER_DATE); - args.put(EmailFilter.PROPERTY_MIN_TRANSFER_DATE, emailFilter.getMinTransferDate()); + args.put(EmailFilter.PROPERTY_MIN_TRANSFER_DATE, date); } if (emailFilter.getTransferBy() != null) { query.append(" AND H." + History.PROPERTY_FAX_TO_MAIL_USER + " = :" + EmailFilter.PROPERTY_TRANSFER_BY); @@ -125,8 +133,9 @@ query.append(" AND H." + History.PROPERTY_TYPE + " = :transmissionType"); args.put("transmissionType", HistoryType.TRANSMISSION); if (emailFilter.getMaxTransferDate() != null) { + Date date = DateUtils.ceiling(emailFilter.getMaxTransferDate(), Calendar.DAY_OF_MONTH); query.append(" AND H." + History.PROPERTY_MODIFICATION_DATE + " <= :" + EmailFilter.PROPERTY_MAX_TRANSFER_DATE); - args.put(EmailFilter.PROPERTY_MAX_TRANSFER_DATE, emailFilter.getMaxTransferDate()); + args.put(EmailFilter.PROPERTY_MAX_TRANSFER_DATE, date); } if (emailFilter.getTransferBy() != null) { query.append(" AND H." + History.PROPERTY_FAX_TO_MAIL_USER + " = :" + EmailFilter.PROPERTY_TRANSFER_BY); @@ -141,8 +150,9 @@ query.append(" AND H." + History.PROPERTY_TYPE + " = :archivedType"); args.put("archivedType", HistoryType.ARCHIVED); if (emailFilter.getMinArchivedDate() != null) { + Date date = DateUtils.truncate(emailFilter.getMinArchivedDate(), Calendar.DAY_OF_MONTH); query.append(" AND H." + History.PROPERTY_MODIFICATION_DATE + " >= :" + EmailFilter.PROPERTY_MIN_ARCHIVED_DATE); - args.put(EmailFilter.PROPERTY_MIN_ARCHIVED_DATE, emailFilter.getMinArchivedDate()); + args.put(EmailFilter.PROPERTY_MIN_ARCHIVED_DATE, date); } if (emailFilter.getArchivedBy() != null) { query.append(" AND H." + History.PROPERTY_FAX_TO_MAIL_USER + " = :" + EmailFilter.PROPERTY_ARCHIVED_BY); @@ -157,8 +167,9 @@ query.append(" AND H." + History.PROPERTY_TYPE + " = :transmissionType"); args.put("transmissionType", HistoryType.TRANSMISSION); if (emailFilter.getMaxArchivedDate() != null) { + Date date = DateUtils.ceiling(emailFilter.getMaxArchivedDate(), Calendar.DAY_OF_MONTH); query.append(" AND H." + History.PROPERTY_MODIFICATION_DATE + " <= :" + EmailFilter.PROPERTY_MAX_ARCHIVED_DATE); - args.put(EmailFilter.PROPERTY_MAX_ARCHIVED_DATE, emailFilter.getMaxArchivedDate()); + args.put(EmailFilter.PROPERTY_MAX_ARCHIVED_DATE, date); } if (emailFilter.getArchivedBy() != null) { query.append(" AND H." + History.PROPERTY_FAX_TO_MAIL_USER + " = :" + EmailFilter.PROPERTY_ARCHIVED_BY); @@ -173,8 +184,9 @@ query.append(" AND H." + History.PROPERTY_TYPE + " = :printingType"); args.put("printingType", HistoryType.PRINTING); if (emailFilter.getMinPrintingDate() != null) { + Date date = DateUtils.truncate(emailFilter.getMinPrintingDate(), Calendar.DAY_OF_MONTH); query.append(" AND H." + History.PROPERTY_MODIFICATION_DATE + " >= :" + EmailFilter.PROPERTY_MIN_PRINTING_DATE); - args.put(EmailFilter.PROPERTY_MIN_PRINTING_DATE, emailFilter.getMinPrintingDate()); + args.put(EmailFilter.PROPERTY_MIN_PRINTING_DATE, date); } if (emailFilter.getPrintingBy() != null) { query.append(" AND H." + History.PROPERTY_FAX_TO_MAIL_USER + " = :" + EmailFilter.PROPERTY_PRINTING_BY); @@ -189,8 +201,9 @@ query.append(" AND H." + History.PROPERTY_TYPE + " = :printingType"); args.put("printingType", HistoryType.PRINTING); if (emailFilter.getMaxPrintingDate() != null) { + Date date = DateUtils.ceiling(emailFilter.getMaxPrintingDate(), Calendar.DAY_OF_MONTH); query.append(" AND H." + History.PROPERTY_MODIFICATION_DATE + " <= :" + EmailFilter.PROPERTY_MAX_PRINTING_DATE); - args.put(EmailFilter.PROPERTY_MAX_PRINTING_DATE, emailFilter.getMaxPrintingDate()); + args.put(EmailFilter.PROPERTY_MAX_PRINTING_DATE, date); } if (emailFilter.getPrintingBy() != null) { query.append(" AND H." + History.PROPERTY_FAX_TO_MAIL_USER + " = :" + EmailFilter.PROPERTY_PRINTING_BY); @@ -205,8 +218,9 @@ query.append(" AND H." + History.PROPERTY_TYPE + " = :replyType"); args.put("replyType", HistoryType.REPLY); if (emailFilter.getMinReplyDate() != null) { + Date date = DateUtils.truncate(emailFilter.getMinReplyDate(), Calendar.DAY_OF_MONTH); query.append(" AND H." + History.PROPERTY_MODIFICATION_DATE + " >= :" + EmailFilter.PROPERTY_MIN_REPLY_DATE); - args.put(EmailFilter.PROPERTY_MIN_REPLY_DATE, emailFilter.getMinReplyDate()); + args.put(EmailFilter.PROPERTY_MIN_REPLY_DATE, date); } if (emailFilter.getReplyBy() != null) { query.append(" AND H." + History.PROPERTY_FAX_TO_MAIL_USER + " = :" + EmailFilter.PROPERTY_REPLY_BY); @@ -221,8 +235,9 @@ query.append(" AND H." + History.PROPERTY_TYPE + " = :replyType"); args.put("replyType", HistoryType.REPLY); if (emailFilter.getMaxReplyDate() != null) { + Date date = DateUtils.ceiling(emailFilter.getMaxReplyDate(), Calendar.DAY_OF_MONTH); query.append(" AND H." + History.PROPERTY_MODIFICATION_DATE + " <= :" + EmailFilter.PROPERTY_MAX_REPLY_DATE); - args.put(EmailFilter.PROPERTY_MAX_REPLY_DATE, emailFilter.getMaxReplyDate()); + args.put(EmailFilter.PROPERTY_MAX_REPLY_DATE, date); } if (emailFilter.getReplyBy() != null) { query.append(" AND H." + History.PROPERTY_FAX_TO_MAIL_USER + " = :" + EmailFilter.PROPERTY_REPLY_BY);