Author: vsalaun Date: 2011-05-24 21:25:00 +0200 (Tue, 24 May 2011) New Revision: 3142 Url: http://chorem.org/repositories/revision/lima/3142 Log: #268 missing files (oupsy) Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialTransactionService.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2011-05-23 14:15:17 UTC (rev 3141) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2011-05-24 19:25:00 UTC (rev 3142) @@ -46,6 +46,7 @@ import org.chorem.lima.entity.EntryDAO; import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FinancialPeriodDAO; +import org.chorem.lima.entity.FinancialPeriodImpl; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.entity.Letter; import org.chorem.lima.entity.LetterDAO; @@ -143,6 +144,46 @@ } /** + * Return the list of all financial transaction from two dates + */ + @Override + public List<FinancialTransaction> getAllFinancialTransactionsFromDateToDate( + Date beginDate, Date endDate) throws LimaException { + List<FinancialTransaction> financialTransactions = null; + TopiaContext topiaTransaction = null; + try { + topiaTransaction = beginTransaction(); + FinancialTransactionDAO transactionDAO = + LimaCallaoDAOHelper.getFinancialTransactionDAO(topiaTransaction); + + String financialPeriodProperty = TopiaQuery.getProperty(FinancialTransaction.FINANCIAL_PERIOD); + String entryBookLabelProperty = TopiaQuery.getProperty(FinancialTransaction.ENTRY_BOOK); + + // filter with topia query + TopiaQuery query = transactionDAO.createQuery("T") + + .addBetween(FinancialTransaction.TRANSACTION_DATE, beginDate, endDate) + + .addDistinct() + .addOrder("T."+FinancialTransaction.TOPIA_CREATE_DATE) + //load for lazy + .addLoad(financialPeriodProperty) + .addLoad(entryBookLabelProperty) + .addLeftJoin("T."+FinancialTransaction.ENTRY, "E", true) + .addFetch("E."+Entry.ACCOUNT) + .addFetch("E."+Entry.LETTER); + financialTransactions = transactionDAO.findAllByQuery(query); + } + catch (TopiaException ex) { + doCatch(topiaTransaction, ex, log); + } + finally { + doFinally(topiaTransaction, log); + } + return financialTransactions; + } + + /** * Return the list of all financial transaction of a financial period and an entrybook */ @Override @@ -184,7 +225,6 @@ finally { doFinally(topiaTransaction, log); } - return financialTransactions; } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialTransactionService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialTransactionService.java 2011-05-23 14:15:17 UTC (rev 3141) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialTransactionService.java 2011-05-24 19:25:00 UTC (rev 3142) @@ -25,6 +25,7 @@ package org.chorem.lima.business.ejbinterface; +import java.util.Date; import java.util.List; import javax.ejb.Remote; import org.chorem.lima.beans.FinancialTransactionSearch; @@ -68,6 +69,9 @@ List<FinancialTransaction> getAllFinancialTransactionsForFinancialPeriod( FinancialPeriod period) throws LimaException; + List<FinancialTransaction> getAllFinancialTransactionsFromDateToDate( + Date beginDate, Date endDate) throws LimaException; + List<FinancialTransaction> getAllFinancialTransactionsForEntryBookAndFinancialPeriod( EntryBook entryBook, FinancialPeriod period) throws LimaException;