From a07dd9941046de0fb2224dee28b49ebdee242100 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Mon, 12 May 2025 13:39:35 -0600 Subject: [PATCH] DRYD-1795: Fix Error for Ethnographic Object Reports (#466) join on collectionobjects_common_fieldcollectionplaces as the field was changed to be repeating --- .../jasper-cs-report/src/main/resources/coreIntake.jrxml | 3 ++- .../jasper-cs-report/src/main/resources/coreLoanIn.jrxml | 3 ++- .../jasper-cs-report/src/main/resources/coreLoanOut.jrxml | 3 ++- .../jasper-cs-report/src/main/resources/coreObjectExit.jrxml | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/coreIntake.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/coreIntake.jrxml index 58ed644ef..0bd4ab660 100644 --- a/services/report/3rdparty/jasper-cs-report/src/main/resources/coreIntake.jrxml +++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/coreIntake.jrxml @@ -24,7 +24,7 @@ inc.entryDate entryDate, inc.returnDate returnDate, h1.name AS "csid", co.objectnumber AS "objectnumber", -co.fieldcollectionplace AS site, +fieldcollectionplace.item AS site, ong.objectName AS "objectname", bd.item AS description, oppp.objectproductionpeople AS productionpeople @@ -36,6 +36,7 @@ LEFT OUTER JOIN collectionobjects_common co ON (h2.id=co.id) LEFT OUTER JOIN hierarchy h3 ON (co.id = h3.parentid AND h3.primarytype='objectNameGroup' AND h3.pos=0) LEFT OUTER JOIN objectnamegroup ong ON (ong.id=h3.id) LEFT OUTER JOIN collectionobjects_common_briefdescriptions bd ON (bd.id=co.id and bd.pos=0) +LEFT OUTER JOIN collectionobjects_common_fieldcollectionplaces fieldcollectionplace ON (fieldcollectionplace.id = co.id AND fieldcollectionplace.pos = 0) left outer join hierarchy h4 on (co.id=h4.parentid and h4.pos=0 and h4.name='collectionobjects_common:objectProductionPeopleGroupList') left outer join objectproductionpeoplegroup oppp on (oppp.id=h4.id) LEFT OUTER JOIN misc m ON (m.id = co.id) diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/coreLoanIn.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/coreLoanIn.jrxml index 3b0e096c4..5529f0b0f 100644 --- a/services/report/3rdparty/jasper-cs-report/src/main/resources/coreLoanIn.jrxml +++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/coreLoanIn.jrxml @@ -28,7 +28,7 @@ lic.loanReturnDate as loanReturnDate, lic.loanInNote as loanInNote, h1.name AS "csid", co.objectnumber AS "objectnumber", -co.fieldcollectionplace AS site, +fieldcollectionplace.item AS site, ong.objectName AS "objectname", bd.item AS description, oppp.objectproductionpeople AS productionpeople @@ -40,6 +40,7 @@ LEFT OUTER JOIN collectionobjects_common co ON (h2.id=co.id) LEFT OUTER JOIN hierarchy h3 ON (co.id = h3.parentid AND h3.primarytype='objectNameGroup' AND h3.pos=0) LEFT OUTER JOIN objectnamegroup ong ON (ong.id=h3.id) LEFT OUTER JOIN collectionobjects_common_briefdescriptions bd ON (bd.id=co.id and bd.pos=0) +LEFT OUTER JOIN collectionobjects_common_fieldcollectionplaces fieldcollectionplace ON (fieldcollectionplace.id = co.id AND fieldcollectionplace.pos = 0) left outer join hierarchy h4 on (co.id=h4.parentid and h4.pos=0 and h4.name='collectionobjects_common:objectProductionPeopleGroupList') left outer join objectproductionpeoplegroup oppp on (oppp.id=h4.id) left outer join hierarchy hlgl on (lic.id=hlgl.parentid and hlgl.pos=0 and hlgl.name='loansin_common:lenderGroupList') diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/coreLoanOut.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/coreLoanOut.jrxml index 09263b037..e3f54bd10 100644 --- a/services/report/3rdparty/jasper-cs-report/src/main/resources/coreLoanOut.jrxml +++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/coreLoanOut.jrxml @@ -28,7 +28,7 @@ loc.loanReturnDate loanReturnDate, loc.loanOutNote loanOutNote, h1.name AS "csid", co.objectnumber AS "objectnumber", -co.fieldcollectionplace AS site, +fieldcollectionplace.item AS site, ong.objectName AS "objectname", bd.item AS description, oppp.objectproductionpeople as productionpeople @@ -40,6 +40,7 @@ LEFT OUTER JOIN collectionobjects_common co ON (h2.id=co.id) LEFT OUTER JOIN hierarchy h3 ON (co.id = h3.parentid AND h3.primarytype='objectNameGroup' AND h3.pos=0) LEFT OUTER JOIN objectnamegroup ong ON (ong.id=h3.id) LEFT OUTER JOIN collectionobjects_common_briefdescriptions bd ON (bd.id=co.id and bd.pos=0) +LEFT OUTER JOIN collectionobjects_common_fieldcollectionplaces fieldcollectionplace ON (fieldcollectionplace.id = co.id AND fieldcollectionplace.pos = 0) left outer join hierarchy h4 on (co.id=h4.parentid and h4.pos=0 and h4.name='collectionobjects_common:objectProductionPeopleGroupList') left outer join objectproductionpeoplegroup oppp on (oppp.id=h4.id) LEFT OUTER JOIN misc m ON (m.id = co.id) diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/coreObjectExit.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/coreObjectExit.jrxml index 7c8351ae3..9227a0613 100644 --- a/services/report/3rdparty/jasper-cs-report/src/main/resources/coreObjectExit.jrxml +++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/coreObjectExit.jrxml @@ -27,7 +27,7 @@ case when (oec.currentOwner is not null and oec.currentOwner <> '') then end AS owner, h1.name AS "csid", co.objectnumber AS "objectnumber", -co.fieldcollectionplace AS site, +fieldcollectionplace.item AS site, -- co.fieldcollectionnote fieldcollectionnote, ong.objectName AS "objectname", bd.item AS description, @@ -40,6 +40,7 @@ LEFT OUTER JOIN collectionobjects_common co ON (h2.id=co.id) LEFT OUTER JOIN hierarchy h3 ON (co.id = h3.parentid AND h3.primarytype='objectNameGroup' AND h3.pos=0) LEFT OUTER JOIN objectnamegroup ong ON (ong.id=h3.id) LEFT OUTER JOIN collectionobjects_common_briefdescriptions bd ON (bd.id=co.id and bd.pos=0) +LEFT OUTER JOIN collectionobjects_common_fieldcollectionplaces fieldcollectionplace ON (fieldcollectionplace.id = co.id AND fieldcollectionplace.pos = 0) left outer join hierarchy h4 on (co.id=h4.parentid and h4.pos=0 and h4.name='collectionobjects_common:objectProductionPeopleGroupList') left outer join objectproductionpeoplegroup oppp on (oppp.id=h4.id) left outer join hierarchy h5 on (oec.id=h5.parentid and h5.name='objectexit_common:exitDateGroup') -- 2.47.3