From da115a89b8bfcc890b1d6a8e851ff375a77f9284 Mon Sep 17 00:00:00 2001 From: "marco.spasiano" Date: Mon, 18 Sep 2017 10:15:34 +0200 Subject: [PATCH] FIX recupero allegati missione --- .../main/java/it/cnr/contab/missioni00/bp/CRUDMissioneBP.java | 4 ++-- .../it/cnr/sigla/configuration/main/repository.properties | 2 +- src/main/docker/standalone/configuration/standalone.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sigla-ejb/src/main/java/it/cnr/contab/missioni00/bp/CRUDMissioneBP.java b/sigla-ejb/src/main/java/it/cnr/contab/missioni00/bp/CRUDMissioneBP.java index 5900ef57d7..9f4159a031 100644 --- a/sigla-ejb/src/main/java/it/cnr/contab/missioni00/bp/CRUDMissioneBP.java +++ b/sigla-ejb/src/main/java/it/cnr/contab/missioni00/bp/CRUDMissioneBP.java @@ -2827,7 +2827,7 @@ private void recuperoAllegatiDettaglioMissioneSigla(MissioneBulk allegatoParentB if (storageObject.getPropertyValue(StoragePropertyNames.BASE_TYPE_ID.value()).equals(StoragePropertyNames.CMIS_FOLDER.value())) { String prop = storageObject.getPropertyValue(StoragePropertyNames.OBJECT_TYPE_ID.value()); if (prop.equals("F:missioni_rimborso_dettaglio:main")){ - String rigaString = storageObject.getPropertyValue("missioni_rimborso_dettaglio:riga"); + BigInteger rigaString = storageObject.getPropertyValue("missioni_rimborso_dettaglio:riga"); List children = missioniCMISService.getChildren(storageObject.getKey()); if (children != null){ for (StorageObject doc : children) { @@ -2842,7 +2842,7 @@ private void recuperoAllegatiDettaglioMissioneSigla(MissioneBulk allegatoParentB for ( java.util.Iterator i = allegatoParentBulk.getSpeseMissioneColl().iterator(); i.hasNext(); ) { Missione_dettaglioBulk spesa = (Missione_dettaglioBulk) i.next(); - if (spesa.getPg_riga().compareTo(new Long(rigaString)) == 0){ + if (spesa.getPg_riga().compareTo(rigaString.longValue()) == 0){ spesa.addToDettaglioSpesaAllegati(allegato); } } diff --git a/src/main/docker/modules/system/layers/base/it/cnr/sigla/configuration/main/repository.properties b/src/main/docker/modules/system/layers/base/it/cnr/sigla/configuration/main/repository.properties index da9cb5a4bb..f9929a2229 100644 --- a/src/main/docker/modules/system/layers/base/it/cnr/sigla/configuration/main/repository.properties +++ b/src/main/docker/modules/system/layers/base/it/cnr/sigla/configuration/main/repository.properties @@ -1,6 +1,6 @@ user.admin.username=sigla user.admin.password=***REMOVED*** -repository.base.url=http://as11.cedrc.cnr.it:8380/alfresco/ +repository.base.url=http://as1dock.si.cnr.it:8080/alfresco/ pec.scan.disable=true pec.cron.expression=0 0/30 * * * ? diff --git a/src/main/docker/standalone/configuration/standalone.xml b/src/main/docker/standalone/configuration/standalone.xml index 6ce825a3ae..013e37858c 100644 --- a/src/main/docker/standalone/configuration/standalone.xml +++ b/src/main/docker/standalone/configuration/standalone.xml @@ -144,7 +144,7 @@ - jdbc:oracle:thin:@sigladb.cedrc.cnr.it:1521:SIGLAP + jdbc:oracle:thin:@dbtest.cedrc.cnr.it:1521:SIGLAF ojdbc 5 @@ -152,7 +152,7 @@ PCIR009 - nemo1112! + dbform