This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 281583084577f302b16988d7c49a5ff3c5ced5a5 Author: David Cossé <cosse@codelutin.com> Date: Mon Oct 16 09:35:54 2017 +0200 refs #1396 l'export des entrées au format EBP est fait avec les transactions ordonnées par dates --- .../main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java | 8 ++++++-- .../java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java | 7 +++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java index 7ceea96f..16a1235b 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java @@ -281,9 +281,13 @@ public class ExportServiceImpl extends AbstractLimaService implements ExportServ Class<Entry> exportedClass = Entry.class; ExportResult exportResult = results.createAddAndGetExportResult(exportedClass); - List<Entry> entries = getDaoHelper().getEntryDao().findAll(); + List<FinancialTransaction> financialTransactions = getDaoHelper().getFinancialTransactionDao().findAllByDates(); + List<Entry> result = new ArrayList<>(); + for (FinancialTransaction financialTransaction : financialTransactions) { + result.addAll(financialTransaction.getEntry()); + } EntryEBPModel model = new EntryEBPModel(); - processExport(charset, exportedClass, exportResult, entries, model); + processExport(charset, exportedClass, exportResult, result, model); return results; } diff --git a/lima-business/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java b/lima-business/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java index d0e29026..a62cf981 100644 --- a/lima-business/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java +++ b/lima-business/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java @@ -249,4 +249,11 @@ public class FinancialTransactionTopiaDao extends AbstractFinancialTransactionTo return result; } + + public List<FinancialTransaction> findAllByDates() { + HqlAndParametersBuilder<FinancialTransaction> builder = newHqlAndParametersBuilder(); + builder.setOrderByArguments(FinancialTransaction.PROPERTY_TRANSACTION_DATE, FinancialTransaction.PROPERTY_TOPIA_CREATE_DATE); + List<FinancialTransaction> transactions = findAll(builder.getHql(), builder.getHqlParameters()); + return transactions; + } } //FinancialTransactionDAO -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.