From 2562ad3389a2c1a87dae79e58f7aa71e5d1f562a Mon Sep 17 00:00:00 2001 From: Marco Alderighi Date: Tue, 28 Nov 2023 10:02:52 +0100 Subject: [PATCH] nuovo modello di delega per lavori pubblici e ospedalieri --- .../bo/service/SoggettoLocalService.java | 4 +- .../bo/service/SoggettoLocalServiceClp.java | 12 ++- .../bo/service/SoggettoLocalServiceUtil.java | 4 +- .../service/SoggettoLocalServiceWrapper.java | 4 +- .../impl/SoggettoLocalServiceImpl.java | 16 +++- .../resource/asseverazioni/delega_pubb.html | 85 +++++++++++++++++++ .../docroot/WEB-INF/src/service.properties | 4 +- 7 files changed, 119 insertions(+), 10 deletions(-) create mode 100644 liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/resource/asseverazioni/delega_pubb.html diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalService.java index bf233d47..621a30fd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalService.java @@ -817,12 +817,14 @@ public interface SoggettoLocalService extends BaseLocalService, @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) public byte[] getPdfDelega(javax.portlet.PortletRequest request) throws com.itextpdf.text.DocumentException, + com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException, java.io.IOException; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) public java.lang.String getAnteprimaDelega( javax.portlet.PortletRequest request) - throws com.liferay.portal.kernel.exception.SystemException, + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException, java.io.IOException; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceClp.java index bf976d81..36b96bea 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceClp.java @@ -4655,6 +4655,7 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService { @Override public byte[] getPdfDelega(javax.portlet.PortletRequest request) throws com.itextpdf.text.DocumentException, + com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException, java.io.IOException { Object returnObj = null; @@ -4671,6 +4672,10 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService { throw (com.itextpdf.text.DocumentException)t; } + if (t instanceof com.liferay.portal.kernel.exception.PortalException) { + throw (com.liferay.portal.kernel.exception.PortalException)t; + } + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { throw (com.liferay.portal.kernel.exception.SystemException)t; } @@ -4694,7 +4699,8 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService { @Override public java.lang.String getAnteprimaDelega( javax.portlet.PortletRequest request) - throws com.liferay.portal.kernel.exception.SystemException, + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException, java.io.IOException { Object returnObj = null; @@ -4706,6 +4712,10 @@ public class SoggettoLocalServiceClp implements SoggettoLocalService { catch (Throwable t) { t = ClpSerializer.translateThrowable(t); + if (t instanceof com.liferay.portal.kernel.exception.PortalException) { + throw (com.liferay.portal.kernel.exception.PortalException)t; + } + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { throw (com.liferay.portal.kernel.exception.SystemException)t; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceUtil.java index 9581627b..a6a27275 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceUtil.java @@ -1120,6 +1120,7 @@ public class SoggettoLocalServiceUtil { public static byte[] getPdfDelega(javax.portlet.PortletRequest request) throws com.itextpdf.text.DocumentException, + com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException, java.io.IOException { return getService().getPdfDelega(request); @@ -1127,7 +1128,8 @@ public class SoggettoLocalServiceUtil { public static java.lang.String getAnteprimaDelega( javax.portlet.PortletRequest request) - throws com.liferay.portal.kernel.exception.SystemException, + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException, java.io.IOException { return getService().getAnteprimaDelega(request); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceWrapper.java index f9a9227b..8f514890 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SoggettoLocalServiceWrapper.java @@ -1174,6 +1174,7 @@ public class SoggettoLocalServiceWrapper implements SoggettoLocalService, @Override public byte[] getPdfDelega(javax.portlet.PortletRequest request) throws com.itextpdf.text.DocumentException, + com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException, java.io.IOException { return _soggettoLocalService.getPdfDelega(request); @@ -1182,7 +1183,8 @@ public class SoggettoLocalServiceWrapper implements SoggettoLocalService, @Override public java.lang.String getAnteprimaDelega( javax.portlet.PortletRequest request) - throws com.liferay.portal.kernel.exception.SystemException, + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException, java.io.IOException { return _soggettoLocalService.getAnteprimaDelega(request); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java index cdf7ff4d..f680d401 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java @@ -12,8 +12,10 @@ import it.tref.liferay.portos.bo.NoSuchProvinciaException; import it.tref.liferay.portos.bo.model.Comune; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.DocPratica; +import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.Provincia; import it.tref.liferay.portos.bo.model.Soggetto; +import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.SoggettoLocalServiceBaseImpl; import it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; @@ -1307,7 +1309,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { } @Override - public byte[] getPdfDelega(PortletRequest request) throws DocumentException, IOException, SystemException { + public byte[] getPdfDelega(PortletRequest request) throws DocumentException, IOException, SystemException, PortalException { InputStream is = getClass().getClassLoader().getResourceAsStream("/resource/asseverazioni/delegawrapper.html"); Scanner scanner = new Scanner(is); @@ -1337,15 +1339,21 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { } @Override - public String getAnteprimaDelega(PortletRequest request) throws IOException, SystemException { + public String getAnteprimaDelega(PortletRequest request) throws IOException, SystemException, PortalException { long committenteId = ParamUtil.getLong(request, "committenteId"); Soggetto committente = fetchSoggetto(committenteId); long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId"); DettPratica dettPratica = dettPraticaLocalService.fetchDettPratica(dettPraticaId); - Soggetto titolare = getValidByIntPratica_CodiceFiscale(dettPratica.getIntPraticaId(), + long intPraticaId = dettPratica.getIntPraticaId(); + Soggetto titolare = getValidByIntPratica_CodiceFiscale(intPraticaId, dettPratica.getCodiceFiscaleDelegatoCommittente()).get(0); - InputStream input = getClass().getClassLoader().getResourceAsStream("/resource/asseverazioni/delega.html"); + IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); + String delegaModelLocation = "/resource/asseverazioni/delega.html"; + if(intPratica.isPraticaOspedaliera() || dettPratica.isLavoriPubblici()){ + delegaModelLocation = "/resource/asseverazioni/delega_pubb.html"; + } + InputStream input = getClass().getClassLoader().getResourceAsStream(delegaModelLocation); if (Validator.isNull(input)) { return null; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/resource/asseverazioni/delega_pubb.html b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/resource/asseverazioni/delega_pubb.html new file mode 100644 index 00000000..e011e0b0 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/resource/asseverazioni/delega_pubb.html @@ -0,0 +1,85 @@ +

+ DPR 380/2001, art. 93
+ L.R. 1/2019, art. 36, c.1
+ Legge 190/2012, art. 1, comma 9 lettera “e”
+ + L.R. 23/2021, art. 31 comma 5
+ + D. Lgs. 101/2018 +

+

DELEGA E AFFIDAMENTO INCARICHI PROFESSIONALI

+

+ Il sottoscritto {{nomecommittente}}, C.F. {{cfcommittente}}, nato a {{lncommittente}} il + {{dncommittente}} e residente in {{lrcommittente}} indirizzo {{ircommittente}} n° + {{nccommitttente}}, n.q. di R.U.P. del progetto in esame, giusta disposizione n. 17 del 14/03/2023 + dell'ex Soggetto Attuatore del Commissario Delegato ex Ordinanza n.25/202 per il potenziamento della rete ospedaliera + Sicilia - Struttura Tecnica di Supporto -, nella qualità di committente dei lavori, +

+

DELEGA

+

+ l’intermediario {{nometitolare}} codice fiscale {{cftitolare}} nato a {{lntitolare}} il + {{dntitolare}} e residente in {{lrtitolare}} indirizzo {{irtitolare}} n° {{nctitolare}} + alla trasmissione della denuncia prevista dagli artt. 65 e 93 del DPR 380/2001 per i lavori di + {{descrizione}} attraverso la piattaforma informatica “SISMICA” della Regione Sicilia +

+

+ Il sottoscritto contestualmente dichiara: +

+ +

+ Si allega la fotocopia del documento d’identità sopra indicato.

+

+

+ Data ________________________________________ +

+
Firma del delegante

________________________________________
\ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties index 686e3cf4..35c2f2f7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_bo - build.number=2925 - build.date=1697467943642 + build.number=2928 + build.date=1699870015268 build.auto.upgrade=true ##