From: Michael Ritter <mikejritter@users.noreply.github.com>
Date: Fri, 1 Mar 2024 00:42:47 +0000 (-0700)
Subject: Update Tombstone with Creator Report (#399)
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=ee278bcab6d9daf8957beb543093f6d6c7d9da62;p=tmp%2Fjakarta-migration.git

Update Tombstone with Creator Report (#399)
---

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/tombstone_with_creator.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/tombstone_with_creator.jrxml
index 0d478f605..e6616f72e 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/tombstone_with_creator.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/tombstone_with_creator.jrxml
@@ -51,8 +51,9 @@ LEFT JOIN collectionobjects_common_inventorystatuslist inventory ON inventory.id
 LEFT JOIN (
   SELECT
     hier.parentid,
-    string_agg(sd.datedisplaydate, '|') as artworkdate
+    string_agg(concat_ws(';', sd.datedisplaydate, regexp_replace(papdg.publicartproductiondatetype,'^.*\)''(.*)''$', '\1')), '|') as artworkdate
   FROM hierarchy hier
+  LEFT JOIN publicartproductiondategroup papdg on papdg.id = hier.id
   LEFT JOIN hierarchy sdg_hier on sdg_hier.parentid = hier.id AND sdg_hier.primarytype = 'structuredDateGroup'
   LEFT JOIN structureddategroup sd on sd.id = sdg_hier.id
   WHERE hier.primarytype = 'publicartProductionDateGroup'