From 676310ae38716f7f165f0756ff07b33b8a8f5053 Mon Sep 17 00:00:00 2001 From: Ralph Soika Date: Tue, 24 Feb 2026 11:52:14 +0100 Subject: [PATCH] update --- .../AGLAnalyticControllerOPListe.java | 4 +++- .../alexanderlogistics/OPListExportAdapter.java | 12 ++++++++---- workflow/pl/rechnungsausgang-pl-1.1.0.bpmn | 15 ++------------- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerOPListe.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerOPListe.java index f918881..d20f511 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerOPListe.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/AGLAnalyticControllerOPListe.java @@ -76,6 +76,8 @@ public class AGLAnalyticControllerOPListe implements Serializable { department = documentService.load(departmentID); if (department != null) { event.getWorkitem().setItemValue("space.name", department.getItemValueString("name")); + } else { + } departmentIDLast = departmentID; resetStats(event); @@ -158,7 +160,7 @@ public class AGLAnalyticControllerOPListe implements Serializable { try { - if (departmentID == null || !departmentID.isEmpty()) { + if (departmentID == null || (!departmentID.isEmpty() && !"-".equals(departmentID))) { countAll = documentService.count( "(type:workitem) AND $uniqueidref:" + departmentID + " AND $modelversion:rechnungsausgang-*"); diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapter.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapter.java index 60070bd..68a4a05 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapter.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapter.java @@ -400,10 +400,14 @@ public class OPListExportAdapter extends POIFindReplaceAdapter { Map> result = new HashMap<>(); try { - List invoices = documentService.find( - "$modelversion:rechnungsausgang-* AND type:workitem AND $uniqueidref:" + spaceID, 9999, 0, - "invoice.number", false); - + String query = ""; + if (spaceID == null || spaceID.isEmpty() || "-".equals(spaceID)) { + // no space selection + query = "$modelversion:rechnungsausgang-* AND type:workitem"; + } else { + query = "$modelversion:rechnungsausgang-* AND type:workitem AND $uniqueidref:" + spaceID; + } + List invoices = documentService.find(query, 9999, 0, "invoice.number", false); for (ItemCollection invoice : invoices) { String dbtrNumber = invoice.getItemValueString("dbtr.number"); diff --git a/workflow/pl/rechnungsausgang-pl-1.1.0.bpmn b/workflow/pl/rechnungsausgang-pl-1.1.0.bpmn index 5274391..a8a50b7 100644 --- a/workflow/pl/rechnungsausgang-pl-1.1.0.bpmn +++ b/workflow/pl/rechnungsausgang-pl-1.1.0.bpmn @@ -1057,16 +1057,6 @@ Betrag: _amount (Brutto € _amount_brutto false - - - SequenceFlow_9 @@ -3438,9 +3428,8 @@ Wiedervorlage wird um 7 bzw. 5 Tage erhöht - - - + +