diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/ExcelExportController.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/ExcelExportController.java index c4d887e..d046104 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/ExcelExportController.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/mahnlauf/ExcelExportController.java @@ -122,7 +122,7 @@ public class ExcelExportController implements Serializable { } // query zeit - String query = "(type:workitem OR type:workitemarchive) "; + String query = "(type:workitem OR type:workitemarchive) AND ($workflowgroup:Rechnungsausgang) "; if (start != null && stop != null) { query += "AND (invoice.date:[" + sDateFrom + " TO " + sDateTo + "]) "; } else { @@ -132,8 +132,9 @@ public class ExcelExportController implements Serializable { // query Sachprüfung - if (!filter.getItemValueString("space.name").isEmpty()) { - query += " AND (space.name:" + filter.getItemValueString("space.name") + ")"; + if (!filter.getItemValueString("space.ref").isEmpty() + && !"-".equals(filter.getItemValueString("space.ref"))) { + query += " AND ($uniqueidref:" + filter.getItemValueString("space.ref") + ")"; } if (workflowController.getWorkitem() != null && !workflowController.getWorkitem().getItemValueString("dbtr.number").isEmpty()) { @@ -154,7 +155,7 @@ public class ExcelExportController implements Serializable { } String targetName = "ausgangsrechnungen-export_" + dateformat.format(new Date()) + ".xlsx"; try { - List invoices = documentService.find(query, MAX_ROWS, 0); + List invoices = documentService.find(query, MAX_ROWS, 0, "invoice.date", true); if (invoices.size() > 0) { insertInvoiceRows(invoices, fileData); } @@ -287,12 +288,11 @@ public class ExcelExportController implements Serializable { // insert values row.getCell(0).setCellValue(invoice.getItemValueString("invoice.number")); row.getCell(1).setCellValue(invoice.getItemValueString("dbtr.number")); - row.getCell(2).setCellValue(invoice.getItemValueString("invoice.text")); - - row.getCell(3).setCellValue(invoice.getItemValueDate("invoice.date")); - row.getCell(4).setCellValue(invoice.getItemValueDate("invoice.duedate")); - - row.getCell(5).setCellValue(invoice.getItemValueDouble("invoice.total")); + row.getCell(2).setCellValue(invoice.getItemValueString("space.name")); + row.getCell(3).setCellValue(invoice.getItemValueString("invoice.text")); + row.getCell(4).setCellValue(invoice.getItemValueDate("invoice.date")); + row.getCell(5).setCellValue(invoice.getItemValueDate("invoice.duedate")); + row.getCell(6).setCellValue(invoice.getItemValueDouble("invoice.total")); rowPos++; } diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/excel_export_rechnungsausgang.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/admin/excel_export_rechnungsausgang.xhtml index 64f9bc8..1508cae 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/admin/excel_export_rechnungsausgang.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/admin/excel_export_rechnungsausgang.xhtml @@ -27,7 +27,7 @@
-

Excle Export Ausgangsrechnungen

+

Excel Export Ausgangsrechnungen

@@ -64,11 +64,17 @@
Abteilung:
-
- - - +
+ + + + + + + +
diff --git a/templates/ausgangsrechnungen-export_template.xlsx b/templates/ausgangsrechnungen-export_template.xlsx index 82a50e0..bb61fd3 100644 Binary files a/templates/ausgangsrechnungen-export_template.xlsx and b/templates/ausgangsrechnungen-export_template.xlsx differ