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 0d478f605e78c9a45324379fefd1d1a6e2daf680..e6616f72ebcea679822e187c21e414dc722743a8 100644 (file)
--- 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'