From 6b0d6ae2bea6d49993232c5bb289cbbba686acf0 Mon Sep 17 00:00:00 2001 From: Salvatore La Manna Date: Wed, 29 Jun 2022 12:58:25 +0200 Subject: [PATCH] Modifiche richieste --- jasper/Attestazione Vincoli.jrxml | 29 +- jasper/Avviso di Non Competenza.jrxml | 12 + .../docroot/WEB-INF/service.xml | 4 + .../bo/service/IntPraticaLocalService.java | 8 + .../bo/service/IntPraticaLocalServiceClp.java | 462 +++++++++------ .../service/IntPraticaLocalServiceUtil.java | 12 + .../IntPraticaLocalServiceWrapper.java | 15 + .../persistence/IntPraticaPersistence.java | 138 +++++ .../service/persistence/IntPraticaUtil.java | 166 ++++++ .../docroot/WEB-INF/sql/indexes.properties | 1 + .../docroot/WEB-INF/sql/indexes.sql | 1 + .../WEB-INF/src/content/Portal.properties | 11 +- .../it/mwg/sismica/bo/util/SismicaUtil.java | 136 +---- .../portos/bo/model/impl/DettPraticaImpl.java | 2 +- .../bo/model/impl/IntPraticaModelImpl.java | 24 +- .../IntPraticaLocalServiceClpInvoker.java | 446 +++++++------- .../impl/IntPraticaLocalServiceImpl.java | 12 + .../impl/ParereGeologoLocalServiceImpl.java | 20 +- .../IntPraticaPersistenceImpl.java | 561 ++++++++++++++++++ .../docroot/WEB-INF/src/service.properties | 4 +- .../asset/controllopratica/full_content.jsp | 6 +- .../docroot/html/avvisi/view.jsp | 3 +- .../actions/action_annulla_ric_geologo.jsp | 2 - .../html/gestioneattivita/view_columns.jspf | 2 +- .../html/gestionefirme/avvisi_da_firmare.jsp | 24 +- .../gestionefirme/avvisi_da_firmare_altri.jsp | 26 +- .../html/gestionefirme/avvisi_firme.jsp | 16 +- .../docroot/WEB-INF/src/service.properties | 4 +- .../domanda/page_dettagli_principali.jsp | 6 +- .../pareregeologo/actions/assegna_parere.jsp | 2 +- .../html/pareregeologo/pareridacompletare.jsp | 5 +- .../html/soggettipratica/edit_soggetto.jsp | 8 +- 32 files changed, 1570 insertions(+), 598 deletions(-) diff --git a/jasper/Attestazione Vincoli.jrxml b/jasper/Attestazione Vincoli.jrxml index 8e50983d..91afdf9b 100644 --- a/jasper/Attestazione Vincoli.jrxml +++ b/jasper/Attestazione Vincoli.jrxml @@ -209,20 +209,8 @@ e dell'identità siciliana]]> - + - - - - - - - - - - - - @@ -234,17 +222,6 @@ e dell'identità siciliana]]> - - - - - - - - - - - @@ -281,7 +258,7 @@ e dell'identità siciliana]]> - + @@ -295,7 +272,7 @@ e dell'identità siciliana]]> - esaminata la documentazione allegata all’istanza;]]> - + diff --git a/jasper/Avviso di Non Competenza.jrxml b/jasper/Avviso di Non Competenza.jrxml index 6c87067e..ea45cfdc 100644 --- a/jasper/Avviso di Non Competenza.jrxml +++ b/jasper/Avviso di Non Competenza.jrxml @@ -361,6 +361,18 @@ esaminata la documentazione allegata all’istanza;]]> + + + + + + + + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml index 776f0db5..1ea70d2e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml @@ -854,6 +854,10 @@ + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java index 7e1a140c..aae0c9c9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java @@ -340,6 +340,14 @@ public interface IntPraticaLocalService extends BaseLocalService, throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + public java.util.List findByStatoPratica( + java.lang.String statoPratica) + throws com.liferay.portal.kernel.exception.SystemException; + + public java.util.List findByStatoPratica( + java.lang.String statoPratica, int start, int end) + throws com.liferay.portal.kernel.exception.SystemException; + public it.tref.liferay.portos.bo.model.IntPratica deleteIntPratica( it.tref.liferay.portos.bo.model.IntPratica intPratica, boolean forced) throws com.liferay.portal.kernel.exception.PortalException, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java index ef5e1667..52caf1c5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java @@ -155,235 +155,243 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { "com.liferay.portal.service.ServiceContext" }; - _methodName27 = "deleteIntPratica"; + _methodName27 = "findByStatoPratica"; - _methodParameterTypes27 = new String[] { + _methodParameterTypes27 = new String[] { "java.lang.String" }; + + _methodName28 = "findByStatoPratica"; + + _methodParameterTypes28 = new String[] { "java.lang.String", "int", "int" }; + + _methodName29 = "deleteIntPratica"; + + _methodParameterTypes29 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "boolean" }; - _methodName28 = "cloneIntPratica"; + _methodName30 = "cloneIntPratica"; - _methodParameterTypes28 = new String[] { + _methodParameterTypes30 = new String[] { "long", "com.liferay.portal.service.ServiceContext" }; - _methodName29 = "updateDelegati"; + _methodName31 = "updateDelegati"; - _methodParameterTypes29 = new String[] { + _methodParameterTypes31 = new String[] { "long", "java.lang.String", "java.lang.String", "boolean" }; - _methodName30 = "findFascicoliNotProgetto"; + _methodName32 = "findFascicoliNotProgetto"; - _methodParameterTypes30 = new String[] { "int", "int" }; + _methodParameterTypes32 = new String[] { "int", "int" }; - _methodName31 = "countFascicoliNotProgetto"; + _methodName33 = "countFascicoliNotProgetto"; - _methodParameterTypes31 = new String[] { }; + _methodParameterTypes33 = new String[] { }; - _methodName32 = "countByPosizione"; + _methodName34 = "countByPosizione"; - _methodParameterTypes32 = new String[] { "double", "double", "int" }; + _methodParameterTypes34 = new String[] { "double", "double", "int" }; - _methodName33 = "findByPosizione"; + _methodName35 = "findByPosizione"; - _methodParameterTypes33 = new String[] { "double", "double", "int" }; + _methodParameterTypes35 = new String[] { "double", "double", "int" }; - _methodName34 = "findByPosizione"; + _methodName36 = "findByPosizione"; - _methodParameterTypes34 = new String[] { + _methodParameterTypes36 = new String[] { "double", "double", "int", "int", "int" }; - _methodName35 = "addNumeroProgetto"; + _methodName37 = "addNumeroProgetto"; - _methodParameterTypes35 = new String[] { "long" }; + _methodParameterTypes37 = new String[] { "long" }; - _methodName36 = "sospendiPratica"; + _methodName38 = "sospendiPratica"; - _methodParameterTypes36 = new String[] { "long", "boolean" }; + _methodParameterTypes38 = new String[] { "long", "boolean" }; - _methodName37 = "cambiaTitolare"; + _methodName39 = "cambiaTitolare"; - _methodParameterTypes37 = new String[] { + _methodParameterTypes39 = new String[] { "long", "long", "com.liferay.portal.service.ServiceContext" }; - _methodName38 = "updateStatoPratica"; - - _methodParameterTypes38 = new String[] { "long", "java.lang.String" }; + _methodName40 = "updateStatoPratica"; - _methodName39 = "findByC_UserId"; + _methodParameterTypes40 = new String[] { "long", "java.lang.String" }; - _methodParameterTypes39 = new String[] { "long", "long", "int", "int" }; + _methodName41 = "findByC_UserId"; - _methodName40 = "countByC_UserId"; + _methodParameterTypes41 = new String[] { "long", "long", "int", "int" }; - _methodParameterTypes40 = new String[] { "long", "long" }; - - _methodName41 = "updateStatus"; - - _methodParameterTypes41 = new String[] { "long", "int" }; - - _methodName42 = "findByCompanyIdSoggettoProgetti"; + _methodName42 = "countByC_UserId"; _methodParameterTypes42 = new String[] { "long", "long" }; - _methodName43 = "countByCompanyIdSoggettoProgetti"; + _methodName43 = "updateStatus"; - _methodParameterTypes43 = new String[] { "long", "long" }; + _methodParameterTypes43 = new String[] { "long", "int" }; - _methodName44 = "findByCompanyIdSoggettoArchivio"; + _methodName44 = "findByCompanyIdSoggettoProgetti"; _methodParameterTypes44 = new String[] { "long", "long" }; - _methodName45 = "countByCompanyIdSoggettoArchivio"; + _methodName45 = "countByCompanyIdSoggettoProgetti"; _methodParameterTypes45 = new String[] { "long", "long" }; - _methodName46 = "findByCompanyIdSoggettoAltriProgetti"; + _methodName46 = "findByCompanyIdSoggettoArchivio"; - _methodParameterTypes46 = new String[] { "long", "long", "int", "int" }; + _methodParameterTypes46 = new String[] { "long", "long" }; - _methodName47 = "countByCompanyIdSoggettoAltriProgetti"; + _methodName47 = "countByCompanyIdSoggettoArchivio"; _methodParameterTypes47 = new String[] { "long", "long" }; - _methodName48 = "findByCanAddFineLavori"; + _methodName48 = "findByCompanyIdSoggettoAltriProgetti"; - _methodParameterTypes48 = new String[] { - "long", "java.lang.String", "int", "int" - }; + _methodParameterTypes48 = new String[] { "long", "long", "int", "int" }; - _methodName49 = "countByCanAddFineLavori"; + _methodName49 = "countByCompanyIdSoggettoAltriProgetti"; - _methodParameterTypes49 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes49 = new String[] { "long", "long" }; - _methodName50 = "findByCanAddCollaudo"; + _methodName50 = "findByCanAddFineLavori"; _methodParameterTypes50 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName51 = "countByCanAddCollaudo"; + _methodName51 = "countByCanAddFineLavori"; _methodParameterTypes51 = new String[] { "long", "java.lang.String" }; - _methodName52 = "search"; + _methodName52 = "findByCanAddCollaudo"; + + _methodParameterTypes52 = new String[] { + "long", "java.lang.String", "int", "int" + }; + + _methodName53 = "countByCanAddCollaudo"; + + _methodParameterTypes53 = new String[] { "long", "java.lang.String" }; - _methodParameterTypes52 = new String[] { "java.util.List", "int", "int" }; + _methodName54 = "search"; - _methodName53 = "countSearch"; + _methodParameterTypes54 = new String[] { "java.util.List", "int", "int" }; - _methodParameterTypes53 = new String[] { "java.util.List" }; + _methodName55 = "countSearch"; - _methodName54 = "searchWithIntPraticaId"; + _methodParameterTypes55 = new String[] { "java.util.List" }; - _methodParameterTypes54 = new String[] { + _methodName56 = "searchWithIntPraticaId"; + + _methodParameterTypes56 = new String[] { "java.util.List", "long", "int", "int" }; - _methodName55 = "allegaFileAnnullamento"; + _methodName57 = "allegaFileAnnullamento"; - _methodParameterTypes55 = new String[] { + _methodParameterTypes57 = new String[] { "long", "byte[][]", "java.lang.String", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName56 = "generateFileAnnullamento"; + _methodName58 = "generateFileAnnullamento"; - _methodParameterTypes56 = new String[] { + _methodParameterTypes58 = new String[] { "long", "com.liferay.portal.service.ServiceContext" }; - _methodName57 = "deleteFileAnnullamento"; + _methodName59 = "deleteFileAnnullamento"; - _methodParameterTypes57 = new String[] { "long" }; + _methodParameterTypes59 = new String[] { "long" }; - _methodName58 = "completeAnnullamento"; + _methodName60 = "completeAnnullamento"; - _methodParameterTypes58 = new String[] { "long" }; + _methodParameterTypes60 = new String[] { "long" }; - _methodName59 = "cambiaIstruttore"; + _methodName61 = "cambiaIstruttore"; - _methodParameterTypes59 = new String[] { "long", "long", "long" }; + _methodParameterTypes61 = new String[] { "long", "long", "long" }; - _methodName60 = "countCaricoLavoroCF"; + _methodName62 = "countCaricoLavoroCF"; - _methodParameterTypes60 = new String[] { + _methodParameterTypes62 = new String[] { "long", "java.lang.String", "java.lang.Long[][]" }; - _methodName61 = "countCaricoLavoroIstruttore"; + _methodName63 = "countCaricoLavoroIstruttore"; - _methodParameterTypes61 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes63 = new String[] { "long", "java.lang.String" }; - _methodName62 = "generateReportPratica"; + _methodName64 = "generateReportPratica"; - _methodParameterTypes62 = new String[] { + _methodParameterTypes64 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName63 = "updateModifiedDate"; + _methodName65 = "updateModifiedDate"; - _methodParameterTypes63 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes65 = new String[] { "long", "java.util.Date" }; - _methodName64 = "reIndexFascicolo"; + _methodName66 = "reIndexFascicolo"; - _methodParameterTypes64 = new String[] { + _methodParameterTypes66 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName65 = "reIndexFasciolo"; + _methodName67 = "reIndexFasciolo"; - _methodParameterTypes65 = new String[] { "java.lang.String", "long" }; + _methodParameterTypes67 = new String[] { "java.lang.String", "long" }; - _methodName66 = "reIndexFasciolo"; + _methodName68 = "reIndexFasciolo"; - _methodParameterTypes66 = new String[] { "long", "long" }; + _methodParameterTypes68 = new String[] { "long", "long" }; - _methodName67 = "findByNumeroProgetto"; + _methodName69 = "findByNumeroProgetto"; - _methodParameterTypes67 = new String[] { "java.lang.String" }; + _methodParameterTypes69 = new String[] { "java.lang.String" }; - _methodName68 = "findByTerritorioId"; + _methodName70 = "findByTerritorioId"; - _methodParameterTypes68 = new String[] { "long" }; + _methodParameterTypes70 = new String[] { "long" }; - _methodName69 = "getOrganizationByIntPraticaId"; + _methodName71 = "getOrganizationByIntPraticaId"; - _methodParameterTypes69 = new String[] { "long" }; + _methodParameterTypes71 = new String[] { "long" }; - _methodName70 = "hasRichiestaIntegrazioneAttiva"; + _methodName72 = "hasRichiestaIntegrazioneAttiva"; - _methodParameterTypes70 = new String[] { "long" }; + _methodParameterTypes72 = new String[] { "long" }; - _methodName71 = "invioMailNotifica"; + _methodName73 = "invioMailNotifica"; - _methodParameterTypes71 = new String[] { + _methodParameterTypes73 = new String[] { "long", "long", "java.lang.String", "java.lang.String[][]", "java.lang.String[][]", "java.lang.String[][]", "java.lang.String", "com.liferay.portal.kernel.json.JSONObject", "java.util.List", "com.liferay.portal.service.ServiceContext" }; - _methodName72 = "searchAltriProgetti"; + _methodName74 = "searchAltriProgetti"; - _methodParameterTypes72 = new String[] { + _methodParameterTypes74 = new String[] { "javax.servlet.http.HttpServletRequest", "com.liferay.portal.model.User", "int", "int" }; - _methodName73 = "searchArchivioProgetti"; + _methodName75 = "searchArchivioProgetti"; - _methodParameterTypes73 = new String[] { + _methodParameterTypes75 = new String[] { "javax.servlet.http.HttpServletRequest", "com.liferay.portal.model.User", "int", "int" }; - _methodName74 = "searchMieiProgetti"; + _methodName76 = "searchMieiProgetti"; - _methodParameterTypes74 = new String[] { + _methodParameterTypes76 = new String[] { "javax.servlet.http.HttpServletRequest", "com.liferay.portal.model.User", "int", "int" }; @@ -1238,6 +1246,72 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { return (it.tref.liferay.portos.bo.model.IntPratica)ClpSerializer.translateOutput(returnObj); } + @Override + public java.util.List findByStatoPratica( + java.lang.String statoPratica) + throws com.liferay.portal.kernel.exception.SystemException { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName27, + _methodParameterTypes27, + new Object[] { ClpSerializer.translateInput(statoPratica) }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { + throw (com.liferay.portal.kernel.exception.SystemException)t; + } + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + + return (java.util.List)ClpSerializer.translateOutput(returnObj); + } + + @Override + public java.util.List findByStatoPratica( + java.lang.String statoPratica, int start, int end) + throws com.liferay.portal.kernel.exception.SystemException { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName28, + _methodParameterTypes28, + new Object[] { + ClpSerializer.translateInput(statoPratica), + + start, + + end + }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { + throw (com.liferay.portal.kernel.exception.SystemException)t; + } + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + + return (java.util.List)ClpSerializer.translateOutput(returnObj); + } + @Override public it.tref.liferay.portos.bo.model.IntPratica deleteIntPratica( it.tref.liferay.portos.bo.model.IntPratica intPratica, boolean forced) @@ -1246,8 +1320,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName27, - _methodParameterTypes27, + returnObj = _invokableLocalService.invokeMethod(_methodName29, + _methodParameterTypes29, new Object[] { ClpSerializer.translateInput(intPratica), @@ -1286,8 +1360,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName28, - _methodParameterTypes28, + returnObj = _invokableLocalService.invokeMethod(_methodName30, + _methodParameterTypes30, new Object[] { intPraticaId, @@ -1327,8 +1401,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName29, - _methodParameterTypes29, + returnObj = _invokableLocalService.invokeMethod(_methodName31, + _methodParameterTypes31, new Object[] { intPraticaId, @@ -1370,8 +1444,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName30, - _methodParameterTypes30, new Object[] { start, end }); + returnObj = _invokableLocalService.invokeMethod(_methodName32, + _methodParameterTypes32, new Object[] { start, end }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1398,8 +1472,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName31, - _methodParameterTypes31, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName33, + _methodParameterTypes33, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1426,8 +1500,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName32, - _methodParameterTypes32, new Object[] { lat, lng, raggio }); + returnObj = _invokableLocalService.invokeMethod(_methodName34, + _methodParameterTypes34, new Object[] { lat, lng, raggio }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1455,8 +1529,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName33, - _methodParameterTypes33, new Object[] { lat, lng, raggio }); + returnObj = _invokableLocalService.invokeMethod(_methodName35, + _methodParameterTypes35, new Object[] { lat, lng, raggio }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1484,8 +1558,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName34, - _methodParameterTypes34, + returnObj = _invokableLocalService.invokeMethod(_methodName36, + _methodParameterTypes36, new Object[] { lat, lng, raggio, start, end }); } catch (Throwable t) { @@ -1515,8 +1589,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName35, - _methodParameterTypes35, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName37, + _methodParameterTypes37, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1549,8 +1623,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName36, - _methodParameterTypes36, + returnObj = _invokableLocalService.invokeMethod(_methodName38, + _methodParameterTypes38, new Object[] { intPraticaId, sospesa }); } catch (Throwable t) { @@ -1585,8 +1659,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName37, - _methodParameterTypes37, + returnObj = _invokableLocalService.invokeMethod(_methodName39, + _methodParameterTypes39, new Object[] { intPraticaId, @@ -1626,8 +1700,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName38, - _methodParameterTypes38, + returnObj = _invokableLocalService.invokeMethod(_methodName40, + _methodParameterTypes40, new Object[] { intPraticaId, @@ -1664,8 +1738,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName39, - _methodParameterTypes39, + returnObj = _invokableLocalService.invokeMethod(_methodName41, + _methodParameterTypes41, new Object[] { companyId, userId, start, end }); } catch (Throwable t) { @@ -1693,8 +1767,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName40, - _methodParameterTypes40, new Object[] { companyId, userId }); + returnObj = _invokableLocalService.invokeMethod(_methodName42, + _methodParameterTypes42, new Object[] { companyId, userId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1720,8 +1794,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName41, - _methodParameterTypes41, new Object[] { intPraticaId, status }); + _invokableLocalService.invokeMethod(_methodName43, + _methodParameterTypes43, new Object[] { intPraticaId, status }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1752,8 +1826,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName42, - _methodParameterTypes42, + returnObj = _invokableLocalService.invokeMethod(_methodName44, + _methodParameterTypes44, new Object[] { companyId, soggettoId }); } catch (Throwable t) { @@ -1786,8 +1860,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName43, - _methodParameterTypes43, + returnObj = _invokableLocalService.invokeMethod(_methodName45, + _methodParameterTypes45, new Object[] { companyId, soggettoId }); } catch (Throwable t) { @@ -1821,8 +1895,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName44, - _methodParameterTypes44, + returnObj = _invokableLocalService.invokeMethod(_methodName46, + _methodParameterTypes46, new Object[] { companyId, soggettoId }); } catch (Throwable t) { @@ -1855,8 +1929,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName45, - _methodParameterTypes45, + returnObj = _invokableLocalService.invokeMethod(_methodName47, + _methodParameterTypes47, new Object[] { companyId, soggettoId }); } catch (Throwable t) { @@ -1890,8 +1964,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName46, - _methodParameterTypes46, + returnObj = _invokableLocalService.invokeMethod(_methodName48, + _methodParameterTypes48, new Object[] { companyId, soggettoId, start, end }); } catch (Throwable t) { @@ -1925,8 +1999,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName47, - _methodParameterTypes47, + returnObj = _invokableLocalService.invokeMethod(_methodName49, + _methodParameterTypes49, new Object[] { companyId, soggettoId }); } catch (Throwable t) { @@ -1960,8 +2034,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName48, - _methodParameterTypes48, + returnObj = _invokableLocalService.invokeMethod(_methodName50, + _methodParameterTypes50, new Object[] { companyId, @@ -2003,8 +2077,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName49, - _methodParameterTypes49, + returnObj = _invokableLocalService.invokeMethod(_methodName51, + _methodParameterTypes51, new Object[] { companyId, @@ -2042,8 +2116,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName50, - _methodParameterTypes50, + returnObj = _invokableLocalService.invokeMethod(_methodName52, + _methodParameterTypes52, new Object[] { companyId, @@ -2085,8 +2159,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName51, - _methodParameterTypes51, + returnObj = _invokableLocalService.invokeMethod(_methodName53, + _methodParameterTypes53, new Object[] { companyId, @@ -2123,8 +2197,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName52, - _methodParameterTypes52, + returnObj = _invokableLocalService.invokeMethod(_methodName54, + _methodParameterTypes54, new Object[] { ClpSerializer.translateInput(groupIds), @@ -2158,8 +2232,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName53, - _methodParameterTypes53, + returnObj = _invokableLocalService.invokeMethod(_methodName55, + _methodParameterTypes55, new Object[] { ClpSerializer.translateInput(groupIds) }); } catch (Throwable t) { @@ -2188,8 +2262,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName54, - _methodParameterTypes54, + returnObj = _invokableLocalService.invokeMethod(_methodName56, + _methodParameterTypes56, new Object[] { ClpSerializer.translateInput(groupIds), @@ -2230,8 +2304,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName55, - _methodParameterTypes55, + returnObj = _invokableLocalService.invokeMethod(_methodName57, + _methodParameterTypes57, new Object[] { intPraticaId, @@ -2281,8 +2355,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName56, - _methodParameterTypes56, + returnObj = _invokableLocalService.invokeMethod(_methodName58, + _methodParameterTypes58, new Object[] { intPraticaId, @@ -2321,8 +2395,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName57, - _methodParameterTypes57, + _invokableLocalService.invokeMethod(_methodName59, + _methodParameterTypes59, new Object[] { docPraticaAnnullamentoId }); } catch (Throwable t) { @@ -2351,8 +2425,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName58, - _methodParameterTypes58, new Object[] { intPraticaId }); + _invokableLocalService.invokeMethod(_methodName60, + _methodParameterTypes60, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2381,8 +2455,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName59, - _methodParameterTypes59, + _invokableLocalService.invokeMethod(_methodName61, + _methodParameterTypes61, new Object[] { intPraticaId, controlloPraticaId, istruttoreId }); } catch (Throwable t) { @@ -2414,8 +2488,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName60, - _methodParameterTypes60, + returnObj = _invokableLocalService.invokeMethod(_methodName62, + _methodParameterTypes62, new Object[] { ispettoreId, @@ -2454,8 +2528,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName61, - _methodParameterTypes61, + returnObj = _invokableLocalService.invokeMethod(_methodName63, + _methodParameterTypes63, new Object[] { ispettoreId, @@ -2489,8 +2563,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName62, - _methodParameterTypes62, + returnObj = _invokableLocalService.invokeMethod(_methodName64, + _methodParameterTypes64, new Object[] { ClpSerializer.translateInput(intPratica), @@ -2528,8 +2602,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName63, - _methodParameterTypes63, + returnObj = _invokableLocalService.invokeMethod(_methodName65, + _methodParameterTypes65, new Object[] { intPraticaId, @@ -2563,8 +2637,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { public void reIndexFascicolo( it.tref.liferay.portos.bo.model.IntPratica pratica, long companyId) { try { - _invokableLocalService.invokeMethod(_methodName64, - _methodParameterTypes64, + _invokableLocalService.invokeMethod(_methodName66, + _methodParameterTypes66, new Object[] { ClpSerializer.translateInput(pratica), companyId }); } catch (Throwable t) { @@ -2584,8 +2658,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { public void reIndexFasciolo(java.lang.String numeroProgetto, long companyId) throws com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName65, - _methodParameterTypes65, + _invokableLocalService.invokeMethod(_methodName67, + _methodParameterTypes67, new Object[] { ClpSerializer.translateInput(numeroProgetto), @@ -2614,8 +2688,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName66, - _methodParameterTypes66, + _invokableLocalService.invokeMethod(_methodName68, + _methodParameterTypes68, new Object[] { intPraticaId, companyId }); } catch (Throwable t) { @@ -2646,8 +2720,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName67, - _methodParameterTypes67, + returnObj = _invokableLocalService.invokeMethod(_methodName69, + _methodParameterTypes69, new Object[] { ClpSerializer.translateInput(numeroProgetto) }); } catch (Throwable t) { @@ -2676,8 +2750,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName68, - _methodParameterTypes68, new Object[] { territorioId }); + returnObj = _invokableLocalService.invokeMethod(_methodName70, + _methodParameterTypes70, new Object[] { territorioId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2706,8 +2780,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName69, - _methodParameterTypes69, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName71, + _methodParameterTypes71, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2737,8 +2811,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName70, - _methodParameterTypes70, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName72, + _methodParameterTypes72, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2766,8 +2840,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName71, - _methodParameterTypes71, + _invokableLocalService.invokeMethod(_methodName73, + _methodParameterTypes73, new Object[] { dettPraticaId, @@ -2818,8 +2892,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName72, - _methodParameterTypes72, + returnObj = _invokableLocalService.invokeMethod(_methodName74, + _methodParameterTypes74, new Object[] { ClpSerializer.translateInput(request), @@ -2852,8 +2926,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName73, - _methodParameterTypes73, + returnObj = _invokableLocalService.invokeMethod(_methodName75, + _methodParameterTypes75, new Object[] { ClpSerializer.translateInput(request), @@ -2886,8 +2960,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName74, - _methodParameterTypes74, + returnObj = _invokableLocalService.invokeMethod(_methodName76, + _methodParameterTypes76, new Object[] { ClpSerializer.translateInput(request), @@ -3062,4 +3136,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { private String[] _methodParameterTypes73; private String _methodName74; private String[] _methodParameterTypes74; + private String _methodName75; + private String[] _methodParameterTypes75; + private String _methodName76; + private String[] _methodParameterTypes76; } \ 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/IntPraticaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java index 8babb71e..435b5474 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java @@ -373,6 +373,18 @@ public class IntPraticaLocalServiceUtil { esitoControllo, dtPratica, serviceContext); } + public static java.util.List findByStatoPratica( + java.lang.String statoPratica) + throws com.liferay.portal.kernel.exception.SystemException { + return getService().findByStatoPratica(statoPratica); + } + + public static java.util.List findByStatoPratica( + java.lang.String statoPratica, int start, int end) + throws com.liferay.portal.kernel.exception.SystemException { + return getService().findByStatoPratica(statoPratica, start, end); + } + public static it.tref.liferay.portos.bo.model.IntPratica deleteIntPratica( it.tref.liferay.portos.bo.model.IntPratica intPratica, boolean forced) throws com.liferay.portal.kernel.exception.PortalException, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java index 9ef10dc0..4b5f0a28 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java @@ -396,6 +396,21 @@ public class IntPraticaLocalServiceWrapper implements IntPraticaLocalService, numeroProgetto, validata, esitoControllo, dtPratica, serviceContext); } + @Override + public java.util.List findByStatoPratica( + java.lang.String statoPratica) + throws com.liferay.portal.kernel.exception.SystemException { + return _intPraticaLocalService.findByStatoPratica(statoPratica); + } + + @Override + public java.util.List findByStatoPratica( + java.lang.String statoPratica, int start, int end) + throws com.liferay.portal.kernel.exception.SystemException { + return _intPraticaLocalService.findByStatoPratica(statoPratica, start, + end); + } + @Override public it.tref.liferay.portos.bo.model.IntPratica deleteIntPratica( it.tref.liferay.portos.bo.model.IntPratica intPratica, boolean forced) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistence.java index 115423ca..30708552 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistence.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistence.java @@ -1046,6 +1046,144 @@ public interface IntPraticaPersistence extends BasePersistence { public int countByP(int status, java.util.Date dtPratica) throws com.liferay.portal.kernel.exception.SystemException; + /** + * Returns all the int praticas where statoPratica = ?. + * + * @param statoPratica the stato pratica + * @return the matching int praticas + * @throws SystemException if a system exception occurred + */ + public java.util.List findByStatoPratica( + java.lang.String statoPratica) + throws com.liferay.portal.kernel.exception.SystemException; + + /** + * Returns a range of all the int praticas where statoPratica = ?. + * + *

+ * Useful when paginating results. Returns a maximum of end - start instances. start and end are not primary keys, they are indexes in the result set. Thus, 0 refers to the first result in the set. Setting both start and end to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If orderByComparator is specified, then the query will include the given ORDER BY logic. If orderByComparator is absent and pagination is required (start and end are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl}. If both orderByComparator and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order. + *

+ * + * @param statoPratica the stato pratica + * @param start the lower bound of the range of int praticas + * @param end the upper bound of the range of int praticas (not inclusive) + * @return the range of matching int praticas + * @throws SystemException if a system exception occurred + */ + public java.util.List findByStatoPratica( + java.lang.String statoPratica, int start, int end) + throws com.liferay.portal.kernel.exception.SystemException; + + /** + * Returns an ordered range of all the int praticas where statoPratica = ?. + * + *

+ * Useful when paginating results. Returns a maximum of end - start instances. start and end are not primary keys, they are indexes in the result set. Thus, 0 refers to the first result in the set. Setting both start and end to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If orderByComparator is specified, then the query will include the given ORDER BY logic. If orderByComparator is absent and pagination is required (start and end are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl}. If both orderByComparator and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order. + *

+ * + * @param statoPratica the stato pratica + * @param start the lower bound of the range of int praticas + * @param end the upper bound of the range of int praticas (not inclusive) + * @param orderByComparator the comparator to order the results by (optionally null) + * @return the ordered range of matching int praticas + * @throws SystemException if a system exception occurred + */ + public java.util.List findByStatoPratica( + java.lang.String statoPratica, int start, int end, + com.liferay.portal.kernel.util.OrderByComparator orderByComparator) + throws com.liferay.portal.kernel.exception.SystemException; + + /** + * Returns the first int pratica in the ordered set where statoPratica = ?. + * + * @param statoPratica the stato pratica + * @param orderByComparator the comparator to order the set by (optionally null) + * @return the first matching int pratica + * @throws it.tref.liferay.portos.bo.NoSuchIntPraticaException if a matching int pratica could not be found + * @throws SystemException if a system exception occurred + */ + public it.tref.liferay.portos.bo.model.IntPratica findByStatoPratica_First( + java.lang.String statoPratica, + com.liferay.portal.kernel.util.OrderByComparator orderByComparator) + throws com.liferay.portal.kernel.exception.SystemException, + it.tref.liferay.portos.bo.NoSuchIntPraticaException; + + /** + * Returns the first int pratica in the ordered set where statoPratica = ?. + * + * @param statoPratica the stato pratica + * @param orderByComparator the comparator to order the set by (optionally null) + * @return the first matching int pratica, or null if a matching int pratica could not be found + * @throws SystemException if a system exception occurred + */ + public it.tref.liferay.portos.bo.model.IntPratica fetchByStatoPratica_First( + java.lang.String statoPratica, + com.liferay.portal.kernel.util.OrderByComparator orderByComparator) + throws com.liferay.portal.kernel.exception.SystemException; + + /** + * Returns the last int pratica in the ordered set where statoPratica = ?. + * + * @param statoPratica the stato pratica + * @param orderByComparator the comparator to order the set by (optionally null) + * @return the last matching int pratica + * @throws it.tref.liferay.portos.bo.NoSuchIntPraticaException if a matching int pratica could not be found + * @throws SystemException if a system exception occurred + */ + public it.tref.liferay.portos.bo.model.IntPratica findByStatoPratica_Last( + java.lang.String statoPratica, + com.liferay.portal.kernel.util.OrderByComparator orderByComparator) + throws com.liferay.portal.kernel.exception.SystemException, + it.tref.liferay.portos.bo.NoSuchIntPraticaException; + + /** + * Returns the last int pratica in the ordered set where statoPratica = ?. + * + * @param statoPratica the stato pratica + * @param orderByComparator the comparator to order the set by (optionally null) + * @return the last matching int pratica, or null if a matching int pratica could not be found + * @throws SystemException if a system exception occurred + */ + public it.tref.liferay.portos.bo.model.IntPratica fetchByStatoPratica_Last( + java.lang.String statoPratica, + com.liferay.portal.kernel.util.OrderByComparator orderByComparator) + throws com.liferay.portal.kernel.exception.SystemException; + + /** + * Returns the int praticas before and after the current int pratica in the ordered set where statoPratica = ?. + * + * @param intPraticaId the primary key of the current int pratica + * @param statoPratica the stato pratica + * @param orderByComparator the comparator to order the set by (optionally null) + * @return the previous, current, and next int pratica + * @throws it.tref.liferay.portos.bo.NoSuchIntPraticaException if a int pratica with the primary key could not be found + * @throws SystemException if a system exception occurred + */ + public it.tref.liferay.portos.bo.model.IntPratica[] findByStatoPratica_PrevAndNext( + long intPraticaId, java.lang.String statoPratica, + com.liferay.portal.kernel.util.OrderByComparator orderByComparator) + throws com.liferay.portal.kernel.exception.SystemException, + it.tref.liferay.portos.bo.NoSuchIntPraticaException; + + /** + * Removes all the int praticas where statoPratica = ? from the database. + * + * @param statoPratica the stato pratica + * @throws SystemException if a system exception occurred + */ + public void removeByStatoPratica(java.lang.String statoPratica) + throws com.liferay.portal.kernel.exception.SystemException; + + /** + * Returns the number of int praticas where statoPratica = ?. + * + * @param statoPratica the stato pratica + * @return the number of matching int praticas + * @throws SystemException if a system exception occurred + */ + public int countByStatoPratica(java.lang.String statoPratica) + throws com.liferay.portal.kernel.exception.SystemException; + /** * Caches the int pratica in the entity cache if it is enabled. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaUtil.java index 58e7fd8c..704dd59b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaUtil.java @@ -1303,6 +1303,172 @@ public class IntPraticaUtil { return getPersistence().countByP(status, dtPratica); } + /** + * Returns all the int praticas where statoPratica = ?. + * + * @param statoPratica the stato pratica + * @return the matching int praticas + * @throws SystemException if a system exception occurred + */ + public static java.util.List findByStatoPratica( + java.lang.String statoPratica) + throws com.liferay.portal.kernel.exception.SystemException { + return getPersistence().findByStatoPratica(statoPratica); + } + + /** + * Returns a range of all the int praticas where statoPratica = ?. + * + *

+ * Useful when paginating results. Returns a maximum of end - start instances. start and end are not primary keys, they are indexes in the result set. Thus, 0 refers to the first result in the set. Setting both start and end to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If orderByComparator is specified, then the query will include the given ORDER BY logic. If orderByComparator is absent and pagination is required (start and end are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl}. If both orderByComparator and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order. + *

+ * + * @param statoPratica the stato pratica + * @param start the lower bound of the range of int praticas + * @param end the upper bound of the range of int praticas (not inclusive) + * @return the range of matching int praticas + * @throws SystemException if a system exception occurred + */ + public static java.util.List findByStatoPratica( + java.lang.String statoPratica, int start, int end) + throws com.liferay.portal.kernel.exception.SystemException { + return getPersistence().findByStatoPratica(statoPratica, start, end); + } + + /** + * Returns an ordered range of all the int praticas where statoPratica = ?. + * + *

+ * Useful when paginating results. Returns a maximum of end - start instances. start and end are not primary keys, they are indexes in the result set. Thus, 0 refers to the first result in the set. Setting both start and end to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If orderByComparator is specified, then the query will include the given ORDER BY logic. If orderByComparator is absent and pagination is required (start and end are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl}. If both orderByComparator and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order. + *

+ * + * @param statoPratica the stato pratica + * @param start the lower bound of the range of int praticas + * @param end the upper bound of the range of int praticas (not inclusive) + * @param orderByComparator the comparator to order the results by (optionally null) + * @return the ordered range of matching int praticas + * @throws SystemException if a system exception occurred + */ + public static java.util.List findByStatoPratica( + java.lang.String statoPratica, int start, int end, + com.liferay.portal.kernel.util.OrderByComparator orderByComparator) + throws com.liferay.portal.kernel.exception.SystemException { + return getPersistence() + .findByStatoPratica(statoPratica, start, end, + orderByComparator); + } + + /** + * Returns the first int pratica in the ordered set where statoPratica = ?. + * + * @param statoPratica the stato pratica + * @param orderByComparator the comparator to order the set by (optionally null) + * @return the first matching int pratica + * @throws it.tref.liferay.portos.bo.NoSuchIntPraticaException if a matching int pratica could not be found + * @throws SystemException if a system exception occurred + */ + public static it.tref.liferay.portos.bo.model.IntPratica findByStatoPratica_First( + java.lang.String statoPratica, + com.liferay.portal.kernel.util.OrderByComparator orderByComparator) + throws com.liferay.portal.kernel.exception.SystemException, + it.tref.liferay.portos.bo.NoSuchIntPraticaException { + return getPersistence() + .findByStatoPratica_First(statoPratica, orderByComparator); + } + + /** + * Returns the first int pratica in the ordered set where statoPratica = ?. + * + * @param statoPratica the stato pratica + * @param orderByComparator the comparator to order the set by (optionally null) + * @return the first matching int pratica, or null if a matching int pratica could not be found + * @throws SystemException if a system exception occurred + */ + public static it.tref.liferay.portos.bo.model.IntPratica fetchByStatoPratica_First( + java.lang.String statoPratica, + com.liferay.portal.kernel.util.OrderByComparator orderByComparator) + throws com.liferay.portal.kernel.exception.SystemException { + return getPersistence() + .fetchByStatoPratica_First(statoPratica, orderByComparator); + } + + /** + * Returns the last int pratica in the ordered set where statoPratica = ?. + * + * @param statoPratica the stato pratica + * @param orderByComparator the comparator to order the set by (optionally null) + * @return the last matching int pratica + * @throws it.tref.liferay.portos.bo.NoSuchIntPraticaException if a matching int pratica could not be found + * @throws SystemException if a system exception occurred + */ + public static it.tref.liferay.portos.bo.model.IntPratica findByStatoPratica_Last( + java.lang.String statoPratica, + com.liferay.portal.kernel.util.OrderByComparator orderByComparator) + throws com.liferay.portal.kernel.exception.SystemException, + it.tref.liferay.portos.bo.NoSuchIntPraticaException { + return getPersistence() + .findByStatoPratica_Last(statoPratica, orderByComparator); + } + + /** + * Returns the last int pratica in the ordered set where statoPratica = ?. + * + * @param statoPratica the stato pratica + * @param orderByComparator the comparator to order the set by (optionally null) + * @return the last matching int pratica, or null if a matching int pratica could not be found + * @throws SystemException if a system exception occurred + */ + public static it.tref.liferay.portos.bo.model.IntPratica fetchByStatoPratica_Last( + java.lang.String statoPratica, + com.liferay.portal.kernel.util.OrderByComparator orderByComparator) + throws com.liferay.portal.kernel.exception.SystemException { + return getPersistence() + .fetchByStatoPratica_Last(statoPratica, orderByComparator); + } + + /** + * Returns the int praticas before and after the current int pratica in the ordered set where statoPratica = ?. + * + * @param intPraticaId the primary key of the current int pratica + * @param statoPratica the stato pratica + * @param orderByComparator the comparator to order the set by (optionally null) + * @return the previous, current, and next int pratica + * @throws it.tref.liferay.portos.bo.NoSuchIntPraticaException if a int pratica with the primary key could not be found + * @throws SystemException if a system exception occurred + */ + public static it.tref.liferay.portos.bo.model.IntPratica[] findByStatoPratica_PrevAndNext( + long intPraticaId, java.lang.String statoPratica, + com.liferay.portal.kernel.util.OrderByComparator orderByComparator) + throws com.liferay.portal.kernel.exception.SystemException, + it.tref.liferay.portos.bo.NoSuchIntPraticaException { + return getPersistence() + .findByStatoPratica_PrevAndNext(intPraticaId, statoPratica, + orderByComparator); + } + + /** + * Removes all the int praticas where statoPratica = ? from the database. + * + * @param statoPratica the stato pratica + * @throws SystemException if a system exception occurred + */ + public static void removeByStatoPratica(java.lang.String statoPratica) + throws com.liferay.portal.kernel.exception.SystemException { + getPersistence().removeByStatoPratica(statoPratica); + } + + /** + * Returns the number of int praticas where statoPratica = ?. + * + * @param statoPratica the stato pratica + * @return the number of matching int praticas + * @throws SystemException if a system exception occurred + */ + public static int countByStatoPratica(java.lang.String statoPratica) + throws com.liferay.portal.kernel.exception.SystemException { + return getPersistence().countByStatoPratica(statoPratica); + } + /** * Caches the int pratica in the entity cache if it is enabled. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/indexes.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/indexes.properties index 2822386c..46b06813 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/indexes.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/indexes.properties @@ -153,6 +153,7 @@ IX_BAD23F73=portos_bo_HistoryWorkflowAction.IntPraticaAndDettPratica IX_9929E083=portos_bo_IntPratica.C_Group IX_E75F8D41=portos_bo_IntPratica.C_UserId IX_779B836B=portos_bo_IntPratica.P +IX_ACF2D38C=portos_bo_IntPratica.StatoPratica IX_4736A755=portos_bo_IntPratica.TerritorioId IX_DB56E0F7=portos_bo_IntPratica.UUID_G IX_B06E1913=portos_bo_IntPratica.Uuid diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/indexes.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/indexes.sql index a26c4017..68cd3455 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/indexes.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/indexes.sql @@ -149,6 +149,7 @@ create index IX_BAD23F73 on portos_bo_HistoryWorkflowAction (intPraticaId, dettP create index IX_9929E083 on portos_bo_IntPratica (companyId, groupId); create index IX_E75F8D41 on portos_bo_IntPratica (companyId, userId); +create index IX_ACF2D38C on portos_bo_IntPratica (statoPratica); create index IX_779B836B on portos_bo_IntPratica (status, dtPratica); create index IX_4736A755 on portos_bo_IntPratica (territorioId); create index IX_B06E1913 on portos_bo_IntPratica (uuid_); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties index 93757d78..0c871d6c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties @@ -977,7 +977,7 @@ pagamento-utilizzata-05 = Rifiutato pagamento-utilizzata-06 = Non Pagabile pagamento-utilizzata-07 = Sostituito -label-pagamenti-spese-istruttoria = DIRITTI FISSI (D.A. 3319/2013;D.A. 116/2104) +label-pagamenti-spese-istruttoria = DIRITTI FISSI (L.R. 17/2004, art. 7; D.A. 116/2014) label-pagamenti-spese-bolli = Bolli label-pagamenti-nuove-costruzioni = Nuove costruzioni label-pagamenti-adeguamento-sismico = Nuove costruzioni / Adeguamento sismico @@ -1021,7 +1021,7 @@ ricevuta-pagamento-bolli = Ricevuta Pagamento Bolli go-back = Indietro upload-file = Carica Ricevuta -label-diritti-fissi = DIRITTI FISSI (D.A. 3319/2013;D.A. 116/2104) +label-diritti-fissi = DIRITTI FISSI (L.R. 17/2004, art. 7; D.A. 116/2014) label-interventi-beni-culturali = Interventi su beni culturali (D.Lgs. 42/2004 parte II, titolo I, capo III, sez. I) label-interventi-beni-paesaggistici = Interventi su beni paesaggistici (D.Lgs. 42/2004 parte II, titolo I, capo III, sez. I) label-pagSoggettiAdAutorizzazione = Interventi soggetti ad autorizzazione @@ -1212,6 +1212,9 @@ Tab_AvvisiAltri = Assegnati ad altri label.avviso.dettaglioPratica = label.avviso.progetto = Progetto label.avviso.protocollo = Protocollo +label.avviso.provincia = Provincia +label.avviso.comune = Comune +label.avviso.unitaoperativa = U.O. label.avviso.descrizione = Descrizione label.avviso.tipoProcedura = Tipo pratica label.avviso.dataAvviso = Data @@ -1236,7 +1239,7 @@ label.admingeniocivile.avviso.tipoDocumento.autorizzazione = Autorizzazione label.admingeniocivile.avviso.tipoDocumento.autorizzazionenegata = Autorizzazione negata label.admingeniocivile.avviso.tipoDocumento.integrazione = Richiesta di integrazione label.admingeniocivile.avviso.tipoDocumento.preavvisocontrario = Preavviso di parere contrario -label.admingeniocivile.avviso.tipoDocumento.noparere = Avviso di non competenza +label.admingeniocivile.avviso.tipoDocumento.noparere = Avviso di conclusione procedimento label.admingeniocivile.avviso.tipoDocumento.rifiutata = Rifiutata label.admingeniocivile.avviso.tipoDocumento.sottopostaparere = Avviso di avvio procedimento label.admingeniocivile.avviso.tipoDocumento.annullata = Avviso di annullamento @@ -1380,5 +1383,5 @@ sanatoria-edilizia = Sanatoria edilizia intervento-voce-p7 = L.R. 5/2019, art. 3, allegato B: intervento alla voce B note-richiedente = Note del richiedente -note-assegnatore = Note per l'istruttore +note-assegnatore = Note dell'assegnatore note-approvatore = Note dell'approvatore diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java index e91b1b05..2ed387db 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java @@ -401,7 +401,7 @@ public class SismicaUtil { public static List riparaWorkflow(long companyId, long userId) { List esito = new ArrayList<>(); - esito.addAll(riparaConformita(companyId)); + esito.addAll(riparaControlli(companyId)); esito.addAll(riparaAssegnazioniAlRuolo(companyId, userId)); esito.addAll(creaWorkflowMancanti(companyId)); esito.addAll(riparaContextWorkflow(companyId)); @@ -413,6 +413,37 @@ public class SismicaUtil { return esito; } + private static List riparaControlli(long companyId) { + + List esito = new ArrayList<>(); + esitoLog(esito, "Inizio riparazione controlli pratiche"); + try { + List pratiche = IntPraticaLocalServiceUtil.findByStatoPratica(StatoPraticaConstants.VIDIMATA); + esitoLog(esito, "Trovate " + pratiche.size() + " pratiche in stato vidimata"); + for (IntPratica pratica : pratiche) { + if ((new Date()).getTime() - pratica.getDtPratica().getTime() > 3600000) { + List controlli = ControlloPraticaLocalServiceUtil.findByIntPratica(pratica + .getIntPraticaId()); + for (ControlloPratica controllo : controlli) { + if (controllo.getStatus() == WorkflowConstants.STATUS_DRAFT) { + esitoLog(esito, "Cancello controllo pratica id = " + controllo.getControlloPraticaId()); + } + ControlloPraticaLocalServiceUtil.deleteControlloPratica(controllo); + } + esitoLog( + esito, + "Aggiungo controllo alla pratica " + pratica.getNumeroProgetto() + ", id" + + pratica.getIntPraticaId()); + aggiungiControlloPratica(pratica); + } + } + } catch (PortalException | SystemException e) { + _log.error(e); + } + esitoLog(esito, "Fine riparazione controlli pratiche"); + return esito; + } + public static List gestionePratiche() { List esito = new ArrayList<>(); esitoLog(esito, "Gestione pratiche"); @@ -531,109 +562,6 @@ public class SismicaUtil { return esito; } - private static List riparaConformita(long companyId) { - - List esito = new ArrayList<>(); - esitoLog(esito, "Riparazione avvisi di conformità"); - - List pratiche = null; - int start = 0; - do { - try { - pratiche = IntPraticaLocalServiceUtil.getIntPraticas(start, start + SLICE); - } catch (SystemException e) { - esitoLog(esito, "Errore caricamento intPratiche: " + e.getMessage()); - } - start += SLICE; - List avvisi = null; - for (IntPratica pratica : pratiche) { - String stato = pratica.getStatoPratica(); - if (Validator.isNotNull(stato) && Validator.isNotNull(pratica.getTipoProcedura()) - && pratica.getTipoPratica().equals(Constants.TIPO_PRATICA_DEPOSITO)) { - try { - avvisi = AvvisoLocalServiceUtil.findByIntPraticaId_tipoDocumento(pratica.getIntPraticaId(), - StatoPraticaConstants.CONFORME); - } catch (SystemException e) { - esitoLog(esito, "Errore caricamento avvisi: " + e.getMessage()); - } - List totali = null; - try { - totali = AvvisoLocalServiceUtil.findByIntPratica(pratica.getIntPraticaId(), QueryUtil.ALL_POS, - QueryUtil.ALL_POS, null); - } catch (SystemException e) { - totali = new ArrayList<>(); - } - if ((avvisi.size() == 0) && stato.equalsIgnoreCase(StatoPraticaConstants.VIDIMATA)) { - List controlli = null; - try { - controlli = ControlloPraticaLocalServiceUtil.findByIntPratica(pratica.getIntPraticaId()); - } catch (SystemException e) { - controlli = new ArrayList<>(); - } - if (pratica.getStatoPratica().equals(StatoPraticaConstants.VIDIMATA) && (controlli.size() == 0)) { - esitoLog( - esito, - "Progetto: " + pratica.getNumeroProgetto() + " (" + pratica.getIntPraticaId() - + "), procedura=" + pratica.getTipoProcedura() + ", avvisi=" - + totali.size() + ", stato=" + pratica.getStatoPratica() + ", controlli=" - + controlli.size()); - - DettPratica dettPratica; - try { - dettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(pratica - .getIntPraticaId()); - } catch (SystemException e) { - dettPratica = null; - } - if (Validator.isNotNull(dettPratica)) { - ServiceContext serviceContext = new ServiceContext(); - serviceContext.setCompanyId(dettPratica.getCompanyId()); - serviceContext.setScopeGroupId(dettPratica.getGroupId()); - serviceContext.setUserId(dettPratica.getUserId()); - ControlloPratica controllo; - try { - controllo = ControlloPraticaLocalServiceUtil.addControlloPratica( - dettPratica.getGroupId(), dettPratica.getUserId(), - pratica.getIntPraticaId(), dettPratica.getDettPraticaId(), false, - serviceContext); - } catch (PortalException | SystemException e) { - controllo = null; - } - if (Validator.isNotNull(controllo)) { - controllo.setStatus(WorkflowConstants.STATUS_APPROVED); - try { - ControlloPraticaLocalServiceUtil.updateControlloPratica(controllo); - } catch (SystemException e) {} - long fileEntryIdTemplate; - try { - fileEntryIdTemplate = ConfigurazioneLocalServiceUtil.findByC_ChiaveLong( - companyId, "conf.geniocivile.avviso.template.id.deposito.B2"); - } catch (SystemException e) { - fileEntryIdTemplate = 0; - } - if (Validator.isNotNull(fileEntryIdTemplate)) { - try { - pratica.setStatoPratica(StatoPraticaConstants.CONFORME); - IntPraticaLocalServiceUtil.updateIntPratica(pratica); - } catch (SystemException e) {} - } - } - } - } - } else if ((totali.size() == 2) && (avvisi.size() > 0) - && stato.equalsIgnoreCase(StatoPraticaConstants.SOTTOPOSTA_A_PARERE)) { - esitoLog(esito, "Rendo conforme: " + pratica.getNumeroProgetto()); - pratica.setStatoPratica(StatoPraticaConstants.CONFORME); - try { - IntPraticaLocalServiceUtil.updateIntPratica(pratica); - } catch (SystemException e) {} - } - } - } - } while (pratiche.size() > 0); - return esito; - } - private static List riparaContextWorkflow(long companyId) { List esito = new ArrayList<>(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java index ec5c2bad..b4771eb7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java @@ -1074,7 +1074,7 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { } if (!progettistaTecnicoRilevatorePresente && (intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_P8) - || intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_Q9) || (progettistaPresente && (intPratica + || intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_Q8) || (progettistaPresente && (intPratica .getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_P9) || intPratica.getTipoProcedura() .equalsIgnoreCase(Constants.PROCEDURA_Q9))))) { notCompleted.add("gc-soggetto-06-tecnico-rilevatore-not-present"); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaModelImpl.java index 57a09dfd..3d8cf303 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaModelImpl.java @@ -121,11 +121,12 @@ public class IntPraticaModelImpl extends BaseModelImpl public static long COMPANYID_COLUMN_BITMASK = 1L; public static long DTPRATICA_COLUMN_BITMASK = 2L; public static long GROUPID_COLUMN_BITMASK = 4L; - public static long STATUS_COLUMN_BITMASK = 8L; - public static long TERRITORIOID_COLUMN_BITMASK = 16L; - public static long USERID_COLUMN_BITMASK = 32L; - public static long UUID_COLUMN_BITMASK = 64L; - public static long INTPRATICAID_COLUMN_BITMASK = 128L; + public static long STATOPRATICA_COLUMN_BITMASK = 8L; + public static long STATUS_COLUMN_BITMASK = 16L; + public static long TERRITORIOID_COLUMN_BITMASK = 32L; + public static long USERID_COLUMN_BITMASK = 64L; + public static long UUID_COLUMN_BITMASK = 128L; + public static long INTPRATICAID_COLUMN_BITMASK = 256L; /** * Converts the soap model instance into a normal model instance. @@ -765,9 +766,19 @@ public class IntPraticaModelImpl extends BaseModelImpl @Override public void setStatoPratica(String statoPratica) { + _columnBitmask |= STATOPRATICA_COLUMN_BITMASK; + + if (_originalStatoPratica == null) { + _originalStatoPratica = _statoPratica; + } + _statoPratica = statoPratica; } + public String getOriginalStatoPratica() { + return GetterUtil.getString(_originalStatoPratica); + } + @JSON @Override public String getNumeroProgetto() { @@ -1186,6 +1197,8 @@ public class IntPraticaModelImpl extends BaseModelImpl intPraticaModelImpl._setOriginalTerritorioId = false; + intPraticaModelImpl._originalStatoPratica = intPraticaModelImpl._statoPratica; + intPraticaModelImpl._originalStatus = intPraticaModelImpl._status; intPraticaModelImpl._setOriginalStatus = false; @@ -1620,6 +1633,7 @@ public class IntPraticaModelImpl extends BaseModelImpl private long _docPraticaAnnullamentoId; private int _unitaOperativa; private String _statoPratica; + private String _originalStatoPratica; private String _numeroProgetto; private boolean _validata; private int _status; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java index 2d611d8d..db12a39c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaLocalServiceClpInvoker.java @@ -154,245 +154,253 @@ public class IntPraticaLocalServiceClpInvoker { "com.liferay.portal.service.ServiceContext" }; - _methodName180 = "deleteIntPratica"; + _methodName180 = "findByStatoPratica"; - _methodParameterTypes180 = new String[] { + _methodParameterTypes180 = new String[] { "java.lang.String" }; + + _methodName181 = "findByStatoPratica"; + + _methodParameterTypes181 = new String[] { "java.lang.String", "int", "int" }; + + _methodName182 = "deleteIntPratica"; + + _methodParameterTypes182 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "boolean" }; - _methodName181 = "deleteIntPratica"; + _methodName183 = "deleteIntPratica"; - _methodParameterTypes181 = new String[] { + _methodParameterTypes183 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica" }; - _methodName182 = "cloneIntPratica"; + _methodName184 = "cloneIntPratica"; - _methodParameterTypes182 = new String[] { + _methodParameterTypes184 = new String[] { "long", "com.liferay.portal.service.ServiceContext" }; - _methodName184 = "updateDelegati"; + _methodName186 = "updateDelegati"; - _methodParameterTypes184 = new String[] { + _methodParameterTypes186 = new String[] { "long", "java.lang.String", "java.lang.String", "boolean" }; - _methodName185 = "fetchIntPratica"; + _methodName187 = "fetchIntPratica"; - _methodParameterTypes185 = new String[] { "long" }; + _methodParameterTypes187 = new String[] { "long" }; - _methodName186 = "findFascicoliNotProgetto"; + _methodName188 = "findFascicoliNotProgetto"; - _methodParameterTypes186 = new String[] { "int", "int" }; + _methodParameterTypes188 = new String[] { "int", "int" }; - _methodName187 = "countFascicoliNotProgetto"; + _methodName189 = "countFascicoliNotProgetto"; - _methodParameterTypes187 = new String[] { }; + _methodParameterTypes189 = new String[] { }; - _methodName189 = "countByPosizione"; + _methodName191 = "countByPosizione"; - _methodParameterTypes189 = new String[] { "double", "double", "int" }; + _methodParameterTypes191 = new String[] { "double", "double", "int" }; - _methodName190 = "findByPosizione"; + _methodName192 = "findByPosizione"; - _methodParameterTypes190 = new String[] { "double", "double", "int" }; + _methodParameterTypes192 = new String[] { "double", "double", "int" }; - _methodName191 = "findByPosizione"; + _methodName193 = "findByPosizione"; - _methodParameterTypes191 = new String[] { + _methodParameterTypes193 = new String[] { "double", "double", "int", "int", "int" }; - _methodName193 = "addNumeroProgetto"; + _methodName195 = "addNumeroProgetto"; - _methodParameterTypes193 = new String[] { "long" }; + _methodParameterTypes195 = new String[] { "long" }; - _methodName194 = "sospendiPratica"; + _methodName196 = "sospendiPratica"; - _methodParameterTypes194 = new String[] { "long", "boolean" }; + _methodParameterTypes196 = new String[] { "long", "boolean" }; - _methodName195 = "cambiaTitolare"; + _methodName197 = "cambiaTitolare"; - _methodParameterTypes195 = new String[] { + _methodParameterTypes197 = new String[] { "long", "long", "com.liferay.portal.service.ServiceContext" }; - _methodName196 = "updateStatoPratica"; + _methodName198 = "updateStatoPratica"; - _methodParameterTypes196 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes198 = new String[] { "long", "java.lang.String" }; - _methodName197 = "findByC_UserId"; + _methodName199 = "findByC_UserId"; - _methodParameterTypes197 = new String[] { "long", "long", "int", "int" }; + _methodParameterTypes199 = new String[] { "long", "long", "int", "int" }; - _methodName198 = "countByC_UserId"; + _methodName200 = "countByC_UserId"; - _methodParameterTypes198 = new String[] { "long", "long" }; + _methodParameterTypes200 = new String[] { "long", "long" }; - _methodName199 = "updateStatus"; + _methodName201 = "updateStatus"; - _methodParameterTypes199 = new String[] { "long", "int" }; + _methodParameterTypes201 = new String[] { "long", "int" }; - _methodName200 = "findByCompanyIdSoggettoProgetti"; + _methodName202 = "findByCompanyIdSoggettoProgetti"; - _methodParameterTypes200 = new String[] { "long", "long" }; + _methodParameterTypes202 = new String[] { "long", "long" }; - _methodName201 = "countByCompanyIdSoggettoProgetti"; + _methodName203 = "countByCompanyIdSoggettoProgetti"; - _methodParameterTypes201 = new String[] { "long", "long" }; + _methodParameterTypes203 = new String[] { "long", "long" }; - _methodName203 = "findByCompanyIdSoggettoArchivio"; + _methodName205 = "findByCompanyIdSoggettoArchivio"; - _methodParameterTypes203 = new String[] { "long", "long" }; + _methodParameterTypes205 = new String[] { "long", "long" }; - _methodName204 = "countByCompanyIdSoggettoArchivio"; + _methodName206 = "countByCompanyIdSoggettoArchivio"; - _methodParameterTypes204 = new String[] { "long", "long" }; + _methodParameterTypes206 = new String[] { "long", "long" }; - _methodName206 = "findByCompanyIdSoggettoAltriProgetti"; + _methodName208 = "findByCompanyIdSoggettoAltriProgetti"; - _methodParameterTypes206 = new String[] { "long", "long", "int", "int" }; + _methodParameterTypes208 = new String[] { "long", "long", "int", "int" }; - _methodName207 = "countByCompanyIdSoggettoAltriProgetti"; + _methodName209 = "countByCompanyIdSoggettoAltriProgetti"; - _methodParameterTypes207 = new String[] { "long", "long" }; + _methodParameterTypes209 = new String[] { "long", "long" }; - _methodName209 = "findByCanAddFineLavori"; + _methodName211 = "findByCanAddFineLavori"; - _methodParameterTypes209 = new String[] { + _methodParameterTypes211 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName210 = "countByCanAddFineLavori"; + _methodName212 = "countByCanAddFineLavori"; - _methodParameterTypes210 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes212 = new String[] { "long", "java.lang.String" }; - _methodName212 = "findByCanAddCollaudo"; + _methodName214 = "findByCanAddCollaudo"; - _methodParameterTypes212 = new String[] { + _methodParameterTypes214 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName213 = "countByCanAddCollaudo"; + _methodName215 = "countByCanAddCollaudo"; - _methodParameterTypes213 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes215 = new String[] { "long", "java.lang.String" }; - _methodName214 = "search"; + _methodName216 = "search"; - _methodParameterTypes214 = new String[] { "java.util.List", "int", "int" }; + _methodParameterTypes216 = new String[] { "java.util.List", "int", "int" }; - _methodName215 = "countSearch"; + _methodName217 = "countSearch"; - _methodParameterTypes215 = new String[] { "java.util.List" }; + _methodParameterTypes217 = new String[] { "java.util.List" }; - _methodName216 = "searchWithIntPraticaId"; + _methodName218 = "searchWithIntPraticaId"; - _methodParameterTypes216 = new String[] { + _methodParameterTypes218 = new String[] { "java.util.List", "long", "int", "int" }; - _methodName217 = "allegaFileAnnullamento"; + _methodName219 = "allegaFileAnnullamento"; - _methodParameterTypes217 = new String[] { + _methodParameterTypes219 = new String[] { "long", "byte[][]", "java.lang.String", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName218 = "generateFileAnnullamento"; + _methodName220 = "generateFileAnnullamento"; - _methodParameterTypes218 = new String[] { + _methodParameterTypes220 = new String[] { "long", "com.liferay.portal.service.ServiceContext" }; - _methodName219 = "deleteFileAnnullamento"; + _methodName221 = "deleteFileAnnullamento"; - _methodParameterTypes219 = new String[] { "long" }; + _methodParameterTypes221 = new String[] { "long" }; - _methodName220 = "completeAnnullamento"; + _methodName222 = "completeAnnullamento"; - _methodParameterTypes220 = new String[] { "long" }; + _methodParameterTypes222 = new String[] { "long" }; - _methodName221 = "cambiaIstruttore"; + _methodName223 = "cambiaIstruttore"; - _methodParameterTypes221 = new String[] { "long", "long", "long" }; + _methodParameterTypes223 = new String[] { "long", "long", "long" }; - _methodName222 = "countCaricoLavoroCF"; + _methodName224 = "countCaricoLavoroCF"; - _methodParameterTypes222 = new String[] { + _methodParameterTypes224 = new String[] { "long", "java.lang.String", "java.lang.Long[][]" }; - _methodName223 = "countCaricoLavoroIstruttore"; + _methodName225 = "countCaricoLavoroIstruttore"; - _methodParameterTypes223 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes225 = new String[] { "long", "java.lang.String" }; - _methodName224 = "generateReportPratica"; + _methodName226 = "generateReportPratica"; - _methodParameterTypes224 = new String[] { + _methodParameterTypes226 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName225 = "updateModifiedDate"; + _methodName227 = "updateModifiedDate"; - _methodParameterTypes225 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes227 = new String[] { "long", "java.util.Date" }; - _methodName226 = "reIndexFascicolo"; + _methodName228 = "reIndexFascicolo"; - _methodParameterTypes226 = new String[] { + _methodParameterTypes228 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName227 = "reIndexFasciolo"; + _methodName229 = "reIndexFasciolo"; - _methodParameterTypes227 = new String[] { "java.lang.String", "long" }; + _methodParameterTypes229 = new String[] { "java.lang.String", "long" }; - _methodName228 = "reIndexFasciolo"; + _methodName230 = "reIndexFasciolo"; - _methodParameterTypes228 = new String[] { "long", "long" }; + _methodParameterTypes230 = new String[] { "long", "long" }; - _methodName229 = "findByNumeroProgetto"; + _methodName231 = "findByNumeroProgetto"; - _methodParameterTypes229 = new String[] { "java.lang.String" }; + _methodParameterTypes231 = new String[] { "java.lang.String" }; - _methodName230 = "findByTerritorioId"; + _methodName232 = "findByTerritorioId"; - _methodParameterTypes230 = new String[] { "long" }; + _methodParameterTypes232 = new String[] { "long" }; - _methodName231 = "getOrganizationByIntPraticaId"; + _methodName233 = "getOrganizationByIntPraticaId"; - _methodParameterTypes231 = new String[] { "long" }; + _methodParameterTypes233 = new String[] { "long" }; - _methodName232 = "hasRichiestaIntegrazioneAttiva"; + _methodName234 = "hasRichiestaIntegrazioneAttiva"; - _methodParameterTypes232 = new String[] { "long" }; + _methodParameterTypes234 = new String[] { "long" }; - _methodName233 = "invioMailNotifica"; + _methodName235 = "invioMailNotifica"; - _methodParameterTypes233 = new String[] { + _methodParameterTypes235 = new String[] { "long", "long", "java.lang.String", "java.lang.String[][]", "java.lang.String[][]", "java.lang.String[][]", "java.lang.String", "com.liferay.portal.kernel.json.JSONObject", "java.util.List", "com.liferay.portal.service.ServiceContext" }; - _methodName234 = "searchAltriProgetti"; + _methodName236 = "searchAltriProgetti"; - _methodParameterTypes234 = new String[] { + _methodParameterTypes236 = new String[] { "javax.servlet.http.HttpServletRequest", "com.liferay.portal.model.User", "int", "int" }; - _methodName235 = "searchArchivioProgetti"; + _methodName237 = "searchArchivioProgetti"; - _methodParameterTypes235 = new String[] { + _methodParameterTypes237 = new String[] { "javax.servlet.http.HttpServletRequest", "com.liferay.portal.model.User", "int", "int" }; - _methodName236 = "searchMieiProgetti"; + _methodName238 = "searchMieiProgetti"; - _methodParameterTypes236 = new String[] { + _methodParameterTypes238 = new String[] { "javax.servlet.http.HttpServletRequest", "com.liferay.portal.model.User", "int", "int" }; @@ -555,60 +563,72 @@ public class IntPraticaLocalServiceClpInvoker { if (_methodName180.equals(name) && Arrays.deepEquals(_methodParameterTypes180, parameterTypes)) { - return IntPraticaLocalServiceUtil.deleteIntPratica((it.tref.liferay.portos.bo.model.IntPratica)arguments[0], - ((Boolean)arguments[1]).booleanValue()); + return IntPraticaLocalServiceUtil.findByStatoPratica((java.lang.String)arguments[0]); } if (_methodName181.equals(name) && Arrays.deepEquals(_methodParameterTypes181, parameterTypes)) { - return IntPraticaLocalServiceUtil.deleteIntPratica((it.tref.liferay.portos.bo.model.IntPratica)arguments[0]); + return IntPraticaLocalServiceUtil.findByStatoPratica((java.lang.String)arguments[0], + ((Integer)arguments[1]).intValue(), + ((Integer)arguments[2]).intValue()); } if (_methodName182.equals(name) && Arrays.deepEquals(_methodParameterTypes182, parameterTypes)) { - return IntPraticaLocalServiceUtil.cloneIntPratica(((Long)arguments[0]).longValue(), - (com.liferay.portal.service.ServiceContext)arguments[1]); + return IntPraticaLocalServiceUtil.deleteIntPratica((it.tref.liferay.portos.bo.model.IntPratica)arguments[0], + ((Boolean)arguments[1]).booleanValue()); + } + + if (_methodName183.equals(name) && + Arrays.deepEquals(_methodParameterTypes183, parameterTypes)) { + return IntPraticaLocalServiceUtil.deleteIntPratica((it.tref.liferay.portos.bo.model.IntPratica)arguments[0]); } if (_methodName184.equals(name) && Arrays.deepEquals(_methodParameterTypes184, parameterTypes)) { + return IntPraticaLocalServiceUtil.cloneIntPratica(((Long)arguments[0]).longValue(), + (com.liferay.portal.service.ServiceContext)arguments[1]); + } + + if (_methodName186.equals(name) && + Arrays.deepEquals(_methodParameterTypes186, parameterTypes)) { return IntPraticaLocalServiceUtil.updateDelegati(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (java.lang.String)arguments[2], ((Boolean)arguments[3]).booleanValue()); } - if (_methodName185.equals(name) && - Arrays.deepEquals(_methodParameterTypes185, parameterTypes)) { + if (_methodName187.equals(name) && + Arrays.deepEquals(_methodParameterTypes187, parameterTypes)) { return IntPraticaLocalServiceUtil.fetchIntPratica(((Long)arguments[0]).longValue()); } - if (_methodName186.equals(name) && - Arrays.deepEquals(_methodParameterTypes186, parameterTypes)) { + if (_methodName188.equals(name) && + Arrays.deepEquals(_methodParameterTypes188, parameterTypes)) { return IntPraticaLocalServiceUtil.findFascicoliNotProgetto(((Integer)arguments[0]).intValue(), ((Integer)arguments[1]).intValue()); } - if (_methodName187.equals(name) && - Arrays.deepEquals(_methodParameterTypes187, parameterTypes)) { + if (_methodName189.equals(name) && + Arrays.deepEquals(_methodParameterTypes189, parameterTypes)) { return IntPraticaLocalServiceUtil.countFascicoliNotProgetto(); } - if (_methodName189.equals(name) && - Arrays.deepEquals(_methodParameterTypes189, parameterTypes)) { + if (_methodName191.equals(name) && + Arrays.deepEquals(_methodParameterTypes191, parameterTypes)) { return IntPraticaLocalServiceUtil.countByPosizione(((Double)arguments[0]).doubleValue(), ((Double)arguments[1]).doubleValue(), ((Integer)arguments[2]).intValue()); } - if (_methodName190.equals(name) && - Arrays.deepEquals(_methodParameterTypes190, parameterTypes)) { + if (_methodName192.equals(name) && + Arrays.deepEquals(_methodParameterTypes192, parameterTypes)) { return IntPraticaLocalServiceUtil.findByPosizione(((Double)arguments[0]).doubleValue(), ((Double)arguments[1]).doubleValue(), ((Integer)arguments[2]).intValue()); } - if (_methodName191.equals(name) && - Arrays.deepEquals(_methodParameterTypes191, parameterTypes)) { + if (_methodName193.equals(name) && + Arrays.deepEquals(_methodParameterTypes193, parameterTypes)) { return IntPraticaLocalServiceUtil.findByPosizione(((Double)arguments[0]).doubleValue(), ((Double)arguments[1]).doubleValue(), ((Integer)arguments[2]).intValue(), @@ -616,168 +636,168 @@ public class IntPraticaLocalServiceClpInvoker { ((Integer)arguments[4]).intValue()); } - if (_methodName193.equals(name) && - Arrays.deepEquals(_methodParameterTypes193, parameterTypes)) { + if (_methodName195.equals(name) && + Arrays.deepEquals(_methodParameterTypes195, parameterTypes)) { return IntPraticaLocalServiceUtil.addNumeroProgetto(((Long)arguments[0]).longValue()); } - if (_methodName194.equals(name) && - Arrays.deepEquals(_methodParameterTypes194, parameterTypes)) { + if (_methodName196.equals(name) && + Arrays.deepEquals(_methodParameterTypes196, parameterTypes)) { return IntPraticaLocalServiceUtil.sospendiPratica(((Long)arguments[0]).longValue(), ((Boolean)arguments[1]).booleanValue()); } - if (_methodName195.equals(name) && - Arrays.deepEquals(_methodParameterTypes195, parameterTypes)) { + if (_methodName197.equals(name) && + Arrays.deepEquals(_methodParameterTypes197, parameterTypes)) { return IntPraticaLocalServiceUtil.cambiaTitolare(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), (com.liferay.portal.service.ServiceContext)arguments[2]); } - if (_methodName196.equals(name) && - Arrays.deepEquals(_methodParameterTypes196, parameterTypes)) { + if (_methodName198.equals(name) && + Arrays.deepEquals(_methodParameterTypes198, parameterTypes)) { return IntPraticaLocalServiceUtil.updateStatoPratica(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName197.equals(name) && - Arrays.deepEquals(_methodParameterTypes197, parameterTypes)) { + if (_methodName199.equals(name) && + Arrays.deepEquals(_methodParameterTypes199, parameterTypes)) { return IntPraticaLocalServiceUtil.findByC_UserId(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName198.equals(name) && - Arrays.deepEquals(_methodParameterTypes198, parameterTypes)) { + if (_methodName200.equals(name) && + Arrays.deepEquals(_methodParameterTypes200, parameterTypes)) { return IntPraticaLocalServiceUtil.countByC_UserId(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName199.equals(name) && - Arrays.deepEquals(_methodParameterTypes199, parameterTypes)) { + if (_methodName201.equals(name) && + Arrays.deepEquals(_methodParameterTypes201, parameterTypes)) { IntPraticaLocalServiceUtil.updateStatus(((Long)arguments[0]).longValue(), ((Integer)arguments[1]).intValue()); return null; } - if (_methodName200.equals(name) && - Arrays.deepEquals(_methodParameterTypes200, parameterTypes)) { + if (_methodName202.equals(name) && + Arrays.deepEquals(_methodParameterTypes202, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCompanyIdSoggettoProgetti(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName201.equals(name) && - Arrays.deepEquals(_methodParameterTypes201, parameterTypes)) { + if (_methodName203.equals(name) && + Arrays.deepEquals(_methodParameterTypes203, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCompanyIdSoggettoProgetti(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName203.equals(name) && - Arrays.deepEquals(_methodParameterTypes203, parameterTypes)) { + if (_methodName205.equals(name) && + Arrays.deepEquals(_methodParameterTypes205, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCompanyIdSoggettoArchivio(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName204.equals(name) && - Arrays.deepEquals(_methodParameterTypes204, parameterTypes)) { + if (_methodName206.equals(name) && + Arrays.deepEquals(_methodParameterTypes206, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCompanyIdSoggettoArchivio(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName206.equals(name) && - Arrays.deepEquals(_methodParameterTypes206, parameterTypes)) { + if (_methodName208.equals(name) && + Arrays.deepEquals(_methodParameterTypes208, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCompanyIdSoggettoAltriProgetti(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName207.equals(name) && - Arrays.deepEquals(_methodParameterTypes207, parameterTypes)) { + if (_methodName209.equals(name) && + Arrays.deepEquals(_methodParameterTypes209, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCompanyIdSoggettoAltriProgetti(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName209.equals(name) && - Arrays.deepEquals(_methodParameterTypes209, parameterTypes)) { + if (_methodName211.equals(name) && + Arrays.deepEquals(_methodParameterTypes211, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCanAddFineLavori(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName210.equals(name) && - Arrays.deepEquals(_methodParameterTypes210, parameterTypes)) { + if (_methodName212.equals(name) && + Arrays.deepEquals(_methodParameterTypes212, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCanAddFineLavori(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName212.equals(name) && - Arrays.deepEquals(_methodParameterTypes212, parameterTypes)) { + if (_methodName214.equals(name) && + Arrays.deepEquals(_methodParameterTypes214, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCanAddCollaudo(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName213.equals(name) && - Arrays.deepEquals(_methodParameterTypes213, parameterTypes)) { + if (_methodName215.equals(name) && + Arrays.deepEquals(_methodParameterTypes215, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCanAddCollaudo(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName214.equals(name) && - Arrays.deepEquals(_methodParameterTypes214, parameterTypes)) { + if (_methodName216.equals(name) && + Arrays.deepEquals(_methodParameterTypes216, parameterTypes)) { return IntPraticaLocalServiceUtil.search((java.util.List)arguments[0], ((Integer)arguments[1]).intValue(), ((Integer)arguments[2]).intValue()); } - if (_methodName215.equals(name) && - Arrays.deepEquals(_methodParameterTypes215, parameterTypes)) { + if (_methodName217.equals(name) && + Arrays.deepEquals(_methodParameterTypes217, parameterTypes)) { return IntPraticaLocalServiceUtil.countSearch((java.util.List)arguments[0]); } - if (_methodName216.equals(name) && - Arrays.deepEquals(_methodParameterTypes216, parameterTypes)) { + if (_methodName218.equals(name) && + Arrays.deepEquals(_methodParameterTypes218, parameterTypes)) { return IntPraticaLocalServiceUtil.searchWithIntPraticaId((java.util.List)arguments[0], ((Long)arguments[1]).longValue(), ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName217.equals(name) && - Arrays.deepEquals(_methodParameterTypes217, parameterTypes)) { + if (_methodName219.equals(name) && + Arrays.deepEquals(_methodParameterTypes219, parameterTypes)) { return IntPraticaLocalServiceUtil.allegaFileAnnullamento(((Long)arguments[0]).longValue(), (byte[])arguments[1], (java.lang.String)arguments[2], (java.lang.String)arguments[3], (com.liferay.portal.service.ServiceContext)arguments[4]); } - if (_methodName218.equals(name) && - Arrays.deepEquals(_methodParameterTypes218, parameterTypes)) { + if (_methodName220.equals(name) && + Arrays.deepEquals(_methodParameterTypes220, parameterTypes)) { return IntPraticaLocalServiceUtil.generateFileAnnullamento(((Long)arguments[0]).longValue(), (com.liferay.portal.service.ServiceContext)arguments[1]); } - if (_methodName219.equals(name) && - Arrays.deepEquals(_methodParameterTypes219, parameterTypes)) { + if (_methodName221.equals(name) && + Arrays.deepEquals(_methodParameterTypes221, parameterTypes)) { IntPraticaLocalServiceUtil.deleteFileAnnullamento(((Long)arguments[0]).longValue()); return null; } - if (_methodName220.equals(name) && - Arrays.deepEquals(_methodParameterTypes220, parameterTypes)) { + if (_methodName222.equals(name) && + Arrays.deepEquals(_methodParameterTypes222, parameterTypes)) { IntPraticaLocalServiceUtil.completeAnnullamento(((Long)arguments[0]).longValue()); return null; } - if (_methodName221.equals(name) && - Arrays.deepEquals(_methodParameterTypes221, parameterTypes)) { + if (_methodName223.equals(name) && + Arrays.deepEquals(_methodParameterTypes223, parameterTypes)) { IntPraticaLocalServiceUtil.cambiaIstruttore(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Long)arguments[2]).longValue()); @@ -785,76 +805,76 @@ public class IntPraticaLocalServiceClpInvoker { return null; } - if (_methodName222.equals(name) && - Arrays.deepEquals(_methodParameterTypes222, parameterTypes)) { + if (_methodName224.equals(name) && + Arrays.deepEquals(_methodParameterTypes224, parameterTypes)) { return IntPraticaLocalServiceUtil.countCaricoLavoroCF(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (java.lang.Long[])arguments[2]); } - if (_methodName223.equals(name) && - Arrays.deepEquals(_methodParameterTypes223, parameterTypes)) { + if (_methodName225.equals(name) && + Arrays.deepEquals(_methodParameterTypes225, parameterTypes)) { return IntPraticaLocalServiceUtil.countCaricoLavoroIstruttore(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName224.equals(name) && - Arrays.deepEquals(_methodParameterTypes224, parameterTypes)) { + if (_methodName226.equals(name) && + Arrays.deepEquals(_methodParameterTypes226, parameterTypes)) { return IntPraticaLocalServiceUtil.generateReportPratica((it.tref.liferay.portos.bo.model.IntPratica)arguments[0], ((Long)arguments[1]).longValue()); } - if (_methodName225.equals(name) && - Arrays.deepEquals(_methodParameterTypes225, parameterTypes)) { + if (_methodName227.equals(name) && + Arrays.deepEquals(_methodParameterTypes227, parameterTypes)) { return IntPraticaLocalServiceUtil.updateModifiedDate(((Long)arguments[0]).longValue(), (java.util.Date)arguments[1]); } - if (_methodName226.equals(name) && - Arrays.deepEquals(_methodParameterTypes226, parameterTypes)) { + if (_methodName228.equals(name) && + Arrays.deepEquals(_methodParameterTypes228, parameterTypes)) { IntPraticaLocalServiceUtil.reIndexFascicolo((it.tref.liferay.portos.bo.model.IntPratica)arguments[0], ((Long)arguments[1]).longValue()); return null; } - if (_methodName227.equals(name) && - Arrays.deepEquals(_methodParameterTypes227, parameterTypes)) { + if (_methodName229.equals(name) && + Arrays.deepEquals(_methodParameterTypes229, parameterTypes)) { IntPraticaLocalServiceUtil.reIndexFasciolo((java.lang.String)arguments[0], ((Long)arguments[1]).longValue()); return null; } - if (_methodName228.equals(name) && - Arrays.deepEquals(_methodParameterTypes228, parameterTypes)) { + if (_methodName230.equals(name) && + Arrays.deepEquals(_methodParameterTypes230, parameterTypes)) { IntPraticaLocalServiceUtil.reIndexFasciolo(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); return null; } - if (_methodName229.equals(name) && - Arrays.deepEquals(_methodParameterTypes229, parameterTypes)) { + if (_methodName231.equals(name) && + Arrays.deepEquals(_methodParameterTypes231, parameterTypes)) { return IntPraticaLocalServiceUtil.findByNumeroProgetto((java.lang.String)arguments[0]); } - if (_methodName230.equals(name) && - Arrays.deepEquals(_methodParameterTypes230, parameterTypes)) { + if (_methodName232.equals(name) && + Arrays.deepEquals(_methodParameterTypes232, parameterTypes)) { return IntPraticaLocalServiceUtil.findByTerritorioId(((Long)arguments[0]).longValue()); } - if (_methodName231.equals(name) && - Arrays.deepEquals(_methodParameterTypes231, parameterTypes)) { + if (_methodName233.equals(name) && + Arrays.deepEquals(_methodParameterTypes233, parameterTypes)) { return IntPraticaLocalServiceUtil.getOrganizationByIntPraticaId(((Long)arguments[0]).longValue()); } - if (_methodName232.equals(name) && - Arrays.deepEquals(_methodParameterTypes232, parameterTypes)) { + if (_methodName234.equals(name) && + Arrays.deepEquals(_methodParameterTypes234, parameterTypes)) { return IntPraticaLocalServiceUtil.hasRichiestaIntegrazioneAttiva(((Long)arguments[0]).longValue()); } - if (_methodName233.equals(name) && - Arrays.deepEquals(_methodParameterTypes233, parameterTypes)) { + if (_methodName235.equals(name) && + Arrays.deepEquals(_methodParameterTypes235, parameterTypes)) { IntPraticaLocalServiceUtil.invioMailNotifica(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), (java.lang.String)arguments[2], @@ -869,24 +889,24 @@ public class IntPraticaLocalServiceClpInvoker { return null; } - if (_methodName234.equals(name) && - Arrays.deepEquals(_methodParameterTypes234, parameterTypes)) { + if (_methodName236.equals(name) && + Arrays.deepEquals(_methodParameterTypes236, parameterTypes)) { return IntPraticaLocalServiceUtil.searchAltriProgetti((javax.servlet.http.HttpServletRequest)arguments[0], (com.liferay.portal.model.User)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName235.equals(name) && - Arrays.deepEquals(_methodParameterTypes235, parameterTypes)) { + if (_methodName237.equals(name) && + Arrays.deepEquals(_methodParameterTypes237, parameterTypes)) { return IntPraticaLocalServiceUtil.searchArchivioProgetti((javax.servlet.http.HttpServletRequest)arguments[0], (com.liferay.portal.model.User)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName236.equals(name) && - Arrays.deepEquals(_methodParameterTypes236, parameterTypes)) { + if (_methodName238.equals(name) && + Arrays.deepEquals(_methodParameterTypes238, parameterTypes)) { return IntPraticaLocalServiceUtil.searchMieiProgetti((javax.servlet.http.HttpServletRequest)arguments[0], (com.liferay.portal.model.User)arguments[1], ((Integer)arguments[2]).intValue(), @@ -954,24 +974,24 @@ public class IntPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes181; private String _methodName182; private String[] _methodParameterTypes182; + private String _methodName183; + private String[] _methodParameterTypes183; private String _methodName184; private String[] _methodParameterTypes184; - private String _methodName185; - private String[] _methodParameterTypes185; private String _methodName186; private String[] _methodParameterTypes186; private String _methodName187; private String[] _methodParameterTypes187; + private String _methodName188; + private String[] _methodParameterTypes188; private String _methodName189; private String[] _methodParameterTypes189; - private String _methodName190; - private String[] _methodParameterTypes190; private String _methodName191; private String[] _methodParameterTypes191; + private String _methodName192; + private String[] _methodParameterTypes192; private String _methodName193; private String[] _methodParameterTypes193; - private String _methodName194; - private String[] _methodParameterTypes194; private String _methodName195; private String[] _methodParameterTypes195; private String _methodName196; @@ -986,22 +1006,22 @@ public class IntPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes200; private String _methodName201; private String[] _methodParameterTypes201; + private String _methodName202; + private String[] _methodParameterTypes202; private String _methodName203; private String[] _methodParameterTypes203; - private String _methodName204; - private String[] _methodParameterTypes204; + private String _methodName205; + private String[] _methodParameterTypes205; private String _methodName206; private String[] _methodParameterTypes206; - private String _methodName207; - private String[] _methodParameterTypes207; + private String _methodName208; + private String[] _methodParameterTypes208; private String _methodName209; private String[] _methodParameterTypes209; - private String _methodName210; - private String[] _methodParameterTypes210; + private String _methodName211; + private String[] _methodParameterTypes211; private String _methodName212; private String[] _methodParameterTypes212; - private String _methodName213; - private String[] _methodParameterTypes213; private String _methodName214; private String[] _methodParameterTypes214; private String _methodName215; @@ -1048,4 +1068,8 @@ public class IntPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes235; private String _methodName236; private String[] _methodParameterTypes236; + private String _methodName237; + private String[] _methodParameterTypes237; + private String _methodName238; + private String[] _methodParameterTypes238; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java index 9f5df4da..a985902c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java @@ -219,6 +219,18 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { return intPratica; } + @Override + public List findByStatoPratica(String statoPratica) throws SystemException { + + return intPraticaPersistence.findByStatoPratica(statoPratica); + } + + @Override + public List findByStatoPratica(String statoPratica, int start, int end) throws SystemException { + + return intPraticaPersistence.findByStatoPratica(statoPratica, start, end); + } + @Override public IntPratica deleteIntPratica(IntPratica intPratica, boolean forced) throws SystemException, PortalException { if (intPratica.getStatus() == WorkflowConstants.STATUS_ANY || forced) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java index e635bdc5..95eb6aba 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java @@ -279,16 +279,16 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase private DynamicQuery dqInCorso() { DynamicQuery query = dynamicQuery(); - Junction assegnataNonApprovata = RestrictionsFactoryUtil.conjunction(); - assegnataNonApprovata.add(RestrictionsFactoryUtil.ne("unitaOperativa", 0)); - assegnataNonApprovata.add(RestrictionsFactoryUtil.isNotNull("dtAssegnazione")); - assegnataNonApprovata.add(RestrictionsFactoryUtil.isNull("dtApprovazione")); - Disjunction nonEspressoONonApprovato = RestrictionsFactoryUtil.disjunction(); - nonEspressoONonApprovato.add(assegnataNonApprovata); - // I pareri richiesti prima dell'aggiornamento hanno unitaOperativa = 0 - nonEspressoONonApprovato.add(RestrictionsFactoryUtil.eq("unitaOperativa", 0)); - query.add(nonEspressoONonApprovato); - query.add(RestrictionsFactoryUtil.isNull("dtCompilazione")); + Disjunction or = RestrictionsFactoryUtil.disjunction(); + Junction and = RestrictionsFactoryUtil.conjunction(); + and.add(RestrictionsFactoryUtil.eq("assegnatoreUserId", 0L)); + and.add(RestrictionsFactoryUtil.isNull("dtCompilazione")); + or.add(and); + and = RestrictionsFactoryUtil.conjunction(); + and.add(RestrictionsFactoryUtil.ne("assegnatoreUserId", 0L)); + and.add(RestrictionsFactoryUtil.isNull("dtApprovazione")); + or.add(and); + query.add(or); query.add(RestrictionsFactoryUtil.isNull("dtAnnullamento")); return query; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java index 5bd3b3e8..2a9673dd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java @@ -3953,6 +3953,548 @@ public class IntPraticaPersistenceImpl extends BasePersistenceImpl private static final String _FINDER_COLUMN_P_STATUS_2 = "intPratica.status = ? AND "; private static final String _FINDER_COLUMN_P_DTPRATICA_1 = "intPratica.dtPratica IS NULL"; private static final String _FINDER_COLUMN_P_DTPRATICA_2 = "intPratica.dtPratica = ?"; + public static final FinderPath FINDER_PATH_WITH_PAGINATION_FIND_BY_STATOPRATICA = + new FinderPath(IntPraticaModelImpl.ENTITY_CACHE_ENABLED, + IntPraticaModelImpl.FINDER_CACHE_ENABLED, IntPraticaImpl.class, + FINDER_CLASS_NAME_LIST_WITH_PAGINATION, "findByStatoPratica", + new String[] { + String.class.getName(), + + Integer.class.getName(), Integer.class.getName(), + OrderByComparator.class.getName() + }); + public static final FinderPath FINDER_PATH_WITHOUT_PAGINATION_FIND_BY_STATOPRATICA = + new FinderPath(IntPraticaModelImpl.ENTITY_CACHE_ENABLED, + IntPraticaModelImpl.FINDER_CACHE_ENABLED, IntPraticaImpl.class, + FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION, "findByStatoPratica", + new String[] { String.class.getName() }, + IntPraticaModelImpl.STATOPRATICA_COLUMN_BITMASK); + public static final FinderPath FINDER_PATH_COUNT_BY_STATOPRATICA = new FinderPath(IntPraticaModelImpl.ENTITY_CACHE_ENABLED, + IntPraticaModelImpl.FINDER_CACHE_ENABLED, Long.class, + FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION, "countByStatoPratica", + new String[] { String.class.getName() }); + + /** + * Returns all the int praticas where statoPratica = ?. + * + * @param statoPratica the stato pratica + * @return the matching int praticas + * @throws SystemException if a system exception occurred + */ + @Override + public List findByStatoPratica(String statoPratica) + throws SystemException { + return findByStatoPratica(statoPratica, QueryUtil.ALL_POS, + QueryUtil.ALL_POS, null); + } + + /** + * Returns a range of all the int praticas where statoPratica = ?. + * + *

+ * Useful when paginating results. Returns a maximum of end - start instances. start and end are not primary keys, they are indexes in the result set. Thus, 0 refers to the first result in the set. Setting both start and end to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If orderByComparator is specified, then the query will include the given ORDER BY logic. If orderByComparator is absent and pagination is required (start and end are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl}. If both orderByComparator and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order. + *

+ * + * @param statoPratica the stato pratica + * @param start the lower bound of the range of int praticas + * @param end the upper bound of the range of int praticas (not inclusive) + * @return the range of matching int praticas + * @throws SystemException if a system exception occurred + */ + @Override + public List findByStatoPratica(String statoPratica, int start, + int end) throws SystemException { + return findByStatoPratica(statoPratica, start, end, null); + } + + /** + * Returns an ordered range of all the int praticas where statoPratica = ?. + * + *

+ * Useful when paginating results. Returns a maximum of end - start instances. start and end are not primary keys, they are indexes in the result set. Thus, 0 refers to the first result in the set. Setting both start and end to {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS} will return the full result set. If orderByComparator is specified, then the query will include the given ORDER BY logic. If orderByComparator is absent and pagination is required (start and end are not {@link com.liferay.portal.kernel.dao.orm.QueryUtil#ALL_POS}), then the query will include the default ORDER BY logic from {@link it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl}. If both orderByComparator and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order. + *

+ * + * @param statoPratica the stato pratica + * @param start the lower bound of the range of int praticas + * @param end the upper bound of the range of int praticas (not inclusive) + * @param orderByComparator the comparator to order the results by (optionally null) + * @return the ordered range of matching int praticas + * @throws SystemException if a system exception occurred + */ + @Override + public List findByStatoPratica(String statoPratica, int start, + int end, OrderByComparator orderByComparator) throws SystemException { + boolean pagination = true; + FinderPath finderPath = null; + Object[] finderArgs = null; + + if ((start == QueryUtil.ALL_POS) && (end == QueryUtil.ALL_POS) && + (orderByComparator == null)) { + pagination = false; + finderPath = FINDER_PATH_WITHOUT_PAGINATION_FIND_BY_STATOPRATICA; + finderArgs = new Object[] { statoPratica }; + } + else { + finderPath = FINDER_PATH_WITH_PAGINATION_FIND_BY_STATOPRATICA; + finderArgs = new Object[] { + statoPratica, + + start, end, orderByComparator + }; + } + + List list = (List)FinderCacheUtil.getResult(finderPath, + finderArgs, this); + + if ((list != null) && !list.isEmpty()) { + for (IntPratica intPratica : list) { + if (!Validator.equals(statoPratica, intPratica.getStatoPratica())) { + list = null; + + break; + } + } + } + + if (list == null) { + StringBundler query = null; + + if (orderByComparator != null) { + query = new StringBundler(3 + + (orderByComparator.getOrderByFields().length * 3)); + } + else { + query = new StringBundler(3); + } + + query.append(_SQL_SELECT_INTPRATICA_WHERE); + + boolean bindStatoPratica = false; + + if (statoPratica == null) { + query.append(_FINDER_COLUMN_STATOPRATICA_STATOPRATICA_1); + } + else if (statoPratica.equals(StringPool.BLANK)) { + query.append(_FINDER_COLUMN_STATOPRATICA_STATOPRATICA_3); + } + else { + bindStatoPratica = true; + + query.append(_FINDER_COLUMN_STATOPRATICA_STATOPRATICA_2); + } + + if (orderByComparator != null) { + appendOrderByComparator(query, _ORDER_BY_ENTITY_ALIAS, + orderByComparator); + } + else + if (pagination) { + query.append(IntPraticaModelImpl.ORDER_BY_JPQL); + } + + String sql = query.toString(); + + Session session = null; + + try { + session = openSession(); + + Query q = session.createQuery(sql); + + QueryPos qPos = QueryPos.getInstance(q); + + if (bindStatoPratica) { + qPos.add(statoPratica); + } + + if (!pagination) { + list = (List)QueryUtil.list(q, getDialect(), + start, end, false); + + Collections.sort(list); + + list = new UnmodifiableList(list); + } + else { + list = (List)QueryUtil.list(q, getDialect(), + start, end); + } + + cacheResult(list); + + FinderCacheUtil.putResult(finderPath, finderArgs, list); + } + catch (Exception e) { + FinderCacheUtil.removeResult(finderPath, finderArgs); + + throw processException(e); + } + finally { + closeSession(session); + } + } + + return list; + } + + /** + * Returns the first int pratica in the ordered set where statoPratica = ?. + * + * @param statoPratica the stato pratica + * @param orderByComparator the comparator to order the set by (optionally null) + * @return the first matching int pratica + * @throws it.tref.liferay.portos.bo.NoSuchIntPraticaException if a matching int pratica could not be found + * @throws SystemException if a system exception occurred + */ + @Override + public IntPratica findByStatoPratica_First(String statoPratica, + OrderByComparator orderByComparator) + throws NoSuchIntPraticaException, SystemException { + IntPratica intPratica = fetchByStatoPratica_First(statoPratica, + orderByComparator); + + if (intPratica != null) { + return intPratica; + } + + StringBundler msg = new StringBundler(4); + + msg.append(_NO_SUCH_ENTITY_WITH_KEY); + + msg.append("statoPratica="); + msg.append(statoPratica); + + msg.append(StringPool.CLOSE_CURLY_BRACE); + + throw new NoSuchIntPraticaException(msg.toString()); + } + + /** + * Returns the first int pratica in the ordered set where statoPratica = ?. + * + * @param statoPratica the stato pratica + * @param orderByComparator the comparator to order the set by (optionally null) + * @return the first matching int pratica, or null if a matching int pratica could not be found + * @throws SystemException if a system exception occurred + */ + @Override + public IntPratica fetchByStatoPratica_First(String statoPratica, + OrderByComparator orderByComparator) throws SystemException { + List list = findByStatoPratica(statoPratica, 0, 1, + orderByComparator); + + if (!list.isEmpty()) { + return list.get(0); + } + + return null; + } + + /** + * Returns the last int pratica in the ordered set where statoPratica = ?. + * + * @param statoPratica the stato pratica + * @param orderByComparator the comparator to order the set by (optionally null) + * @return the last matching int pratica + * @throws it.tref.liferay.portos.bo.NoSuchIntPraticaException if a matching int pratica could not be found + * @throws SystemException if a system exception occurred + */ + @Override + public IntPratica findByStatoPratica_Last(String statoPratica, + OrderByComparator orderByComparator) + throws NoSuchIntPraticaException, SystemException { + IntPratica intPratica = fetchByStatoPratica_Last(statoPratica, + orderByComparator); + + if (intPratica != null) { + return intPratica; + } + + StringBundler msg = new StringBundler(4); + + msg.append(_NO_SUCH_ENTITY_WITH_KEY); + + msg.append("statoPratica="); + msg.append(statoPratica); + + msg.append(StringPool.CLOSE_CURLY_BRACE); + + throw new NoSuchIntPraticaException(msg.toString()); + } + + /** + * Returns the last int pratica in the ordered set where statoPratica = ?. + * + * @param statoPratica the stato pratica + * @param orderByComparator the comparator to order the set by (optionally null) + * @return the last matching int pratica, or null if a matching int pratica could not be found + * @throws SystemException if a system exception occurred + */ + @Override + public IntPratica fetchByStatoPratica_Last(String statoPratica, + OrderByComparator orderByComparator) throws SystemException { + int count = countByStatoPratica(statoPratica); + + if (count == 0) { + return null; + } + + List list = findByStatoPratica(statoPratica, count - 1, + count, orderByComparator); + + if (!list.isEmpty()) { + return list.get(0); + } + + return null; + } + + /** + * Returns the int praticas before and after the current int pratica in the ordered set where statoPratica = ?. + * + * @param intPraticaId the primary key of the current int pratica + * @param statoPratica the stato pratica + * @param orderByComparator the comparator to order the set by (optionally null) + * @return the previous, current, and next int pratica + * @throws it.tref.liferay.portos.bo.NoSuchIntPraticaException if a int pratica with the primary key could not be found + * @throws SystemException if a system exception occurred + */ + @Override + public IntPratica[] findByStatoPratica_PrevAndNext(long intPraticaId, + String statoPratica, OrderByComparator orderByComparator) + throws NoSuchIntPraticaException, SystemException { + IntPratica intPratica = findByPrimaryKey(intPraticaId); + + Session session = null; + + try { + session = openSession(); + + IntPratica[] array = new IntPraticaImpl[3]; + + array[0] = getByStatoPratica_PrevAndNext(session, intPratica, + statoPratica, orderByComparator, true); + + array[1] = intPratica; + + array[2] = getByStatoPratica_PrevAndNext(session, intPratica, + statoPratica, orderByComparator, false); + + return array; + } + catch (Exception e) { + throw processException(e); + } + finally { + closeSession(session); + } + } + + protected IntPratica getByStatoPratica_PrevAndNext(Session session, + IntPratica intPratica, String statoPratica, + OrderByComparator orderByComparator, boolean previous) { + StringBundler query = null; + + if (orderByComparator != null) { + query = new StringBundler(6 + + (orderByComparator.getOrderByFields().length * 6)); + } + else { + query = new StringBundler(3); + } + + query.append(_SQL_SELECT_INTPRATICA_WHERE); + + boolean bindStatoPratica = false; + + if (statoPratica == null) { + query.append(_FINDER_COLUMN_STATOPRATICA_STATOPRATICA_1); + } + else if (statoPratica.equals(StringPool.BLANK)) { + query.append(_FINDER_COLUMN_STATOPRATICA_STATOPRATICA_3); + } + else { + bindStatoPratica = true; + + query.append(_FINDER_COLUMN_STATOPRATICA_STATOPRATICA_2); + } + + if (orderByComparator != null) { + String[] orderByConditionFields = orderByComparator.getOrderByConditionFields(); + + if (orderByConditionFields.length > 0) { + query.append(WHERE_AND); + } + + for (int i = 0; i < orderByConditionFields.length; i++) { + query.append(_ORDER_BY_ENTITY_ALIAS); + query.append(orderByConditionFields[i]); + + if ((i + 1) < orderByConditionFields.length) { + if (orderByComparator.isAscending() ^ previous) { + query.append(WHERE_GREATER_THAN_HAS_NEXT); + } + else { + query.append(WHERE_LESSER_THAN_HAS_NEXT); + } + } + else { + if (orderByComparator.isAscending() ^ previous) { + query.append(WHERE_GREATER_THAN); + } + else { + query.append(WHERE_LESSER_THAN); + } + } + } + + query.append(ORDER_BY_CLAUSE); + + String[] orderByFields = orderByComparator.getOrderByFields(); + + for (int i = 0; i < orderByFields.length; i++) { + query.append(_ORDER_BY_ENTITY_ALIAS); + query.append(orderByFields[i]); + + if ((i + 1) < orderByFields.length) { + if (orderByComparator.isAscending() ^ previous) { + query.append(ORDER_BY_ASC_HAS_NEXT); + } + else { + query.append(ORDER_BY_DESC_HAS_NEXT); + } + } + else { + if (orderByComparator.isAscending() ^ previous) { + query.append(ORDER_BY_ASC); + } + else { + query.append(ORDER_BY_DESC); + } + } + } + } + else { + query.append(IntPraticaModelImpl.ORDER_BY_JPQL); + } + + String sql = query.toString(); + + Query q = session.createQuery(sql); + + q.setFirstResult(0); + q.setMaxResults(2); + + QueryPos qPos = QueryPos.getInstance(q); + + if (bindStatoPratica) { + qPos.add(statoPratica); + } + + if (orderByComparator != null) { + Object[] values = orderByComparator.getOrderByConditionValues(intPratica); + + for (Object value : values) { + qPos.add(value); + } + } + + List list = q.list(); + + if (list.size() == 2) { + return list.get(1); + } + else { + return null; + } + } + + /** + * Removes all the int praticas where statoPratica = ? from the database. + * + * @param statoPratica the stato pratica + * @throws SystemException if a system exception occurred + */ + @Override + public void removeByStatoPratica(String statoPratica) + throws SystemException { + for (IntPratica intPratica : findByStatoPratica(statoPratica, + QueryUtil.ALL_POS, QueryUtil.ALL_POS, null)) { + remove(intPratica); + } + } + + /** + * Returns the number of int praticas where statoPratica = ?. + * + * @param statoPratica the stato pratica + * @return the number of matching int praticas + * @throws SystemException if a system exception occurred + */ + @Override + public int countByStatoPratica(String statoPratica) + throws SystemException { + FinderPath finderPath = FINDER_PATH_COUNT_BY_STATOPRATICA; + + Object[] finderArgs = new Object[] { statoPratica }; + + Long count = (Long)FinderCacheUtil.getResult(finderPath, finderArgs, + this); + + if (count == null) { + StringBundler query = new StringBundler(2); + + query.append(_SQL_COUNT_INTPRATICA_WHERE); + + boolean bindStatoPratica = false; + + if (statoPratica == null) { + query.append(_FINDER_COLUMN_STATOPRATICA_STATOPRATICA_1); + } + else if (statoPratica.equals(StringPool.BLANK)) { + query.append(_FINDER_COLUMN_STATOPRATICA_STATOPRATICA_3); + } + else { + bindStatoPratica = true; + + query.append(_FINDER_COLUMN_STATOPRATICA_STATOPRATICA_2); + } + + String sql = query.toString(); + + Session session = null; + + try { + session = openSession(); + + Query q = session.createQuery(sql); + + QueryPos qPos = QueryPos.getInstance(q); + + if (bindStatoPratica) { + qPos.add(statoPratica); + } + + count = (Long)q.uniqueResult(); + + FinderCacheUtil.putResult(finderPath, finderArgs, count); + } + catch (Exception e) { + FinderCacheUtil.removeResult(finderPath, finderArgs); + + throw processException(e); + } + finally { + closeSession(session); + } + } + + return count.intValue(); + } + + private static final String _FINDER_COLUMN_STATOPRATICA_STATOPRATICA_1 = "intPratica.statoPratica IS NULL"; + private static final String _FINDER_COLUMN_STATOPRATICA_STATOPRATICA_2 = "intPratica.statoPratica = ?"; + private static final String _FINDER_COLUMN_STATOPRATICA_STATOPRATICA_3 = "(intPratica.statoPratica IS NULL OR intPratica.statoPratica = '')"; public IntPraticaPersistenceImpl() { setModelClass(IntPratica.class); @@ -4366,6 +4908,25 @@ public class IntPraticaPersistenceImpl extends BasePersistenceImpl FinderCacheUtil.removeResult(FINDER_PATH_WITHOUT_PAGINATION_FIND_BY_P, args); } + + if ((intPraticaModelImpl.getColumnBitmask() & + FINDER_PATH_WITHOUT_PAGINATION_FIND_BY_STATOPRATICA.getColumnBitmask()) != 0) { + Object[] args = new Object[] { + intPraticaModelImpl.getOriginalStatoPratica() + }; + + FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_STATOPRATICA, + args); + FinderCacheUtil.removeResult(FINDER_PATH_WITHOUT_PAGINATION_FIND_BY_STATOPRATICA, + args); + + args = new Object[] { intPraticaModelImpl.getStatoPratica() }; + + FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_STATOPRATICA, + args); + FinderCacheUtil.removeResult(FINDER_PATH_WITHOUT_PAGINATION_FIND_BY_STATOPRATICA, + args); + } } EntityCacheUtil.putResult(IntPraticaModelImpl.ENTITY_CACHE_ENABLED, 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 50393e18..f125fcb5 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=3608 - build.date=1653567453540 + build.number=3610 + build.date=1655995616028 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp index 3ef7b6d1..7d45b0a2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/asset/controllopratica/full_content.jsp @@ -54,8 +54,8 @@ List pareri = ParereGeologoLocalServiceUtil.findByIntPraticaId(in Unità Operativa: <%= intPratica.getUnitaOperativa() %> - - Tecnico istruttore: <%= tecnicoIstruttore != null ? tecnicoIstruttore.getFullName() - : "Nessun istruttore" %> + Tecnico istruttore: <%= tecnicoIstruttore == null ? "Nessun istruttore" + : Generics.capitalizeFull(tecnicoIstruttore.getFullName()) %>

@@ -82,7 +82,7 @@ List pareri = ParereGeologoLocalServiceUtil.findByIntPraticaId(in User approvatore = parere.getApprovatoreUserId() == 0 ? null : UserLocalServiceUtil.getUser(parere.getApprovatoreUserId()); boolean espresso = Validator.isNotNull(parere.getDtCompilazione()) - && (parere.getUnitaOperativa() == 0 || Validator.isNotNull(parere.getDtApprovazione())); + && (parere.getAssegnatoreUserId() == 0 || Validator.isNotNull(parere.getDtApprovazione())); %>
  • diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/avvisi/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/avvisi/view.jsp index 81e72663..e8f47748 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/avvisi/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/avvisi/view.jsp @@ -9,7 +9,8 @@ <%@ include file="/html/avvisi/init.jsp" %> <% long intPraticaId = ParamUtil.getLong(request, "intPraticaId", 0L); -List avvisi = AvvisoLocalServiceUtil.findByIntPratica(intPraticaId, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); +List avvisi = AvvisoLocalServiceUtil.findByIntPratica(intPraticaId, QueryUtil.ALL_POS, QueryUtil.ALL_POS, + OrderByComparatorFactoryUtil.create(AvvisoImpl.TABLE_NAME, "dtInvio", true)); %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_annulla_ric_geologo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_annulla_ric_geologo.jsp index 459ef6f3..45b3add0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_annulla_ric_geologo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/actions/action_annulla_ric_geologo.jsp @@ -27,8 +27,6 @@ List pareri = ParereGeologoLocalServiceUtil.findByIntPraticaIdInC String fullName; if (parere.getGeologoUserId() != 0) { User geologo = UserLocalServiceUtil.getUser(parere.getGeologoUserId()); - List listaOrganizzazioni = OrganizationLocalServiceUtil - .getUserOrganizations(geologo.getUserId()); fullName = geologo.getFullName(); } else { fullName = "U.O. " + parere.getUnitaOperativa(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/view_columns.jspf b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/view_columns.jspf index abd3ef75..793806ba 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/view_columns.jspf +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestioneattivita/view_columns.jspf @@ -215,7 +215,7 @@ DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntP if (Validator.isNotNull(parere.getDtAnnullamento())) { annullati++; } else if (Validator.isNotNull(parere.getDtCompilazione()) - && (parere.getUnitaOperativa() == 0 || Validator.isNotNull(parere.getDtApprovazione()))) { + && (parere.getAssegnatoreUserId() == 0 || Validator.isNotNull(parere.getDtApprovazione()))) { espressi++; } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare.jsp index 361cbc61..970f7235 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare.jsp @@ -73,6 +73,9 @@ if (Validator.isNotNull(mvcPath)) { + LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica.getTipoProcedura()); } + Territorio territorio = TerritorioLocalServiceUtil.fetchTerritorio(intPratica.getTerritorioId()); + Comune comune = ComuneLocalServiceUtil.fetchComune(territorio.getComuneId()); + Provincia provincia = ProvinciaLocalServiceUtil.findByC_C(comune.getCompanyId(), comune.getCodiceProvincia()); %> - - <%= intPratica.getUnitaOperativa() %> - + + + <% @@ -187,6 +193,9 @@ if (Validator.isNotNull(mvcPath)) { tipoProcedura = LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica .getTipoProcedura()); } + Territorio territorio = TerritorioLocalServiceUtil.fetchTerritorio(intPratica.getTerritorioId()); + Comune comune = ComuneLocalServiceUtil.fetchComune(territorio.getComuneId()); + Provincia provincia = ProvinciaLocalServiceUtil.findByC_C(comune.getCompanyId(), comune.getCodiceProvincia()); %> - - <%= intPratica.getUnitaOperativa() %> - + + + <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare_altri.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare_altri.jsp index f9ebe7c8..3c54a053 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare_altri.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_da_firmare_altri.jsp @@ -65,10 +65,14 @@ for (Organization organization:organizations) { DettPratica dettPratica = DettPraticaLocalServiceUtil.fetchDettPratica(avviso.getClassPk()); IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(avviso.getIntPraticaId()); String tipoProcedura = ""; - if(Validator.isNotNull(intPratica)) - tipoProcedura = LanguageUtil.get(pageContext, "label_procedura_" + intPratica.getTipoProcedura()) + ") " + LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica.getTipoProcedura()); - - + if (Validator.isNotNull(intPratica)) { + tipoProcedura = LanguageUtil.get(pageContext, + "label_procedura_" + intPratica.getTipoProcedura()) + ") " + + LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica.getTipoProcedura()); + } + Territorio territorio = TerritorioLocalServiceUtil.fetchTerritorio(intPratica.getTerritorioId()); + Comune comune = ComuneLocalServiceUtil.fetchComune(territorio.getComuneId()); + Provincia provincia = ProvinciaLocalServiceUtil.findByC_C(comune.getCompanyId(), comune.getCodiceProvincia()); %> @@ -77,14 +81,12 @@ for (Organization organization:organizations) { - - <% long territorioGroupId = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()).getGroupId(); - long organizationId = GroupLocalServiceUtil.getGroup(territorioGroupId).getOrganizationId(); - String genio = OrganizationLocalServiceUtil.getOrganization(organizationId).getName(); - %> - <%=genio %> - - + + + <% String tipoDocumento = PraticaUtil.getStatoPratica(avviso.getTipoDocumento(), diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_firme.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_firme.jsp index 4716a5e8..eb876d7c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_firme.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/gestionefirme/avvisi_firme.jsp @@ -52,6 +52,9 @@ searchURL.setParameter("tabs1", tabs1); if(Validator.isNotNull(intPratica)) tipoProcedura = LanguageUtil.get(pageContext, "label_procedura_" + intPratica.getTipoProcedura()) + ") " + LanguageUtil.get(pageContext, "tipo_procedura_" + intPratica.getTipoProcedura()); + Territorio territorio = TerritorioLocalServiceUtil.fetchTerritorio(intPratica.getTerritorioId()); + Comune comune = ComuneLocalServiceUtil.fetchComune(territorio.getComuneId()); + Provincia provincia = ProvinciaLocalServiceUtil.findByC_C(comune.getCompanyId(), comune.getCodiceProvincia()); %> - - <% long territorioGroupId = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()).getGroupId(); - long organizationId = GroupLocalServiceUtil.getGroup(territorioGroupId).getOrganizationId(); - String genio = OrganizationLocalServiceUtil.getOrganization(organizationId).getName(); - %> - <%= genio %> - + + + <% String tipoDocumento = PraticaUtil.getStatoPratica(avviso.getTipoDocumento(), diff --git a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/service.properties index 56aced8c..6ee3fbbd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_calendar_appointments - build.number=177 - build.date=1632921903647 + build.number=178 + build.date=1655995359988 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp index cbce2ff8..afc957e2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/domanda/page_dettagli_principali.jsp @@ -800,14 +800,14 @@ $('#tc-intervento-opere-escavazioneCheckbox').change(functio } }); -$('#tc-manut-ord-straordCheckbox, #tc-nuova-costruzione-pertinenzaCheckbox').change(function () { +/* $('#tc-manut-ord-straordCheckbox, #tc-nuova-costruzione-pertinenzaCheckbox').change(function () { var _this = $(this); if (_this.is(":checked")) { enableDisableChk('#tc-no-opere-escavazioneCheckbox', 'enable', true); } else { enableDisableChk('#tc-no-opere-escavazioneCheckbox', 'not_enable', false); } -}); +}); */ $('#normEsenteBolloCheckbox').change(function () { var _this = $(this); @@ -873,9 +873,11 @@ function enableDisableChk(obj, action, disable) { if (disable) { $(obj).attr("disabled", true); $(obj).prop("disabled", true); + $(obj).addClass('disabled'); } else { $(obj).attr("disabled", false); $(obj).prop("disabled", false); + $(obj).removeClass('disabled'); } } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/actions/assegna_parere.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/actions/assegna_parere.jsp index 96eef19c..e0f2c399 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/actions/assegna_parere.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/actions/assegna_parere.jsp @@ -21,7 +21,7 @@ String contentDiv = "divIdAssegnaParere_" + parereId;
    - <%= LanguageUtil.get(pageContext, "note-approvatore") %> + <%= LanguageUtil.get(pageContext, "note-richiedente") %> <%= Generics.capitalizeFull(parere.getUserName()) %>: <%= HtmlUtil.escape(parere.getNoteRichiedente()) %>

    diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/pareridacompletare.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/pareridacompletare.jsp index b32908c0..97589d48 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/pareridacompletare.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/pareregeologo/pareridacompletare.jsp @@ -23,10 +23,9 @@ <% List lista = ParereGeologoLocalServiceUtil.findByGeologoIdInCorso(user.getUserId(), searchContainer.getStart(), searchContainer.getEnd()); - int totale = ParereGeologoLocalServiceUtil.countByGeologoIdInCorso(user.getUserId()); - searchContainer.setTotal(totale); + searchContainer.setTotal(countDaEsprimere); pageContext.setAttribute("results", lista); - pageContext.setAttribute("total", totale); + pageContext.setAttribute("total", countDaEsprimere); %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/edit_soggetto.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/edit_soggetto.jsp index a1559fa3..7fa1bc9e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/edit_soggetto.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/soggettipratica/edit_soggetto.jsp @@ -1285,9 +1285,11 @@ Liferay.provide(window, 'aggiornaForm', function () { } var el = $('#codiceFiscalePersone'); if (value == titolare) { - cf_precedente = el.val(); - el.attr('readonly', 'readonly'); - el.val(cf_titolare); + if (<%= !disabledInput %>) { + cf_precedente = el.val(); + el.attr('readonly', 'readonly'); + el.val(cf_titolare); + } } else { el.removeAttr('readonly'); el.val(cf_precedente);