diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/util-java.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/util-java.jar deleted file mode 100644 index 6b5d95f8..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/util-java.jar and /dev/null differ 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 ca03c280..a8035643 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 @@ -358,6 +358,9 @@ public interface IntPraticaLocalService extends BaseLocalService, public java.util.List svuotaDatabase( com.liferay.portal.service.ServiceContext serviceContext); + public java.util.List svuotaDatabase2( + com.liferay.portal.service.ServiceContext serviceContext); + public void clearDb() throws java.lang.Exception; public it.tref.liferay.portos.bo.model.IntPratica deleteIntPratica( 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 b1a50f05..42c4fec8 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 @@ -161,309 +161,315 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { "com.liferay.portal.service.ServiceContext" }; - _methodName28 = "clearDb"; + _methodName28 = "svuotaDatabase2"; - _methodParameterTypes28 = new String[] { }; + _methodParameterTypes28 = new String[] { + "com.liferay.portal.service.ServiceContext" + }; + + _methodName29 = "clearDb"; - _methodName29 = "deleteIntPratica"; + _methodParameterTypes29 = new String[] { }; - _methodParameterTypes29 = new String[] { + _methodName30 = "deleteIntPratica"; + + _methodParameterTypes30 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "boolean" }; - _methodName30 = "cloneIntPratica"; + _methodName31 = "cloneIntPratica"; - _methodParameterTypes30 = new String[] { + _methodParameterTypes31 = new String[] { "long", "com.liferay.portal.service.ServiceContext" }; - _methodName31 = "updateDelegati"; + _methodName32 = "updateDelegati"; - _methodParameterTypes31 = new String[] { + _methodParameterTypes32 = new String[] { "long", "java.lang.String", "java.lang.String", "boolean" }; - _methodName32 = "findFascicoliNotProgetto"; + _methodName33 = "findFascicoliNotProgetto"; - _methodParameterTypes32 = new String[] { "int", "int" }; + _methodParameterTypes33 = new String[] { "int", "int" }; - _methodName33 = "countFascicoliNotProgetto"; + _methodName34 = "countFascicoliNotProgetto"; - _methodParameterTypes33 = new String[] { }; + _methodParameterTypes34 = new String[] { }; - _methodName34 = "addNumeroProgetto"; + _methodName35 = "addNumeroProgetto"; - _methodParameterTypes34 = new String[] { "long" }; + _methodParameterTypes35 = new String[] { "long" }; - _methodName35 = "sospendiPratica"; + _methodName36 = "sospendiPratica"; - _methodParameterTypes35 = new String[] { "long", "boolean" }; + _methodParameterTypes36 = new String[] { "long", "boolean" }; - _methodName36 = "cambiaTitolare"; + _methodName37 = "cambiaTitolare"; - _methodParameterTypes36 = new String[] { + _methodParameterTypes37 = new String[] { "long", "long", "com.liferay.portal.service.ServiceContext" }; - _methodName37 = "updateStatoPratica"; + _methodName38 = "updateStatoPratica"; - _methodParameterTypes37 = new String[] { + _methodParameterTypes38 = new String[] { "long", "long", "java.lang.String" }; - _methodName38 = "updateIntPraticaSorteggio"; + _methodName39 = "updateIntPraticaSorteggio"; - _methodParameterTypes38 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes39 = new String[] { "long", "java.util.Date" }; - _methodName39 = "updateIntPraticaSorteggio"; + _methodName40 = "updateIntPraticaSorteggio"; - _methodParameterTypes39 = new String[] { + _methodParameterTypes40 = new String[] { "long", "java.util.Date", "java.lang.String" }; - _methodName40 = "findByC_UserId"; - - _methodParameterTypes40 = new String[] { "long", "long", "int", "int" }; + _methodName41 = "findByC_UserId"; - _methodName41 = "countByC_UserId"; + _methodParameterTypes41 = new String[] { "long", "long", "int", "int" }; - _methodParameterTypes41 = new String[] { "long", "long" }; + _methodName42 = "countByC_UserId"; - _methodName42 = "fetchByOldIntPraticaId"; + _methodParameterTypes42 = new String[] { "long", "long" }; - _methodParameterTypes42 = new String[] { "long" }; + _methodName43 = "fetchByOldIntPraticaId"; - _methodName43 = "updateStatus"; + _methodParameterTypes43 = new String[] { "long" }; - _methodParameterTypes43 = new String[] { "long", "int" }; + _methodName44 = "updateStatus"; - _methodName44 = "findByCompanyIdSoggettoProgetti"; + _methodParameterTypes44 = new String[] { "long", "int" }; - _methodParameterTypes44 = new String[] { "long", "long" }; - - _methodName45 = "countByCompanyIdSoggettoProgetti"; + _methodName45 = "findByCompanyIdSoggettoProgetti"; _methodParameterTypes45 = new String[] { "long", "long" }; - _methodName46 = "findByCompanyIdSoggettoArchivio"; + _methodName46 = "countByCompanyIdSoggettoProgetti"; _methodParameterTypes46 = new String[] { "long", "long" }; - _methodName47 = "countByCompanyIdSoggettoArchivio"; + _methodName47 = "findByCompanyIdSoggettoArchivio"; _methodParameterTypes47 = new String[] { "long", "long" }; - _methodName48 = "findByCompanyIdSoggettoAltriProgetti"; + _methodName48 = "countByCompanyIdSoggettoArchivio"; + + _methodParameterTypes48 = new String[] { "long", "long" }; - _methodParameterTypes48 = new String[] { "long", "long", "int", "int" }; + _methodName49 = "findByCompanyIdSoggettoAltriProgetti"; - _methodName49 = "countByCompanyIdSoggettoAltriProgetti"; + _methodParameterTypes49 = new String[] { "long", "long", "int", "int" }; - _methodParameterTypes49 = new String[] { "long", "long" }; + _methodName50 = "countByCompanyIdSoggettoAltriProgetti"; - _methodName50 = "findByCanAddFineLavori"; + _methodParameterTypes50 = new String[] { "long", "long" }; - _methodParameterTypes50 = new String[] { + _methodName51 = "findByCanAddFineLavori"; + + _methodParameterTypes51 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName51 = "countByCanAddFineLavori"; + _methodName52 = "countByCanAddFineLavori"; - _methodParameterTypes51 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes52 = new String[] { "long", "java.lang.String" }; - _methodName52 = "findByCanAddCollaudo"; + _methodName53 = "findByCanAddCollaudo"; - _methodParameterTypes52 = new String[] { + _methodParameterTypes53 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName53 = "countByCanAddCollaudo"; + _methodName54 = "countByCanAddCollaudo"; - _methodParameterTypes53 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes54 = new String[] { "long", "java.lang.String" }; - _methodName54 = "search"; + _methodName55 = "search"; - _methodParameterTypes54 = new String[] { "java.util.List", "int", "int" }; + _methodParameterTypes55 = new String[] { "java.util.List", "int", "int" }; - _methodName55 = "countSearch"; + _methodName56 = "countSearch"; - _methodParameterTypes55 = new String[] { "java.util.List" }; + _methodParameterTypes56 = new String[] { "java.util.List" }; - _methodName56 = "searchWithIntPraticaId"; + _methodName57 = "searchWithIntPraticaId"; - _methodParameterTypes56 = new String[] { + _methodParameterTypes57 = new String[] { "java.util.List", "long", "int", "int" }; - _methodName57 = "countSearchWithIntPraticaId"; + _methodName58 = "countSearchWithIntPraticaId"; - _methodParameterTypes57 = new String[] { "java.util.List", "long" }; + _methodParameterTypes58 = new String[] { "java.util.List", "long" }; - _methodName58 = "allegaFileAnnullamento"; + _methodName59 = "allegaFileAnnullamento"; - _methodParameterTypes58 = new String[] { + _methodParameterTypes59 = new String[] { "long", "byte[][]", "java.lang.String", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName59 = "generateFileAnnullamento"; + _methodName60 = "generateFileAnnullamento"; - _methodParameterTypes59 = new String[] { + _methodParameterTypes60 = new String[] { "long", "com.liferay.portal.service.ServiceContext" }; - _methodName60 = "deleteFileAnnullamento"; + _methodName61 = "deleteFileAnnullamento"; - _methodParameterTypes60 = new String[] { "long" }; + _methodParameterTypes61 = new String[] { "long" }; - _methodName61 = "completeAnnullamento"; + _methodName62 = "completeAnnullamento"; - _methodParameterTypes61 = new String[] { "long" }; + _methodParameterTypes62 = new String[] { "long" }; - _methodName62 = "cambiaIstruttore"; + _methodName63 = "cambiaIstruttore"; - _methodParameterTypes62 = new String[] { "long", "long", "long" }; + _methodParameterTypes63 = new String[] { "long", "long", "long" }; - _methodName63 = "countCaricoLavoroCF"; + _methodName64 = "countCaricoLavoroCF"; - _methodParameterTypes63 = new String[] { + _methodParameterTypes64 = new String[] { "long", "java.lang.String", "java.lang.Boolean", "java.lang.Long[][]" }; - _methodName64 = "countCaricoLavoroIstruttore"; + _methodName65 = "countCaricoLavoroIstruttore"; - _methodParameterTypes64 = new String[] { + _methodParameterTypes65 = new String[] { "long", "java.lang.String", "java.lang.Boolean" }; - _methodName65 = "generateReportPratica"; + _methodName66 = "generateReportPratica"; - _methodParameterTypes65 = new String[] { + _methodParameterTypes66 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName66 = "updateModifiedDate"; + _methodName67 = "updateModifiedDate"; - _methodParameterTypes66 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes67 = new String[] { "long", "java.util.Date" }; - _methodName67 = "countAutorizzazione"; + _methodName68 = "countAutorizzazione"; - _methodParameterTypes67 = new String[] { + _methodParameterTypes68 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName68 = "countSanatorie"; + _methodName69 = "countSanatorie"; - _methodParameterTypes68 = new String[] { + _methodParameterTypes69 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName69 = "countOpereMinoreImportanza"; + _methodName70 = "countOpereMinoreImportanza"; - _methodParameterTypes69 = new String[] { + _methodParameterTypes70 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName70 = "countDeposito"; + _methodName71 = "countDeposito"; - _methodParameterTypes70 = new String[] { + _methodParameterTypes71 = new String[] { "java.util.Date", "java.util.Date", "long", "boolean" }; - _methodName71 = "countVidimate"; + _methodName72 = "countVidimate"; - _methodParameterTypes71 = new String[] { + _methodParameterTypes72 = new String[] { "java.util.Date", "java.util.Date", "long", "java.lang.String", "boolean" }; - _methodName72 = "countControllo"; + _methodName73 = "countControllo"; - _methodParameterTypes72 = new String[] { + _methodParameterTypes73 = new String[] { "java.util.Date", "java.util.Date", "long", "java.lang.String", "boolean" }; - _methodName73 = "importaVecchiFilesFascicolo"; + _methodName74 = "importaVecchiFilesFascicolo"; - _methodParameterTypes73 = new String[] { "long", "int", "int" }; + _methodParameterTypes74 = new String[] { "long", "int", "int" }; - _methodName74 = "findIntPraticaNotExist"; + _methodName75 = "findIntPraticaNotExist"; - _methodParameterTypes74 = new String[] { }; + _methodParameterTypes75 = new String[] { }; - _methodName75 = "riparaWorkflow"; + _methodName76 = "riparaWorkflow"; - _methodParameterTypes75 = new String[] { }; + _methodParameterTypes76 = new String[] { }; - _methodName76 = "reIndexFascicolo"; + _methodName77 = "reIndexFascicolo"; - _methodParameterTypes76 = new String[] { + _methodParameterTypes77 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName77 = "reIndexFasciolo"; - - _methodParameterTypes77 = new String[] { "java.lang.String", "long" }; - _methodName78 = "reIndexFasciolo"; - _methodParameterTypes78 = new String[] { "long", "long" }; + _methodParameterTypes78 = new String[] { "java.lang.String", "long" }; - _methodName79 = "trovaDoppioni"; + _methodName79 = "reIndexFasciolo"; - _methodParameterTypes79 = new String[] { }; + _methodParameterTypes79 = new String[] { "long", "long" }; - _methodName80 = "findByNumeroProgetto"; + _methodName80 = "trovaDoppioni"; - _methodParameterTypes80 = new String[] { "java.lang.String" }; + _methodParameterTypes80 = new String[] { }; - _methodName81 = "findByTerritorioId"; + _methodName81 = "findByNumeroProgetto"; - _methodParameterTypes81 = new String[] { "long" }; + _methodParameterTypes81 = new String[] { "java.lang.String" }; - _methodName82 = "reportTempisticheIstruttorieAvvisiAutorizzazioni"; + _methodName82 = "findByTerritorioId"; - _methodParameterTypes82 = new String[] { - "java.util.Date", "java.util.Date", "long", "java.lang.String" - }; + _methodParameterTypes82 = new String[] { "long" }; - _methodName83 = "reportTempisticheIstruttorieCalcolaDataSorteggio"; + _methodName83 = "reportTempisticheIstruttorieAvvisiAutorizzazioni"; _methodParameterTypes83 = new String[] { - "java.util.Date", "java.util.Date", "long" + "java.util.Date", "java.util.Date", "long", "java.lang.String" }; - _methodName84 = "reportPraticheVidimate"; + _methodName84 = "reportTempisticheIstruttorieCalcolaDataSorteggio"; _methodParameterTypes84 = new String[] { - "java.util.Date", "java.util.Date", "long", "java.lang.String" + "java.util.Date", "java.util.Date", "long" }; - _methodName85 = "reportPraticheVidimateCalcolaDataSorteggio"; + _methodName85 = "reportPraticheVidimate"; _methodParameterTypes85 = new String[] { - "java.util.Date", "java.util.Date", "long" + "java.util.Date", "java.util.Date", "long", "java.lang.String" }; - _methodName86 = "countIngressiAutorizzazioni"; + _methodName86 = "reportPraticheVidimateCalcolaDataSorteggio"; _methodParameterTypes86 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName87 = "countIngressiDepositi"; + _methodName87 = "countIngressiAutorizzazioni"; _methodParameterTypes87 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName88 = "countIngressiCO"; + _methodName88 = "countIngressiDepositi"; _methodParameterTypes88 = new String[] { "java.util.Date", "java.util.Date", "long" }; + + _methodName89 = "countIngressiCO"; + + _methodParameterTypes89 = new String[] { + "java.util.Date", "java.util.Date", "long" + }; } @Override @@ -1377,11 +1383,36 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { return (java.util.List)ClpSerializer.translateOutput(returnObj); } + @Override + public java.util.List svuotaDatabase2( + com.liferay.portal.service.ServiceContext serviceContext) { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName28, + _methodParameterTypes28, + new Object[] { ClpSerializer.translateInput(serviceContext) }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(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 void clearDb() throws java.lang.Exception { try { - _invokableLocalService.invokeMethod(_methodName28, - _methodParameterTypes28, new Object[] { }); + _invokableLocalService.invokeMethod(_methodName29, + _methodParameterTypes29, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1408,8 +1439,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName29, - _methodParameterTypes29, + returnObj = _invokableLocalService.invokeMethod(_methodName30, + _methodParameterTypes30, new Object[] { ClpSerializer.translateInput(intPratica), @@ -1448,8 +1479,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName30, - _methodParameterTypes30, + returnObj = _invokableLocalService.invokeMethod(_methodName31, + _methodParameterTypes31, new Object[] { intPraticaId, @@ -1489,8 +1520,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName31, - _methodParameterTypes31, + returnObj = _invokableLocalService.invokeMethod(_methodName32, + _methodParameterTypes32, new Object[] { intPraticaId, @@ -1532,8 +1563,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName32, - _methodParameterTypes32, new Object[] { start, end }); + returnObj = _invokableLocalService.invokeMethod(_methodName33, + _methodParameterTypes33, new Object[] { start, end }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1560,8 +1591,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName33, - _methodParameterTypes33, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName34, + _methodParameterTypes34, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1590,8 +1621,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName34, - _methodParameterTypes34, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName35, + _methodParameterTypes35, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1624,8 +1655,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName35, - _methodParameterTypes35, + returnObj = _invokableLocalService.invokeMethod(_methodName36, + _methodParameterTypes36, new Object[] { intPraticaId, sospesa }); } catch (Throwable t) { @@ -1660,8 +1691,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName36, - _methodParameterTypes36, + returnObj = _invokableLocalService.invokeMethod(_methodName37, + _methodParameterTypes37, new Object[] { intPraticaId, @@ -1701,8 +1732,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName37, - _methodParameterTypes37, + returnObj = _invokableLocalService.invokeMethod(_methodName38, + _methodParameterTypes38, new Object[] { intPraticaId, @@ -1741,8 +1772,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName38, - _methodParameterTypes38, + returnObj = _invokableLocalService.invokeMethod(_methodName39, + _methodParameterTypes39, new Object[] { intPraticaId, @@ -1776,8 +1807,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName39, - _methodParameterTypes39, + returnObj = _invokableLocalService.invokeMethod(_methodName40, + _methodParameterTypes40, new Object[] { intPraticaId, @@ -1812,8 +1843,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName40, - _methodParameterTypes40, + returnObj = _invokableLocalService.invokeMethod(_methodName41, + _methodParameterTypes41, new Object[] { companyId, userId, start, end }); } catch (Throwable t) { @@ -1841,8 +1872,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName41, - _methodParameterTypes41, new Object[] { companyId, userId }); + returnObj = _invokableLocalService.invokeMethod(_methodName42, + _methodParameterTypes42, new Object[] { companyId, userId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1870,8 +1901,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName42, - _methodParameterTypes42, new Object[] { oldIntPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName43, + _methodParameterTypes43, new Object[] { oldIntPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1897,8 +1928,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName43, - _methodParameterTypes43, new Object[] { intPraticaId, status }); + _invokableLocalService.invokeMethod(_methodName44, + _methodParameterTypes44, new Object[] { intPraticaId, status }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1929,8 +1960,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName44, - _methodParameterTypes44, + returnObj = _invokableLocalService.invokeMethod(_methodName45, + _methodParameterTypes45, new Object[] { companyId, soggettoId }); } catch (Throwable t) { @@ -1963,8 +1994,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName45, - _methodParameterTypes45, + returnObj = _invokableLocalService.invokeMethod(_methodName46, + _methodParameterTypes46, new Object[] { companyId, soggettoId }); } catch (Throwable t) { @@ -1998,8 +2029,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName46, - _methodParameterTypes46, + returnObj = _invokableLocalService.invokeMethod(_methodName47, + _methodParameterTypes47, new Object[] { companyId, soggettoId }); } catch (Throwable t) { @@ -2032,8 +2063,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName47, - _methodParameterTypes47, + returnObj = _invokableLocalService.invokeMethod(_methodName48, + _methodParameterTypes48, new Object[] { companyId, soggettoId }); } catch (Throwable t) { @@ -2067,8 +2098,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName48, - _methodParameterTypes48, + returnObj = _invokableLocalService.invokeMethod(_methodName49, + _methodParameterTypes49, new Object[] { companyId, soggettoId, start, end }); } catch (Throwable t) { @@ -2102,8 +2133,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName49, - _methodParameterTypes49, + returnObj = _invokableLocalService.invokeMethod(_methodName50, + _methodParameterTypes50, new Object[] { companyId, soggettoId }); } catch (Throwable t) { @@ -2137,8 +2168,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName50, - _methodParameterTypes50, + returnObj = _invokableLocalService.invokeMethod(_methodName51, + _methodParameterTypes51, new Object[] { companyId, @@ -2180,8 +2211,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName51, - _methodParameterTypes51, + returnObj = _invokableLocalService.invokeMethod(_methodName52, + _methodParameterTypes52, new Object[] { companyId, @@ -2219,8 +2250,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName52, - _methodParameterTypes52, + returnObj = _invokableLocalService.invokeMethod(_methodName53, + _methodParameterTypes53, new Object[] { companyId, @@ -2262,8 +2293,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName53, - _methodParameterTypes53, + returnObj = _invokableLocalService.invokeMethod(_methodName54, + _methodParameterTypes54, new Object[] { companyId, @@ -2300,8 +2331,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName54, - _methodParameterTypes54, + returnObj = _invokableLocalService.invokeMethod(_methodName55, + _methodParameterTypes55, new Object[] { ClpSerializer.translateInput(groupIds), @@ -2335,8 +2366,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName55, - _methodParameterTypes55, + returnObj = _invokableLocalService.invokeMethod(_methodName56, + _methodParameterTypes56, new Object[] { ClpSerializer.translateInput(groupIds) }); } catch (Throwable t) { @@ -2365,8 +2396,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName56, - _methodParameterTypes56, + returnObj = _invokableLocalService.invokeMethod(_methodName57, + _methodParameterTypes57, new Object[] { ClpSerializer.translateInput(groupIds), @@ -2403,8 +2434,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName57, - _methodParameterTypes57, + returnObj = _invokableLocalService.invokeMethod(_methodName58, + _methodParameterTypes58, new Object[] { ClpSerializer.translateInput(groupIds), @@ -2441,8 +2472,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName58, - _methodParameterTypes58, + returnObj = _invokableLocalService.invokeMethod(_methodName59, + _methodParameterTypes59, new Object[] { intPraticaId, @@ -2492,8 +2523,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName59, - _methodParameterTypes59, + returnObj = _invokableLocalService.invokeMethod(_methodName60, + _methodParameterTypes60, new Object[] { intPraticaId, @@ -2532,8 +2563,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName60, - _methodParameterTypes60, + _invokableLocalService.invokeMethod(_methodName61, + _methodParameterTypes61, new Object[] { docPraticaAnnullamentoId }); } catch (Throwable t) { @@ -2562,8 +2593,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName61, - _methodParameterTypes61, new Object[] { intPraticaId }); + _invokableLocalService.invokeMethod(_methodName62, + _methodParameterTypes62, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2592,8 +2623,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName62, - _methodParameterTypes62, + _invokableLocalService.invokeMethod(_methodName63, + _methodParameterTypes63, new Object[] { intPraticaId, controlloPraticaId, istruttoreId }); } catch (Throwable t) { @@ -2626,8 +2657,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName63, - _methodParameterTypes63, + returnObj = _invokableLocalService.invokeMethod(_methodName64, + _methodParameterTypes64, new Object[] { ispettoreId, @@ -2668,8 +2699,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName64, - _methodParameterTypes64, + returnObj = _invokableLocalService.invokeMethod(_methodName65, + _methodParameterTypes65, new Object[] { ispettoreId, @@ -2705,8 +2736,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName65, - _methodParameterTypes65, + returnObj = _invokableLocalService.invokeMethod(_methodName66, + _methodParameterTypes66, new Object[] { ClpSerializer.translateInput(intPratica), @@ -2744,8 +2775,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName66, - _methodParameterTypes66, + returnObj = _invokableLocalService.invokeMethod(_methodName67, + _methodParameterTypes67, new Object[] { intPraticaId, @@ -2782,8 +2813,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName67, - _methodParameterTypes67, + returnObj = _invokableLocalService.invokeMethod(_methodName68, + _methodParameterTypes68, new Object[] { ClpSerializer.translateInput(dtMin), @@ -2818,8 +2849,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName68, - _methodParameterTypes68, + returnObj = _invokableLocalService.invokeMethod(_methodName69, + _methodParameterTypes69, new Object[] { ClpSerializer.translateInput(dtMin), @@ -2854,8 +2885,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName69, - _methodParameterTypes69, + returnObj = _invokableLocalService.invokeMethod(_methodName70, + _methodParameterTypes70, new Object[] { ClpSerializer.translateInput(dtMin), @@ -2890,8 +2921,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName70, - _methodParameterTypes70, + returnObj = _invokableLocalService.invokeMethod(_methodName71, + _methodParameterTypes71, new Object[] { ClpSerializer.translateInput(dtMin), @@ -2928,8 +2959,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName71, - _methodParameterTypes71, + returnObj = _invokableLocalService.invokeMethod(_methodName72, + _methodParameterTypes72, new Object[] { ClpSerializer.translateInput(dtMin), @@ -2969,8 +3000,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName72, - _methodParameterTypes72, + returnObj = _invokableLocalService.invokeMethod(_methodName73, + _methodParameterTypes73, new Object[] { ClpSerializer.translateInput(dtMin), @@ -3009,8 +3040,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName73, - _methodParameterTypes73, + returnObj = _invokableLocalService.invokeMethod(_methodName74, + _methodParameterTypes74, new Object[] { companyId, start, end }); } catch (Throwable t) { @@ -3038,8 +3069,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName74, - _methodParameterTypes74, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName75, + _methodParameterTypes75, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -3066,8 +3097,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName75, - _methodParameterTypes75, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName76, + _methodParameterTypes76, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -3092,8 +3123,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { public void reIndexFascicolo( it.tref.liferay.portos.bo.model.IntPratica intPratica, long companyId) { try { - _invokableLocalService.invokeMethod(_methodName76, - _methodParameterTypes76, + _invokableLocalService.invokeMethod(_methodName77, + _methodParameterTypes77, new Object[] { ClpSerializer.translateInput(intPratica), companyId }); } catch (Throwable t) { @@ -3113,8 +3144,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(_methodName77, - _methodParameterTypes77, + _invokableLocalService.invokeMethod(_methodName78, + _methodParameterTypes78, new Object[] { ClpSerializer.translateInput(numeroProgetto), @@ -3143,8 +3174,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName78, - _methodParameterTypes78, + _invokableLocalService.invokeMethod(_methodName79, + _methodParameterTypes79, new Object[] { intPraticaId, companyId }); } catch (Throwable t) { @@ -3174,8 +3205,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName79, - _methodParameterTypes79, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName80, + _methodParameterTypes80, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -3203,8 +3234,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName80, - _methodParameterTypes80, + returnObj = _invokableLocalService.invokeMethod(_methodName81, + _methodParameterTypes81, new Object[] { ClpSerializer.translateInput(numeroProgetto) }); } catch (Throwable t) { @@ -3233,8 +3264,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName81, - _methodParameterTypes81, new Object[] { territorioId }); + returnObj = _invokableLocalService.invokeMethod(_methodName82, + _methodParameterTypes82, new Object[] { territorioId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -3263,8 +3294,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName82, - _methodParameterTypes82, + returnObj = _invokableLocalService.invokeMethod(_methodName83, + _methodParameterTypes83, new Object[] { ClpSerializer.translateInput(dtMin), @@ -3301,8 +3332,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName83, - _methodParameterTypes83, + returnObj = _invokableLocalService.invokeMethod(_methodName84, + _methodParameterTypes84, new Object[] { ClpSerializer.translateInput(dtMin), @@ -3338,8 +3369,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName84, - _methodParameterTypes84, + returnObj = _invokableLocalService.invokeMethod(_methodName85, + _methodParameterTypes85, new Object[] { ClpSerializer.translateInput(dtMin), @@ -3376,8 +3407,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName85, - _methodParameterTypes85, + returnObj = _invokableLocalService.invokeMethod(_methodName86, + _methodParameterTypes86, new Object[] { ClpSerializer.translateInput(dtMin), @@ -3412,8 +3443,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName86, - _methodParameterTypes86, + returnObj = _invokableLocalService.invokeMethod(_methodName87, + _methodParameterTypes87, new Object[] { ClpSerializer.translateInput(dtMin), @@ -3448,8 +3479,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName87, - _methodParameterTypes87, + returnObj = _invokableLocalService.invokeMethod(_methodName88, + _methodParameterTypes88, new Object[] { ClpSerializer.translateInput(dtMin), @@ -3484,8 +3515,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName88, - _methodParameterTypes88, + returnObj = _invokableLocalService.invokeMethod(_methodName89, + _methodParameterTypes89, new Object[] { ClpSerializer.translateInput(dtMin), @@ -3690,4 +3721,6 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { private String[] _methodParameterTypes87; private String _methodName88; private String[] _methodParameterTypes88; + private String _methodName89; + private String[] _methodParameterTypes89; } \ 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 3174e6f6..88fc18b8 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 @@ -397,6 +397,11 @@ public class IntPraticaLocalServiceUtil { return getService().svuotaDatabase(serviceContext); } + public static java.util.List svuotaDatabase2( + com.liferay.portal.service.ServiceContext serviceContext) { + return getService().svuotaDatabase2(serviceContext); + } + public static void clearDb() throws java.lang.Exception { getService().clearDb(); } 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 ee1f148d..106f2d1c 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 @@ -423,6 +423,12 @@ public class IntPraticaLocalServiceWrapper implements IntPraticaLocalService, return _intPraticaLocalService.svuotaDatabase(serviceContext); } + @Override + public java.util.List svuotaDatabase2( + com.liferay.portal.service.ServiceContext serviceContext) { + return _intPraticaLocalService.svuotaDatabase2(serviceContext); + } + @Override public void clearDb() throws java.lang.Exception { _intPraticaLocalService.clearDb(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AsseverazioniUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AsseverazioniUtil.java index b5fb9016..fb4185ca 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AsseverazioniUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AsseverazioniUtil.java @@ -12,7 +12,6 @@ import it.tref.liferay.portos.bo.service.DettPraticaServiceUtil; import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil; import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; -import it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil; import it.tref.liferay.portos.bo.shared.util.GenericUtils; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; @@ -25,8 +24,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import org.apache.commons.lang.ArrayUtils; - import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; @@ -114,23 +111,12 @@ public class AsseverazioniUtil { Arrays.asList(TipoSoggettoUtil.PROGETTISTA, TipoSoggettoUtil.DIRETTORE_LAVORI)); aMap.put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A04, Arrays.asList(TipoSoggettoUtil.PROGETTISTA, TipoSoggettoUtil.DIRETTORE_LAVORI)); - // aMap.put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A06, - // Arrays.asList(TipoSoggettoUtil.PROGETTISTA, - // TipoSoggettoUtil.DIRETTORE_LAVORI)); - aMap.put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A07, - Arrays.asList(TipoSoggettoUtil.PROGETTISTA, TipoSoggettoUtil.DIRETTORE_LAVORI)); aMap.put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A08, Arrays.asList(TipoSoggettoUtil.PROGETTISTA, TipoSoggettoUtil.DIRETTORE_LAVORI)); - // aMap.put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A09, - // Arrays.asList(TipoSoggettoUtil.PROGETTISTA, - // TipoSoggettoUtil.DIRETTORE_LAVORI)); aMap.put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A10, Arrays.asList(TipoSoggettoUtil.PROGETTISTA, TipoSoggettoUtil.DIRETTORE_LAVORI)); aMap.put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A13, Arrays.asList(TipoSoggettoUtil.PROGETTISTA, TipoSoggettoUtil.DIRETTORE_LAVORI)); - //aMap.put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A05, - // Arrays.asList(TipoSoggettoUtil.GEOLOGO, TipoSoggettoUtil.DIRETTORE_LAVORI)); - aMap.put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14, Arrays.asList(TipoSoggettoUtil.GEOLOGO)); aMap.put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A15, Arrays.asList(TipoSoggettoUtil.GEOLOGO, TipoSoggettoUtil.DIRETTORE_LAVORI)); @@ -158,7 +144,8 @@ public class AsseverazioniUtil { Map> bMap = new HashMap>(); bMap.put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A04, Arrays.asList(TipoSoggettoUtil.DITTA)); bMap.put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A10, Arrays.asList(TipoSoggettoUtil.DITTA)); - //bMap.put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A05, Arrays.asList(TipoSoggettoUtil.PROGETTISTA)); + // bMap.put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A05, + // Arrays.asList(TipoSoggettoUtil.PROGETTISTA)); // bMap.put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14, // Arrays.asList(TipoSoggettoUtil.PROGETTISTA)); recommended = Collections.unmodifiableMap(bMap); @@ -201,7 +188,7 @@ public class AsseverazioniUtil { if (TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equalsIgnoreCase(dettPratica .getTipoIntegrazione())) { if (TipoSoggettoUtil.COMMITTENTE.equalsIgnoreCase(tipoSoggetto)) { - return !ValidazionePraticaUtil.isA98Required(dettPratica); + return true; } User titolaredigitaleUser = UserLocalServiceUtil.getUser(intPratica.getUserId()); Soggetto titolareDigitale = SoggettoLocalServiceUtil @@ -215,7 +202,7 @@ public class AsseverazioniUtil { } else if (TipoIntegrazioneUtil.VARIANTE.equalsIgnoreCase(dettPratica.getTipoIntegrazione())) { if (TipoSoggettoUtil.COMMITTENTE.equalsIgnoreCase(tipoSoggetto)) { - return !ValidazionePraticaUtil.isA98Required(dettPratica); + return true; } else if (!TipoSoggettoUtil.GEOLOGO.equalsIgnoreCase(tipoSoggetto) && !TipoSoggettoUtil.COLLAUDATORE.equalsIgnoreCase(tipoSoggetto)) { List soggettiPrincipali = SoggettoLocalServiceUtil @@ -256,16 +243,7 @@ public class AsseverazioniUtil { return checkAsseverazioniRichiestaOriginaria(tipoSoggetto, dettPraticaId); return false; } else if (TipoSoggettoUtil.COMMITTENTE.equalsIgnoreCase(tipoSoggetto)) { - return !ValidazionePraticaUtil.isA98Required(dettPratica); - // ADT: RIMOZIONE IF NON NECESSARI - /* - * } else if - * (TipoSoggettoUtil.COLLAUDATORE.equalsIgnoreCase(tipoSoggetto) - * && dettPratica.getCollaudoStatico()) { return false; } else - * if (TipoSoggettoUtil.DITTA.equalsIgnoreCase(tipoSoggetto) && - * (dettPratica.getNormLavoriInProprio() || - * dettPratica.getLavoriPubblici())) { return false; - */ + return true; } else if (required.containsKey(ASSEVERAZIONI_DOMANDA)) { return required.get(ASSEVERAZIONI_DOMANDA).contains(tipoSoggetto); } @@ -380,18 +358,6 @@ public class AsseverazioniUtil { } if (cfAsseverazioni.containsAll(nuoviSoggetti)) { soggetti = true; - } else { - if (ValidazionePraticaUtil.isA98Required(dettPratica)) { - List committentiToRemove = SoggettoLocalServiceUtil - .getCfValidTmpByDettPratica_TipologiaSoggetto(dettPraticaId, - TipoSoggettoUtil.COMMITTENTE); - - nuoviSoggetti.removeAll(committentiToRemove); - if (cfAsseverazioni.containsAll(nuoviSoggetti)) { - soggetti = true; - } - - } } nuoviDelegati.removeAll(nuoviSoggetti); @@ -414,14 +380,6 @@ public class AsseverazioniUtil { TipoSoggettoUtil.DIRETTORE_LAVORI, TipoSoggettoUtil.DITTA, TipoSoggettoUtil.PROGETTISTA }; - // if - // (SoggettiUtil.isTitolareInCommittenti(intPratica.getIntPraticaId())) - // { - if (ValidazionePraticaUtil.isA98Required(dettPratica)) { - tipoSoggetti = (String[]) ArrayUtils.removeElement(tipoSoggetti, - TipoSoggettoUtil.COMMITTENTE); - } - List cfSoggettiPrincipali = SoggettoLocalServiceUtil .getCfSoggettiPrincipaliValidTmpByDettPratica_TipologiaSoggetto(dettPraticaId, tipoSoggetti); @@ -433,18 +391,6 @@ public class AsseverazioniUtil { nuoviSoggetti.removeAll(cfSoggettiPrincipali); if (cfAsseverazioni.containsAll(nuoviSoggetti)) { soggetti = true; - } else { - if (ValidazionePraticaUtil.isA98Required(dettPratica)) { - List committentiToRemove = SoggettoLocalServiceUtil - .getCfValidTmpByDettPratica_TipologiaSoggetto(dettPraticaId, - TipoSoggettoUtil.COMMITTENTE); - - nuoviSoggetti.removeAll(committentiToRemove); - if (cfAsseverazioni.containsAll(nuoviSoggetti)) { - soggetti = true; - } - - } } nuoviDelegati.removeAll(cfSoggettiPrincipali); @@ -460,8 +406,7 @@ public class AsseverazioniUtil { for (String tipoSoggetto : required.get(ASSEVERAZIONI_DOMANDA)) { // Se committente e c'è delega => true - if (TipoSoggettoUtil.COMMITTENTE.equalsIgnoreCase(tipoSoggetto) - && ValidazionePraticaUtil.isA98Required(dettPratica)) { + if (TipoSoggettoUtil.COMMITTENTE.equalsIgnoreCase(tipoSoggetto)) { continue; } if (isAsseverazioneDomandaRequiredByTipoSoggetto(dettPraticaId, tipoSoggetto)) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DelegheUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DelegheUtil.java index 3b7c9d5f..d44b35b9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DelegheUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DelegheUtil.java @@ -15,7 +15,6 @@ import it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.FineLavoriServiceUtil; import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil; -import it.tref.liferay.portos.bo.service.persistence.SoggettoUtil; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; import java.util.ArrayList; diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/DocumentiPraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DocumentiPraticaUtil.java similarity index 92% rename from liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/DocumentiPraticaUtil.java rename to liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DocumentiPraticaUtil.java index 26a7dcbd..b4037ce3 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/DocumentiPraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DocumentiPraticaUtil.java @@ -1,4 +1,8 @@ -package it.tref.liferay.portos.bo.shared.util; +package it.tref.liferay.portos.bo.util; + +import it.tref.liferay.portos.bo.model.DettPratica; +import it.tref.liferay.portos.bo.model.IntPratica; +import it.tref.liferay.portos.bo.shared.util.Constants; import java.util.ArrayList; import java.util.List; @@ -82,7 +86,7 @@ public class DocumentiPraticaUtil { public static List getDocObbligatoriCheck() { List docObbligatoriCheck = new ArrayList(); - //docObbligatoriCheck.add(TIPOLOGIA_ALLEGATO_A05); + // docObbligatoriCheck.add(TIPOLOGIA_ALLEGATO_A05); docObbligatoriCheck.add(TIPOLOGIA_ALLEGATO_A09); return docObbligatoriCheck; @@ -122,29 +126,27 @@ public class DocumentiPraticaUtil { return doc; } - public static List getDocObbligatoriDomanda(String tipoProcedura) { + public static List getDocObbligatoriDomanda(IntPratica intPratica, DettPratica dettPratica) { List docObbligatori = new ArrayList(); - if (tipoProcedura.equalsIgnoreCase(Constants.PROCEDURA_P1)) { + switch (intPratica.getTipoProcedura()) { + case Constants.PROCEDURA_P1: docObbligatori.add(TIPOLOGIA_ALLEGATO_A02); docObbligatori.add(TIPOLOGIA_ALLEGATO_A03); docObbligatori.add(TIPOLOGIA_ALLEGATO_A09); - } - - if (tipoProcedura.equalsIgnoreCase(Constants.PROCEDURA_P2)) { + break; + case Constants.PROCEDURA_P2: docObbligatori.add(TIPOLOGIA_ALLEGATO_A01); docObbligatori.add(TIPOLOGIA_ALLEGATO_A02); docObbligatori.add(TIPOLOGIA_ALLEGATO_A03); docObbligatori.add(TIPOLOGIA_ALLEGATO_A09); - } - - if (tipoProcedura.equalsIgnoreCase(Constants.PROCEDURA_P3)) { - } - - if (tipoProcedura.equalsIgnoreCase(Constants.PROCEDURA_P4) || - tipoProcedura.equalsIgnoreCase(Constants.PROCEDURA_P5) || - tipoProcedura.equalsIgnoreCase(Constants.PROCEDURA_P6) || - tipoProcedura.equalsIgnoreCase(Constants.PROCEDURA_P7)) { + break; + case Constants.PROCEDURA_P3: + break; + case Constants.PROCEDURA_P4: + case Constants.PROCEDURA_P5: + case Constants.PROCEDURA_P6: + case Constants.PROCEDURA_P7: docObbligatori.add(TIPOLOGIA_ALLEGATO_A01); docObbligatori.add(TIPOLOGIA_ALLEGATO_A02); docObbligatori.add(TIPOLOGIA_ALLEGATO_A03); @@ -152,18 +154,16 @@ public class DocumentiPraticaUtil { docObbligatori.add(TIPOLOGIA_ALLEGATO_A10); docObbligatori.add(TIPOLOGIA_ALLEGATO_A11); docObbligatori.add(TIPOLOGIA_ALLEGATO_A12); - } - - if (tipoProcedura.equalsIgnoreCase(Constants.PROCEDURA_P8)) { + break; + case Constants.PROCEDURA_P8: docObbligatori.add(TIPOLOGIA_ALLEGATO_A01); docObbligatori.add(TIPOLOGIA_ALLEGATO_A02); docObbligatori.add(TIPOLOGIA_ALLEGATO_A03); docObbligatori.add(TIPOLOGIA_ALLEGATO_A09); docObbligatori.add(TIPOLOGIA_ALLEGATO_A12); docObbligatori.add(TIPOLOGIA_ALLEGATO_A15); - } - - if (tipoProcedura.equalsIgnoreCase(Constants.PROCEDURA_P9)) { + break; + case Constants.PROCEDURA_P9: docObbligatori.add(TIPOLOGIA_ALLEGATO_A01); docObbligatori.add(TIPOLOGIA_ALLEGATO_A02); docObbligatori.add(TIPOLOGIA_ALLEGATO_A03); @@ -175,12 +175,12 @@ public class DocumentiPraticaUtil { docObbligatori.add(TIPOLOGIA_ALLEGATO_A19); docObbligatori.add(TIPOLOGIA_ALLEGATO_A20); docObbligatori.add(TIPOLOGIA_ALLEGATO_A21); - } - - if (tipoProcedura.equalsIgnoreCase(Constants.PROCEDURA_P10)) { + break; + case Constants.PROCEDURA_P10: docObbligatori.add(TIPOLOGIA_ALLEGATO_A12); + break; } - + return docObbligatori; } @@ -240,7 +240,7 @@ public class DocumentiPraticaUtil { // doc.add(TIPOLOGIA_ALLEGATO_A07); // doc.add(TIPOLOGIA_ALLEGATO_A14); - //doc.add(TIPOLOGIA_ALLEGATO_A00); + // doc.add(TIPOLOGIA_ALLEGATO_A00); doc.add(TIPOLOGIA_ALLEGATO_A01); doc.add(TIPOLOGIA_ALLEGATO_A11); doc.add(TIPOLOGIA_ALLEGATO_A12); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java index d249e14d..0eb749f6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java @@ -1,7 +1,6 @@ package it.tref.liferay.portos.bo.util; import it.tref.liferay.portos.bo.model.Collaudo; -import it.tref.liferay.portos.bo.model.Delega; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.DocPratica; import it.tref.liferay.portos.bo.model.FineLavori; @@ -10,7 +9,6 @@ import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.model.Territorio; import it.tref.liferay.portos.bo.service.CollaudoLocalServiceUtil; import it.tref.liferay.portos.bo.service.CollaudoServiceUtil; -import it.tref.liferay.portos.bo.service.DelegaLocalServiceUtil; import it.tref.liferay.portos.bo.service.DettPraticaServiceUtil; import it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil; @@ -19,23 +17,21 @@ import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.IntPraticaServiceUtil; import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil; import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; -import it.tref.liferay.portos.bo.service.persistence.AsseverazioneUtil; import it.tref.liferay.portos.bo.shared.bean.FirmeBean; import it.tref.liferay.portos.bo.shared.util.Constants; -import it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil; import it.tref.liferay.portos.bo.shared.util.FirmeUtil; -import it.tref.liferay.portos.bo.shared.util.GenericUtils; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; -import it.tref.liferay.portos.bo.shared.util.Constants; import it.tref.liferay.portos.bo.util.AsseverazioniUtil; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletResponse; @@ -59,7 +55,7 @@ import com.liferay.portal.service.CompanyLocalServiceUtil; public class ValidazionePraticaUtil { - private static Log _log = LogFactoryUtil.getLog(ValidazionePraticaUtil.class); + private static final Log _log = LogFactoryUtil.getLog(ValidazionePraticaUtil.class); public static boolean praticaIsEditable(long dettPraticaId) throws PortalException, SystemException { @@ -73,10 +69,11 @@ public class ValidazionePraticaUtil { } public static boolean praticaIsCompleta(long dettPraticaId) throws SystemException, PortalException { - - return isDettagliPrincipaliCompleta(dettPraticaId) && isAnagrafeSoggettiCompleta(dettPraticaId) - && isDescrizioneEdificioCompleta(dettPraticaId) && isSezioneGeologicaCompleta(dettPraticaId) - && isSezioneAllegatiCompleta(dettPraticaId); + return 0 == notCompletedDettagliPrincipali(dettPraticaId).size() + + notCompletedAnagrafeSoggetti(dettPraticaId).size() + + notCompletedDescrizioneEdificio(dettPraticaId).size() + + notCompletedSezioneGeologica(dettPraticaId).size() + + notCompletedSezioneAllegati(dettPraticaId).size(); } public static boolean canEditPratica(long intPraticaId) throws PortalException, SystemException { @@ -114,7 +111,7 @@ public class ValidazionePraticaUtil { DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); - return isAnagrafeSoggettiCompleta(dettPraticaId) + return notCompletedAnagrafeSoggetti(dettPraticaId).size() == 0 && intPratica.getStatus() != WorkflowConstants.STATUS_ANY && intPratica.getStatus() != WorkflowConstants.STATUS_INCOMPLETE && TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equals(dettPratica.getTipoIntegrazione()); @@ -433,41 +430,9 @@ public class ValidazionePraticaUtil { // && asseverazioniIsCompleted(dettPraticaId); } - public static boolean isSectionCompleted(String section, long dettPraticaId) throws PortalException, - SystemException { - - // DettPratica dettPratica = - // DettPraticaServiceUtil.getLastEditableByIntPratica(intPraticaId); - // if(dettPratica == null) - // return true; // Se non ce ne sono editabili vuole dire che è - // completa - - switch (section) { - case SezioniUtil.SEZIONE_DETTAGLI_PRINCIPALI: - return isDettagliPrincipaliCompleta(dettPraticaId); - case SezioniUtil.SEZIONE_ANAGRAFE_SOGGETTI: - return isAnagrafeSoggettiCompleta(dettPraticaId); - case SezioniUtil.SEZIONE_DESCRIZIONE_EDIFICIO: - return isDescrizioneEdificioCompleta(dettPraticaId); - case SezioniUtil.SEZIONE_GEOLOGICA: - return isSezioneGeologicaCompleta(dettPraticaId); - case SezioniUtil.SEZIONE_ALLEGATI: - return isSezioneAllegatiCompleta(dettPraticaId); - default: - return false; - } - - } - public static List notCompletedSection(String section, long dettPraticaId) throws PortalException, SystemException { - // DettPratica dettPratica = - // DettPraticaServiceUtil.getLastEditableByIntPratica(intPraticaId); - // if(dettPratica == null) - // return new ArrayList(); // Se non ce ne sono editabili vuole - // dire che è completa - switch (section) { case SezioniUtil.SEZIONE_DETTAGLI_PRINCIPALI: return notCompletedDettagliPrincipali(dettPraticaId); @@ -478,7 +443,7 @@ public class ValidazionePraticaUtil { case SezioniUtil.SEZIONE_GEOLOGICA: return notCompletedSezioneGeologica(dettPraticaId); case SezioniUtil.SEZIONE_ALLEGATI: - return notCompletedSezioniAllegati(dettPraticaId); + return notCompletedSezioneAllegati(dettPraticaId); default: return new ArrayList(); } @@ -500,74 +465,6 @@ public class ValidazionePraticaUtil { return notCompleted; } - private static boolean isDettagliPrincipaliCompleta(long dettPraticaId) throws PortalException, - SystemException { - - DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); - IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); - // boolean ag = true; - /* - * if (!territorio.getZona().equals("2") && - * !territorio.getZona().equals("4")) { ag = - * Validator.isNotNull(dettPratica.getAg()); } - */ - - /* - * boolean aiSensi = - * AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId()) ? - * (dettPratica .getNormDpr01Dep() || dettPratica.getNormDpr02Dep()) : - * (dettPratica.getNormDpr01Aut() || dettPratica.getNormDpr02Aut()); - * - * boolean nelRispetto = dettPratica.getNormDm01() || - * dettPratica.getNormDm02() || dettPratica.getNormDm2018(); - */ - - /* - * boolean sismaBonus = !dettPratica.getNormSismaBonus() || - * (Validator.isNotNull(dettPratica.getClRischioPreInt()) || - * Validator.isNotNull(dettPratica .getClRischioPostInt())); - */ - - // ADT BUG ID = 17 - boolean tipologiaCostruttiva = intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_C) - || dettPratica.getTcInCA() || dettPratica.getTcInAcciaio() || dettPratica.getTcInMuratura() - || dettPratica.getTcInLegno() || dettPratica.getTcAltro(); - boolean intervFinPub = !dettPratica.getIntervFinPub() - || Validator.isNotNull(dettPratica.getIntervFinPubDesc()); - boolean controllo = tipologiaCostruttiva && intervFinPub - && Validator.isNotNull(dettPratica.getDescLongIntervento()) - && Validator.isNotNull(dettPratica.getDestinazione()) - /* - * && (dettPratica.getTcNuovaCostruzione() || - * dettPratica.getTcMiglioramentoSismico() || - * dettPratica.getTcAdeguamentoSismico() || dettPratica - * .getTcRiparazioneInterventoLocale() - * - * ) - */ - // && Validator.isNotNull(dettPratica.getDestinazione()) - // && Validator.isNotNull(dettPratica.getLocalita()) - && Validator.isNotNull(dettPratica.getVia()) - // && ( - // - // Validator.isNotNull(dettPratica.getLocalizzazioneGeografica()) && - // !("|||".equalsIgnoreCase(dettPratica - // .getLocalizzazioneGeografica())) - // - // ) - // && Validator.isNotNull(dettPratica.getDcFoglio()) - // && Validator.isNotNull(dettPratica.getDcAllegato()) - // && (Validator.isNotNull(dettPratica.getDcParticelle()) && - // !"|||".equalsIgnoreCase(dettPratica.getDcParticelle())) - ; - - boolean coordinateGeografiche = Validator.isNotNull(dettPratica.getLocalizzazioneGeografica()) - && !("|||".equalsIgnoreCase(dettPratica.getLocalizzazioneGeografica())); - - return controllo && coordinateGeografiche; - } - private static List notCompletedDettagliPrincipali(long dettPraticaId) throws PortalException, SystemException { @@ -676,110 +573,6 @@ public class ValidazionePraticaUtil { && !isRiparazioneLocale(dettPratica); } - private static boolean isAnagrafeSoggettiCompleta(long dettPraticaId) throws PortalException, - SystemException { - - DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); - long intPraticaId = dettPratica.getIntPraticaId(); - - boolean titolare = SoggettiUtil.isTitolareInSoggetti(intPraticaId); - // ADT BUG ID = 17 - - boolean collaudatoreNotRequired = !isCollaudatoreRequired(dettPratica); - boolean direttoreLavoriNotRequired = dettPratica.getLavoriPubblici(); - boolean dittaNotRequired = dettPratica.getNormLavoriInProprio() || dettPratica.getLavoriPubblici(); - - boolean collaudatore = true; - boolean ditta = dettPratica.getNormLavoriInProprio() || dettPratica.getLavoriPubblici(); - boolean committente = false; - boolean progettista = false; - boolean direttore = dettPratica.getLavoriPubblici(); - boolean geologo = false; - - List soggetti = SoggettoLocalServiceUtil.getValidTmpByIntPratica(intPraticaId); - for (Soggetto soggetto : soggetti) { - - if (!TipoSoggettoUtil.validaCodiceFiscale(soggetto.getCodiceFiscale(), true)) { - return false; - } - - switch (soggetto.getTipologiaSoggetto()) { - case TipoSoggettoUtil.COLLAUDATORE: - collaudatore = true; - break; - case TipoSoggettoUtil.COMMITTENTE: - committente = true; - break; - case TipoSoggettoUtil.DIRETTORE_LAVORI: - direttore = true; - break; - case TipoSoggettoUtil.DITTA: - ditta = true; - break; - case TipoSoggettoUtil.GEOLOGO: - geologo = true; - break; - case TipoSoggettoUtil.PROGETTISTA: - progettista = true; - break; - default: - break; - } - } - - boolean isDelegaCommittente = SoggettiUtil.isTitolareInCommittenti(intPraticaId) - || Validator.isNotNull(dettPratica.getCodiceFiscaleDelegatoCommittente()); - boolean isDelegaFineLavori = direttoreLavoriNotRequired - || Validator.isNotNull(dettPratica.getCodiceFiscaleDelegatoFineLavori()); - boolean isDelegaCollaudo = collaudatoreNotRequired - || Validator.isNotNull(dettPratica.getCodiceFiscaleDelegatoCollaudo()); - - boolean deleghe = isDelegaCommittente && isDelegaFineLavori && isDelegaCollaudo; - - boolean collaudatorePrincipale = true; - boolean committentePrincipale = true; - boolean direttorePrincipale = true; - boolean dittaPrincipale = true; - boolean geologoPrincipale = true; - boolean progettistaPrincipale = true; - - if (!collaudatoreNotRequired && collaudatore - && Validator.isNull(dettPratica.getCodiceFiscalePrincipaleCollaudatore())) { - collaudatorePrincipale = false; - } - if (committente && Validator.isNull(dettPratica.getCodiceFiscalePrincipaleCommittente())) { - committentePrincipale = false; - } - if (!direttoreLavoriNotRequired && direttore - && Validator.isNull(dettPratica.getCodiceFiscalePrincipaleDirettoreLavori())) { - direttorePrincipale = false; - } - if (!dittaNotRequired && ditta && Validator.isNull(dettPratica.getCodiceFiscalePrincipaleDitta())) { - dittaPrincipale = false; - } - if (geologo && Validator.isNull(dettPratica.getCodiceFiscalePrincipaleGeologo())) { - geologoPrincipale = false; - } - if (progettista && Validator.isNull(dettPratica.getCodiceFiscalePrincipaleProgettista())) { - progettistaPrincipale = false; - } - - boolean principali = collaudatorePrincipale & committentePrincipale & direttorePrincipale - & dittaPrincipale & geologoPrincipale & progettistaPrincipale; - - if (dettPratica.getNormArt3com3()) { - geologo = true; - } - - int soggettiIncompleti = SoggettoLocalServiceUtil.countTmpNotCompletedByDettPratica(dettPraticaId); - if (soggettiIncompleti > 0) { - return false; - } - - return titolare && collaudatore && ditta && committente && progettista && direttore && geologo - && deleghe && principali; - } - private static List notCompletedAnagrafeSoggetti(long dettPraticaId) throws PortalException, SystemException { @@ -909,110 +702,10 @@ public class ValidazionePraticaUtil { return notCompleted; } - private static boolean isDescrizioneEdificioCompleta(long dettPraticaId) throws PortalException, - SystemException { - - DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); - - if (intPratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_C)) { - return true; - } - - List infrastrutture = Arrays.asList("1A", "2A", "A4A", "A4B", "A4C", "A4D", "A4E", "A4F", - "A5A", "B4A", "B4B", "B4C", "B5A"); - // se infrastruttura controllo solo DATI INFRASTRUTTURA - boolean infrastruttura = infrastrutture.contains(dettPratica.getDestinazione()); - if (infrastruttura) { - return dettPratica.getDeInfStradaleStrada() || dettPratica.getDeInfStradalePonte() - || dettPratica.getDeInfStradaleAltro() || dettPratica.getDeInfIdraulicaLong() - || dettPratica.getDeInfIdraulicaTrasv() || dettPratica.getDeInfIdraulicaAltro() - || dettPratica.getDeInfOperaAccStradale() || dettPratica.getDeInfOperaAccIdraulica() - || dettPratica.getDeInfOperaAccAltro() || dettPratica.getDeInfAltraInfrastruttura() - || Validator.isNotNull(dettPratica.getDeInfAltroDesc()); - } - - // se non infrastruttura controllo il resto - boolean controllo = Validator.isNotNull(dettPratica.getDePiani()) - && Validator.isNotNull(dettPratica.getDeAltezza()) - && Validator.isNotNull(dettPratica.getDeInterrati()) - && Validator.isNotNull(dettPratica.getDeSuperficie()) - && Validator.isNotNull(dettPratica.getDeCostruzione()) - && Validator.isNotNull(dettPratica.getDeUso()) - && Validator.isNotNull(dettPratica.getDeUtilizzazione()) - && Validator.isNotNull(dettPratica.getDePrivata()) - && Validator.isNotNull(dettPratica.getDePubblica()); - - boolean isComponentiCostruttiveDisabled = !dettPratica.getTcNuovaCostruzione() - && dettPratica.getTcRiparazioneInterventoLocale(); - - if (isComponentiCostruttiveDisabled) { - return controllo; - } - - // boolean fondazioni = - // Validator.isNotNull(dettPratica.getDccFondazioni()); - boolean elevazioni = (Validator.isNotNull(dettPratica.getDccStruttureEleMuraturePietrame()) - || Validator.isNotNull(dettPratica.getDccStruttureEleMuratureLaterizio()) - || Validator.isNotNull(dettPratica.getDccStruttureEleMuratureMisto()) || Validator - .isNotNull(dettPratica.getDccStruttureEleMuratureStoriche())) - || Validator.isNotNull(dettPratica.getDccStruttureEleAcciaio()) - || Validator.isNotNull(dettPratica.getDccStruttureEleCA()) - || Validator.isNotNull(dettPratica.getDccStruttureEleLegno()) - || (Validator.isNotNull(dettPratica.getDccStruttureEleMistoCA()) - || Validator.isNotNull(dettPratica.getDccStruttureEleMistoAcciaio()) - || Validator.isNotNull(dettPratica.getDccStruttureEleMistoMuratura()) || Validator - .isNotNull(dettPratica.getDccStruttureEleMistoLegno())) - || Validator.isNotNull(dettPratica.getDccStruttureElePrefabbricato()) - || (Validator.isNotNull(dettPratica.getDccStruttureEleAltro()) && Validator - .isNotNull(dettPratica.getDccStruttureEleAltroDescrizione())); - - boolean orizzontamenti = Validator.isNotNull(dettPratica.getDccOrizzontamentiCAAcciaio()) - || Validator.isNotNull(dettPratica.getDccOrizzontamentiLamieraGrecata()) - || Validator.isNotNull(dettPratica.getDccOrizzontamentiLegno()) - || Validator.isNotNull(dettPratica.getDccOrizzontamentiLegnoCA()) - || Validator.isNotNull(dettPratica.getDccOrizzontamentiVolte()) - || (Validator.isNotNull(dettPratica.getDccOrizzontamentiAltro()) && Validator - .isNotNull(dettPratica.getDccOrizzontamentiAltroDescrizione())); - - boolean coperture = Validator.isNotNull(dettPratica.getDccCopertura()) - || Validator.isNotNull(dettPratica.getDccCoperturaCAAcciaio()) - || Validator.isNotNull(dettPratica.getDccCoperturaLamieraGrecata()) - || Validator.isNotNull(dettPratica.getDccCoperturaLeggere()) - || Validator.isNotNull(dettPratica.getDccCoperturaLegno()) - || Validator.isNotNull(dettPratica.getDccCoperturaLegnoCA()) - || Validator.isNotNull(dettPratica.getDccCoperturaPannelli()) - || Validator.isNotNull(dettPratica.getDccCoperturaPVCTelonati()) - || (Validator.isNotNull(dettPratica.getDccCoperturaAltro()) && Validator - .isNotNull(dettPratica.getDccCoperturaAltroDesrizione())); - - boolean non_strutturali = Validator.isNotNull(dettPratica.getDccElemNonStrutLaterizio()) - || Validator.isNotNull(dettPratica.getDccElemNonStrutCalcestruzzo()) - || Validator.isNotNull(dettPratica.getDccElemNonStrutCartongesso()) - || Validator.isNotNull(dettPratica.getDccElemNonStrutLegno()) - || (Validator.isNotNull(dettPratica.getDccElemNonStrutAltro()) && Validator - .isNotNull(dettPratica.getDccElemNonStrutAltroDescrizione())); - - boolean rinforzo = Validator.isNotNull(dettPratica.getDccOpereDiRinforzoInsCatene()) - || Validator.isNotNull(dettPratica.getDccOpereDiRinforzoInsCordoli()) - || Validator.isNotNull(dettPratica.getDccOpereDiRinforzoIniArmate()) - || Validator.isNotNull(dettPratica.getDccOpereDiRinforzoPlaccaggi()) - || Validator.isNotNull(dettPratica.getDccOpereDiRinforzoIrrSolai()) - || Validator.isNotNull(dettPratica.getDccOpereDiRinforzoRinforziFRP()) - || Validator.isNotNull(dettPratica.getDccOpereDiRinforzoTelaiECerchiature()) - || Validator.isNotNull(dettPratica.getDccOpereDiRinforzoInsRompitratta()) - || (Validator.isNotNull(dettPratica.getDccOpereDiRinforzoAltro()) && Validator - .isNotNull(dettPratica.getDccOpereDiRinforzoAltroDescrizione())); - - return controllo && elevazioni && orizzontamenti && coperture && non_strutturali && rinforzo; - } - private static List notCompletedDescrizioneEdificio(long dettPraticaId) throws PortalException, SystemException { DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); - List notCompleted = new ArrayList<>(); List infrastrutture = Arrays.asList("1A", "2A", "A4A", "A4B", "A4C", "A4D", "A4E", "A4F", @@ -1151,132 +844,10 @@ public class ValidazionePraticaUtil { return notCompleted; } - private static boolean isSezioneGeologicaCompleta(long dettPraticaId) throws PortalException, - SystemException { - - DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); - IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); - - // Se check NormArt3com3 sez. geologica non obbligatoria - if (dettPratica.getNormArt3com3()) { - return true; - } - - boolean formGeologo = Validator.isNotNull(dettPratica.getGeoDtRelazione()) - && Validator.isNotNull(dettPratica.getGeoClasseIndagine()) - && Validator.isNotNull(dettPratica.getGeoOperaRilevante()) - && Validator.isNotNull(dettPratica.getGeoCategoriaSottosuolo()) - && Validator.isNotNull(dettPratica.getGeoCategoriaTopografica()) - && Validator.isNotNull(dettPratica.getGeoOpereDiSostegno()) - && Validator.isNotNull(dettPratica.getGeoConsolidamento()) - && Validator.isNotNull(dettPratica.getGeoOpereInSotterranea()) - && Validator.isNotNull(dettPratica.getGeoPericolositaGeologica()) - && Validator.isNotNull(dettPratica.getGeoPericolositaGeomorfica()) - && Validator.isNotNull(dettPratica.getGeoRischioGeomorfologicoPai()) - && Validator.isNotNull(dettPratica.getGeoPericolositaIdraulicaPai()) - && Validator.isNotNull(dettPratica.getGeoRischioIdraulicoPai()) - && Validator.isNotNull(dettPratica.getGeoPericolositaSismica()) - && Validator.isNotNull(dettPratica.getGeoFattibilitaSismica()) - && Validator.isNotNull(dettPratica.getGeoPericolositaIdraulica()) - && Validator.isNotNull(dettPratica.getGeoFattibilitaIdraulica()) - && Validator.isNotNull(dettPratica.getGeoFattibilitaGeologica()) - && Validator.isNotNull(dettPratica.getGeoPresenzaPrescrizioni()) - && Validator.isNotNull(dettPratica.getGeoEvidenzeGeologiche()) - && Validator.isNotNull(dettPratica.getGeoEvidenzeGeomorfiche()); - - List delegheGeologo = DelegaLocalServiceUtil.findByDettPratica_Tipologia_InEsito( - dettPraticaId, DelegheUtil.TIPO_GEOLOGO, new String[] { DelegheUtil.STATO_ESEGUITA }, - QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); - - boolean allegatiGeologo = dettPratica.getNormArt3com3(); - if (!allegatiGeologo) { - long intPraticaId = dettPratica.getIntPraticaId(); - - List a14Docs = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia( - dettPratica.getIntPraticaId(), DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14, - QueryUtil.ALL_POS, QueryUtil.ALL_POS); - boolean a14 = !a14Docs.isEmpty() || !delegheGeologo.isEmpty(); - if (!a14) { - for (DocPratica doc : a14Docs) { - - // Se da Portos 1 salto validazione - - FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari()); - List signatures = firme.allSignatures(); - - if (!isAllRequiredValid(doc.getTipologia(), dettPratica.getIntPraticaId(), signatures, - AsseverazioniUtil.getRequiredSubjectsByCodiceDoc(doc.getTipologia()), doc)) { - return false; - } - - } - } - - List a06Docs = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia( - dettPratica.getIntPraticaId(), DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A06, - QueryUtil.ALL_POS, QueryUtil.ALL_POS); - boolean a06 = !a06Docs.isEmpty(); - if (!a06Docs.isEmpty()) { - for (DocPratica doc : a06Docs) { - FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari()); - List signatures = firme.allSignatures(); - if (!isA06Valid(dettPratica, dettPratica.getIntPraticaId(), signatures, doc)) { - // Return false if A06 doesn't contain (Progettista - // OR Geologo ) AND Direttore_Lavori - return false; - } - } - } - - List a15Docs = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia( - dettPratica.getIntPraticaId(), DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A15, - QueryUtil.ALL_POS, QueryUtil.ALL_POS); - boolean a15 = true; - if (!a15Docs.isEmpty()) { - for (DocPratica doc : a15Docs) { - FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari()); - List signatures = firme.allSignatures(); - if (!isA07A15Valid(dettPratica, intPraticaId, signatures, doc)) { - return false; - } - } - } - - List tipologiaAllegati = DocumentiPraticaUtil.getIndaginiGeologiche(); - List a16Docs = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologie( - intPraticaId, tipologiaAllegati.toArray(new String[0]), QueryUtil.ALL_POS, - QueryUtil.ALL_POS); - boolean a16 = !a16Docs.isEmpty(); - if (!a16Docs.isEmpty()) { - for (DocPratica doc : a16Docs) { - FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari()); - List signatures = firme.allSignatures(); - - List signaturesPerSubject = getSignaturePerSubject(intPraticaId, signatures, - TipoSoggettoUtil.GEOLOGO, doc.getClassPk()); - if (signaturesPerSubject.isEmpty()) { - return false; - } - } - } - - allegatiGeologo = a14 && a06 && a15 && a16; - } - - // boolean allegatiGeologo = - // dettPratica.getNormArt3com3() - // || ((!a14Docs.isEmpty() || !delegheGeologo.isEmpty()) && - // !a05.isEmpty() && !a06.isEmpty()); - // && !a07.isEmpty()); - - return formGeologo && allegatiGeologo; - } - private static List notCompletedSezioneGeologica(long dettPraticaId) throws PortalException, SystemException { DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); - IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); List notCompleted = new ArrayList<>(); // Se check NormArt3com3 sez. geologica non obbligatoria @@ -1286,98 +857,6 @@ public class ValidazionePraticaUtil { notCompleted.addAll(notCompletedDatiSezionGeologica(dettPraticaId)); - if (!dettPratica.getNormArt3com3()) { - long intPraticaId = dettPratica.getIntPraticaId(); - List a14 = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia( - dettPratica.getIntPraticaId(), DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14, - QueryUtil.ALL_POS, QueryUtil.ALL_POS); - /* - * List a05 = - * DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia( - * dettPratica.getIntPraticaId(), - * DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A05, QueryUtil.ALL_POS, - * QueryUtil.ALL_POS); - */ - List a06 = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia( - dettPratica.getIntPraticaId(), DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A06, - QueryUtil.ALL_POS, QueryUtil.ALL_POS); - List a15 = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia( - dettPratica.getIntPraticaId(), DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A15, - QueryUtil.ALL_POS, QueryUtil.ALL_POS); - List a16 = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologie(intPraticaId, - DocumentiPraticaUtil.getIndaginiGeologiche().toArray(new String[0]), QueryUtil.ALL_POS, - QueryUtil.ALL_POS); - - List delegheGeologo = DelegaLocalServiceUtil.findByDettPratica_Tipologia_InEsito( - dettPraticaId, DelegheUtil.TIPO_GEOLOGO, new String[] { DelegheUtil.STATO_ESEGUITA }, - QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); - - if (a14.isEmpty() && delegheGeologo.isEmpty()) { - notCompleted.add("A14 non presente"); - } else { - for (DocPratica doc : a14) { - - // Se da Portos 1 salto validazione - FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari()); - List signatures = firme.allSignatures(); - - if (!isAllRequiredValid(doc.getTipologia(), dettPratica.getIntPraticaId(), signatures, - AsseverazioniUtil.getRequiredSubjectsByCodiceDoc(doc.getTipologia()), doc)) { - GenericUtils.addIfnotExist(notCompleted, doc.getTipologia() - + " firme obbligatorie mancanti"); - } - } - } - - if (a06.isEmpty()) { - notCompleted.add("A06 non presente"); - } else { - for (DocPratica doc : a06) { - FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari()); - List signatures = firme.allSignatures(); - if (!isA06Valid(dettPratica, dettPratica.getIntPraticaId(), signatures, doc)) { - // ADT: bug id=22 - notCompleted.add("A06 firme obbligatorie mancanti "); - } - } - } - - if (a15.isEmpty()) { - // SECONDO EMAIL DELLA PASOTTI DEL 26 Maggio questo documento - // non è obbligatorio - // notCompleted.add("A15 non presente"); - } else { - for (DocPratica doc : a15) { - FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari()); - List signatures = firme.allSignatures(); - if (!isA07A15Valid(dettPratica, intPraticaId, signatures, doc)) { - // ADT: bug id=22 - notCompleted.add("A15 firme obbligatorie mancanti"); - } - } - } - - if (a16.isEmpty()) { - notCompleted.add("Indagini geologiche non presenti"); - } else { - - for (DocPratica doc : a16) { - FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari()); - List signatures = firme.allSignatures(); - - List signaturesPerSubject = getSignaturePerSubject(intPraticaId, signatures, - TipoSoggettoUtil.GEOLOGO, doc.getClassPk()); - if (signaturesPerSubject.isEmpty()) { - notCompleted.add(LanguageUtil.get(LocaleUtil.getDefault(), - "label-documenti-tipologia-" + doc.getTipologia()) - + " non firmato dal Geologo"); - } - - } - } - - } - return notCompleted; } @@ -1501,318 +980,37 @@ public class ValidazionePraticaUtil { notCompleted.add("Indagini Geologoche non presenti"); } - List allegatiGeologici = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologie( - dettPratica.getIntPraticaId(), DocumentiPraticaUtil.getDocGeologo().toArray(new String[0]), - QueryUtil.ALL_POS, QueryUtil.ALL_POS); - - long intPraticaId = dettPratica.getIntPraticaId(); - for (DocPratica doc : allegatiGeologici) { - // ADT : BUG FE ID=14 : CONTROLLO firma geologo A6 disabilitato - boolean checkA06 = doc.getTipologia().equalsIgnoreCase( - DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A06); - - FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari()); - List signatures = firme.allSignatures(); - - List signaturesPerSubject = getSignaturePerSubject(intPraticaId, signatures, - TipoSoggettoUtil.GEOLOGO, doc.getClassPk()); - // ADT : BUG FE ID=14 : CONTROLLO firma geologo A6 disabilitato - if (signaturesPerSubject.isEmpty() && (!checkA06)) { - notCompleted.add(LanguageUtil.get(LocaleUtil.getDefault(), - "label-documenti-tipologia-" + doc.getTipologia()) - + " non firmato dal Geologo"); - } - } - return notCompleted; } - private static boolean isSezioneAllegatiCompleta(long dettPraticaId) throws PortalException, + private static List notCompletedSezioneAllegati(long dettPraticaId) throws PortalException, SystemException { - + List notCompleted = new ArrayList<>(); DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); long intPraticaId = dettPratica.getIntPraticaId(); - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - - List tipologiaAllegati = DocumentiPraticaUtil.getDocObbligatoriDomanda(intPratica - .getTipoProcedura()); - - // ASD - List appTipologiaSoggetti = TipoSoggettoUtil.getAllSubjects(); - List tipologiaSoggetti = new ArrayList(); - - boolean collaudatoreNotRequired = dettPratica.getCollaudoStatico() || dettPratica.getLavoriPubblici(); - boolean direttoreLavoriNotRequired = dettPratica.getLavoriPubblici(); - boolean dittaNotRequired = dettPratica.getNormLavoriInProprio() || dettPratica.getLavoriPubblici(); - - for (String tipSoggetto : appTipologiaSoggetti) { - if (tipSoggetto.equals(TipoSoggettoUtil.COLLAUDATORE) && collaudatoreNotRequired) { - continue; - } - - if (tipSoggetto.equals(TipoSoggettoUtil.DIRETTORE_LAVORI) && direttoreLavoriNotRequired) { - continue; - } - - if (tipSoggetto.equals(TipoSoggettoUtil.DITTA) && dittaNotRequired) { - continue; - } - - tipologiaSoggetti.add(tipSoggetto); - } - - List firmeTotali = new ArrayList<>(); - boolean contieneDocumenti = false; - - for (String codiceDoc : tipologiaAllegati) { + IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId); - if (isDocPraticaRequired(dettPratica, codiceDoc)) { - List docs = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia( - intPraticaId, codiceDoc, QueryUtil.ALL_POS, QueryUtil.ALL_POS); - if (docs.isEmpty()) { - // Ci dev'essere almeno un allegato per ogni tipologia - // obbligatoria - return false; - } + List obbligatori = DocumentiPraticaUtil.getDocObbligatoriDomanda(intPratica, dettPratica); + for (String obbligatorio : obbligatori) { + List docs = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia( + intPraticaId, obbligatorio, QueryUtil.ALL_POS, QueryUtil.ALL_POS); + if (docs.isEmpty()) { + notCompleted.add("Nessun Allegato per " + + LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-" + + obbligatorio)); + } else { for (DocPratica doc : docs) { - - // Se il documento proviene da una dett precedente non viene - // controllato perche si presuppone che sia stata gia - // verificato - if (!doc.getClassName().equalsIgnoreCase(DettPratica.class.getName()) - || doc.getClassPk() != dettPraticaId) { - continue; - } - - contieneDocumenti = true; - FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari()); - List signatures = firme.allSignatures(); - GenericUtils.addAllIfnotExist(firmeTotali, signatures); - boolean isEnoughOne = AsseverazioniUtil.isEnoughOne(codiceDoc); - - /* - * if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil. - * TIPOLOGIA_ALLEGATO_A00)) { if (!isA00Valid(dettPratica, - * signatures)) { return false; } } else - */ - if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A06)) { - if (!isA06Valid(dettPratica, intPraticaId, signatures, doc)) { - // Return false if A06 doesn't contain (Progettista - // OR Geologo ) AND Direttore_Lavori - return false; - } - } else if (DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A07.equals(codiceDoc)) { - if (!isA07A15Valid(dettPratica, intPraticaId, signatures, doc)) { - // Return false if A07 doesn't contain Progettista - // AND Direttore_Lavori - return false; - } - } else if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A09)) { - if (!isA09Valid(dettPratica, intPraticaId, signatures, doc)) { - // Return false if A09 doesn't contain Progettista - // AND Direttore_Lavori - return false; - } - } else if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A15)) { - if (!isA07A15Valid(dettPratica, intPraticaId, signatures, doc)) { - return false; - } - } else if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A17)) { - if (!isA17Valid(dettPratica, signatures)) { - return false; - } - } else if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_DELEGA)) { - if (!isA98Valid(dettPratica, intPraticaId, signatures)) { - return false; - } - } else if (isEnoughOne && signatures.isEmpty()) { - // Return false if one sign is enought but there are no - // signs for this subjectType - return false; - } else { - if (!isAllRequiredValid(codiceDoc, intPraticaId, signatures, tipologiaSoggetti, doc)) { - // Return false if is required per this subjectType - // but it is not present - return false; - } - } - } - } - - } - - // Ogni progettista e direttore dei lavori deve avere apposto almeno una - // firma sulla totalità degli allegati - if (contieneDocumenti) { - List progettisti = SoggettoLocalServiceUtil.getValidTmpByIntPratica_TipologiaSoggetto( - intPraticaId, TipoSoggettoUtil.PROGETTISTA); - for (Soggetto progettista : progettisti) { - if (progettista.getDettPraticaId() == dettPraticaId) { - if (!firmeTotali.contains(progettista.getCodiceFiscale().toLowerCase())) { - return false; - } - } - } - List direttoriLavori = SoggettoLocalServiceUtil - .getValidTmpByIntPratica_TipologiaSoggetto(intPraticaId, - TipoSoggettoUtil.DIRETTORE_LAVORI); - for (Soggetto direttore : direttoriLavori) { - if (direttore.getDettPraticaId() == dettPraticaId) { - if (!firmeTotali.contains(direttore.getCodiceFiscale().toLowerCase())) { - return false; - } - } - } - } - - return true; - } - - private static List notCompletedSezioniAllegati(long dettPraticaId) throws PortalException, - SystemException { - - DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); - long intPraticaId = dettPratica.getIntPraticaId(); - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - String tipoProcedura = intPratica.getTipoProcedura(); - - List notCompleted = new ArrayList<>(); - - List tipologiaAllegati = DocumentiPraticaUtil.getDocObbligatoriDomanda(intPratica - .getTipoProcedura()); - - List tipologiaSoggettiApp = TipoSoggettoUtil.getAllSubjects(); - List tipologiaSoggetti = new ArrayList(); - // if(dettPratica.isLavoriPubblici()){ - // for(String tip : tipologiaSoggettiApp){ - // if(!tip.equalsIgnoreCase(TipoSoggettoUtil.DIRETTORE_LAVORI)){ - // tipologiaSoggetti.add(tip); - // } - // } - // } else { - tipologiaSoggetti = tipologiaSoggettiApp; - // } - - List firmeTotali = new ArrayList<>(); - - for (String codiceDoc : tipologiaAllegati) { - if (isDocPraticaRequired(dettPratica, codiceDoc)) { - List docs = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia( - intPraticaId, codiceDoc, QueryUtil.ALL_POS, QueryUtil.ALL_POS); - - if (docs.isEmpty()) { - // Ci dev'essere almeno un allegato per ogni tipologia - // obbligatoria - notCompleted.add("Nessun Allegato per " + FirmeBean firmeBean = FirmeUtil.deserialize(doc.getJsonFirmatari()); + List firme = firmeBean.allSignatures(); + _log.info("Per l'allegato " + LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-" - + codiceDoc)); - } - for (DocPratica doc : docs) { - // Se il documento proviene da una dett precedente non viene - // controllato - // perche si presuppone che sia stata gia verificato - if (!doc.getClassName().equalsIgnoreCase(DettPratica.class.getName()) - || doc.getClassPk() != dettPraticaId) { - continue; + + obbligatorio) + " servono le firme di:"); + for (String firma : firme) { + _log.info(" " + LanguageUtil.get(LocaleUtil.getDefault(), "gc-soggetto-" + firma)); } - - FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari()); - List signatures = firme.allSignatures(); - GenericUtils.addAllIfnotExist(firmeTotali, signatures); - boolean isEnoughOne = AsseverazioniUtil.isEnoughOne(codiceDoc); - - /* - * if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil. - * TIPOLOGIA_ALLEGATO_A00)) { if (!isA00Valid(dettPratica, - * signatures)) { // Return false if not esente spese + - * bolli // ADT: bug id=22 - * notCompleted.add("A00 firme obbligatorie mancanti"); } } - * else - */ - if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A06)) { - if (!isA06Valid(dettPratica, intPraticaId, signatures, doc)) { - // Return false if A06 doesn't contain (Progettista - // OR Geologo ) AND Direttore_Lavori - // ADT: bug id=22 - notCompleted.add("A06 firme obbligatorie mancanti"); - } - // } else if - // (DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A07.equals(codiceDoc) - // // || - // DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A15.equals(codiceDoc)) - // { - // if (!isA07A15A16Valid(dettPratica, signatures)) { - // notCompleted.add("A07 invalido"); - // } - } else if (DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A07.equals(codiceDoc)) { - if (!isA07A15Valid(dettPratica, intPraticaId, signatures, doc)) { - // Return false if A07 doesn't contain Progettista - // AND Direttore_Lavori - // ADT: bug id=22 - notCompleted.add("A07 firme obbligatorie mancanti"); - } - } else if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A09)) { - if (!isA09Valid(dettPratica, intPraticaId, signatures, doc)) { - // Return false if A09 doesn't contain Progettista - // AND Direttore_Lavori - // ADT: bug id=22 - notCompleted.add("A09 firme obbligatorie mancanti"); - } - } else if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A15)) { - if (!isA07A15Valid(dettPratica, intPraticaId, signatures, doc)) { - // ADT: bug id=22 - notCompleted.add("A15 firme obbligatorie mancanti"); - } - } else if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A17)) { - if (!isA17Valid(dettPratica, signatures)) { - // ADT: bug id=22 - notCompleted.add("A17 firme obbligatorie mancanti"); - } - } else if (codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_DELEGA)) { - if (!isA98Valid(dettPratica, intPraticaId, signatures)) { - // ADT: bug id=22 - notCompleted.add("Allegato Delega firme obbligatorie mancanti"); - } - } else if (isEnoughOne && signatures.isEmpty()) { - // Return false if one sign is enought but there are no - // signs for this subjectType - notCompleted.add(codiceDoc + " non firmato"); - } else { - if (!isAllRequiredValid(codiceDoc, intPraticaId, signatures, tipologiaSoggetti, doc)) { - // Return false if is required per this subjectType - // but it is not present - GenericUtils.addIfnotExist(notCompleted, codiceDoc - + " firme obbligatorie mancanti"); - } - } - } - } - } - - // Ogni progettista e direttore dei lavori deve avere apposto almeno una - // firma sulla totalità - // degli allegati - List progettisti = SoggettoLocalServiceUtil.getValidTmpByIntPratica_TipologiaSoggetto( - intPraticaId, TipoSoggettoUtil.PROGETTISTA); - for (Soggetto progettista : progettisti) { - if (progettista.getDettPraticaId() == dettPraticaId) { - if (!firmeTotali.contains(progettista.getCodiceFiscale().toLowerCase())) { - notCompleted.add("Firma del progettista " + progettista.getDescrizioneCompleta() - + " richiesta"); - } - } - } - List direttoriLavori = SoggettoLocalServiceUtil.getValidTmpByIntPratica_TipologiaSoggetto( - intPraticaId, TipoSoggettoUtil.DIRETTORE_LAVORI); - for (Soggetto direttore : direttoriLavori) { - if (direttore.getDettPraticaId() == dettPraticaId) { - if (!firmeTotali.contains(direttore.getCodiceFiscale().toLowerCase())) { - notCompleted.add("Firma del direttore dei lavori " + direttore.getDescrizioneCompleta() - + " richiesta"); } } } - return notCompleted; } @@ -1833,192 +1031,6 @@ public class ValidazionePraticaUtil { return signaturesPerSubject; } - private static boolean isDocPraticaRequired(DettPratica dettPratica, String codiceDoc) - throws SystemException, PortalException { - - boolean required = true; - - // ADT BUG ID = 5 - - switch (codiceDoc) { - /* - * case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A00: IntPratica - * intPratica = - * IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId - * ()); // ADT BUG ID = 5 if (isRiparazioneLocale(dettPratica)) { return - * false; } return !dettPratica.getNormEsenteSpese(); - */ - // case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A05: - case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A06: - case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A07: - // case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A14: - // case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A15: - // case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A16: //non so che - // doc è - return !dettPratica.getNormArt3com3(); - case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A15: - // nell'ultima version A15 non è più obbligtorio, ma se c'è deve - // essere firmato da GEOLOGO E - // DIRETTORE dei LAVORI - return false; - case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A09: - return !dettPratica.getNormArt3com4(); - case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A17: - return isA17Required(dettPratica); - case DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_DELEGA: - return isA98Required(dettPratica); - default: - return required; - } - - } - - public static boolean isA06Valid(DettPratica dettPratica, long intPraticaId, List signatures, - DocPratica docPratica) throws SystemException { - - boolean isProgettista = false; - boolean isGeologo = false; - boolean isDirettoreLavori = false; - - // Se check NormArt3com3 A06 non obbligatorio - if (dettPratica.getNormArt3com3()) { - return true; - } - - for (String sign : signatures) { - // List soggetti = - // SoggettoLocalServiceUtil.findByIntPratica_CodiceFiscale(intPraticaId, - // sign); - List soggetti = SoggettoLocalServiceUtil.getValidTmpByIntPratica_CodiceFiscale( - intPraticaId, sign, docPratica.getClassPk()); - for (Soggetto soggetto : soggetti) { - if (TipoSoggettoUtil.PROGETTISTA.equals(soggetto.getTipologiaSoggetto())) { - isProgettista = true; - } else if (TipoSoggettoUtil.GEOLOGO.equals(soggetto.getTipologiaSoggetto())) { - isGeologo = true; - } else if (TipoSoggettoUtil.DIRETTORE_LAVORI.equals(soggetto.getTipologiaSoggetto())) { - isDirettoreLavori = true; - } - } - } - - if (!isDirettoreLavori && !dettPratica.isLavoriPubblici()) { - isDirettoreLavori = true; - } - - return isDirettoreLavori && (isProgettista || isGeologo); - } - - public static boolean isA00Valid(DettPratica dettPratica, List signatures) throws SystemException { - - // Se esente contributi A00 non obbligatorio - boolean isEsente = dettPratica.getNormEsenteBollo() && dettPratica.getNormEsenteSpese(); - boolean isRiparazioneLocale = dettPratica.getTcRiparazioneInterventoLocale() - && !dettPratica.getTcNuovaCostruzione(); - return isEsente || isRiparazioneLocale || !signatures.isEmpty(); - } - - // public static boolean isA07A15A16Valid(DettPratica dettPratica, - // List signatures) throws - // SystemException { - // // Se check NormArt3com3 A06/A15/A16 non obbligatorio - // return dettPratica.getNormArt3com3() || !signatures.isEmpty(); - // } - - public static boolean isA07A15Valid(DettPratica dettPratica, long intPraticaId, List signatures, - DocPratica doc) throws SystemException { - - List requiredSubjectsApp = AsseverazioniUtil.getRequiredSubjectsByCodiceDoc(doc - .getTipologia()); - List requiredSubjects = new ArrayList(); - - if (dettPratica.getLavoriPubblici()) { - for (String tip : requiredSubjectsApp) { - if (!tip.equals(TipoSoggettoUtil.DIRETTORE_LAVORI)) { - requiredSubjects.add(tip); - } - } - } else { - requiredSubjects = requiredSubjectsApp; - } - - return dettPratica.getNormArt3com3() - || isAllRequiredValid(doc.getTipologia(), intPraticaId, signatures, requiredSubjects, doc); - - } - - public static boolean isA09Valid(DettPratica dettPratica, long intPraticaId, List signatures, - DocPratica docPratica) throws SystemException { - - if (dettPratica.getNormArt3com4()) { - return true; - } - - List tipoSoggetti = new ArrayList(); - - if (dettPratica.getLavoriPubblici()) { - tipoSoggetti = Arrays.asList(TipoSoggettoUtil.PROGETTISTA); - } else { - tipoSoggetti = Arrays.asList(TipoSoggettoUtil.PROGETTISTA, TipoSoggettoUtil.DIRETTORE_LAVORI); - } - - for (String tipoSoggetto : tipoSoggetti) { - List signaturesPerSubject = getSignaturePerSubject(intPraticaId, signatures, - tipoSoggetto, docPratica.getClassPk()); - if (signaturesPerSubject.isEmpty()) { - return false; - } - } - return true; - - } - - // A17 richiesto se CF ditta = CF committente e in quel caso dev'essere - // firmato da almeno un soggetto - public static boolean isA17Valid(DettPratica dettPratica, List signatures) throws SystemException { - - boolean isRequired = isA17Required(dettPratica); - if (isRequired && signatures.isEmpty()) { - return false; - } - - return true; - } - - private static boolean isA17Required(DettPratica dettPratica) throws SystemException { - - long praticaId = dettPratica.getDettPraticaId(); - List ditte = SoggettoLocalServiceUtil.findByDettPratica_TipologiaSoggetto( - dettPratica.getDettPraticaId(), TipoSoggettoUtil.DITTA); - List committenti = SoggettoLocalServiceUtil.findByDettPratica_TipologiaSoggetto( - dettPratica.getDettPraticaId(), TipoSoggettoUtil.COMMITTENTE); - boolean isRequired = AsseverazioniUtil.isRequiredTerna(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A17, - ditte, committenti, dettPratica); - - return isRequired; - } - - // Allegato Delega richiesto se il titolare Digitale pratica non è fra i - // committenti - public static boolean isA98Required(DettPratica dettPratica) throws SystemException, PortalException { - - return !SoggettiUtil.isTitolareInCommittenti(dettPratica.getIntPraticaId()); - } - - public static boolean isA98Valid(DettPratica dettPratica, long intPraticaId, List signatures) - throws SystemException, PortalException { - - if (SoggettiUtil.isTitolareInCommittenti(intPraticaId)) { - return true; - } else { - - boolean haveSignature = !signatures.isEmpty(); - - return haveSignature; - } - - } - public static boolean isAllRequiredValid(String codiceDoc, long intPraticaId, List signatures, List tipologiaSoggetti, DocPratica docPratica) throws SystemException { @@ -2303,4 +1315,179 @@ public class ValidazionePraticaUtil { return Collections.emptyList(); } + + private static List getFirmeObbligatorie(String tipologiaAllegato) { + return firmeObbligatorie.containsKey(tipologiaAllegato) ? firmeObbligatorie.get(tipologiaAllegato) + : vuota; + } + + private static final List vuota = new ArrayList<>(); + private static final Map> firmeObbligatorie = new HashMap>() { + private static final long serialVersionUID = 1L; + { + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A01, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.PROGETTISTA); + add(TipoSoggettoUtil.DIRETTORE_LAVORI); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A02, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.PROGETTISTA); + add(TipoSoggettoUtil.DIRETTORE_LAVORI); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A03, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.PROGETTISTA); + add(TipoSoggettoUtil.DIRETTORE_LAVORI); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A04, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.PROGETTISTA); + add(TipoSoggettoUtil.DIRETTORE_LAVORI); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A05, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.TITOLARE_DIGITALE); + add(TipoSoggettoUtil.DIRETTORE_LAVORI); + add(TipoSoggettoUtil.GEOLOGO); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A08, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.PROGETTISTA); + add(TipoSoggettoUtil.DIRETTORE_LAVORI); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A09, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.TITOLARE_DIGITALE); + add(TipoSoggettoUtil.PROGETTISTA); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A10, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.PROGETTISTA); + add(TipoSoggettoUtil.DIRETTORE_LAVORI); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A11, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.PROGETTISTA); + add(TipoSoggettoUtil.DIRETTORE_LAVORI); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A12, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.TITOLARE_DIGITALE); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A13, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.PROGETTISTA); + add(TipoSoggettoUtil.DIRETTORE_LAVORI); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A15, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.TITOLARE_DIGITALE); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A16, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.TITOLARE_DIGITALE); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A17, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.TITOLARE_DIGITALE); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A18, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.TITOLARE_DIGITALE); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A19, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.TITOLARE_DIGITALE); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A20, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.TITOLARE_DIGITALE); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A21, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.TITOLARE_DIGITALE); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A22, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.TITOLARE_DIGITALE); + add(TipoSoggettoUtil.DIRETTORE_LAVORI); + add(TipoSoggettoUtil.GEOLOGO); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A23, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.TITOLARE_DIGITALE); + add(TipoSoggettoUtil.DIRETTORE_LAVORI); + add(TipoSoggettoUtil.GEOLOGO); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A24, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.DIRETTORE_LAVORI); + add(TipoSoggettoUtil.ARCHEOLOGO); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A25, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.TITOLARE_DIGITALE); + add(TipoSoggettoUtil.PROGETTISTA); + add(TipoSoggettoUtil.DIRETTORE_LAVORI); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A26, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.TITOLARE_DIGITALE); + } + }); + put(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A27, new ArrayList() { + private static final long serialVersionUID = 1L; + { + add(TipoSoggettoUtil.PROGETTISTA); + add(TipoSoggettoUtil.DIRETTORE_LAVORI); + } + }); + } + }; } 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 cc06d627..600fec7e 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 @@ -86,6 +86,7 @@ gc-soggetto-03 = Direttore Lavori gc-soggetto-04 = Ditta Costruttrice gc-soggetto-05 = Geologo gc-soggetto-06 = Progettista +gc-soggetto-07 = Archeologo gc-soggetti-01 = Collaudatori gc-soggetti-02 = Committenti @@ -93,6 +94,7 @@ gc-soggetti-03 = Direttori Lavori gc-soggetti-04 = Ditte Costruttrici gc-soggetti-05 = Geologi gc-soggetti-06 = Progettisti +gc-soggetti-07 = Archeologi gc-soggetto-00-not-present = Titolare Digitale non presente tra i soggetti gc-soggetto-01-not-present = Collaudatore non presente tra i soggetti @@ -101,6 +103,7 @@ gc-soggetto-03-not-present = Direttore Lavori non presente tra i soggetti gc-soggetto-04-not-present = Ditta non presente tra i soggetti gc-soggetto-05-not-present = Geologo non presente tra i soggetti gc-soggetto-06-not-present = Progettista non presente tra i soggetti +gc-soggetto-07-not-present = Archeologo non presente tra i soggetti gc-soggetto-01-principale-not-present = Collaudatore principale non selezionato gc-soggetto-02-principale-not-present = Committente principale non selezionato @@ -108,6 +111,7 @@ gc-soggetto-03-principale-not-present = Direttore Lavori principale non selezion gc-soggetto-04-principale-not-present = Ditta principale non selezionato gc-soggetto-05-principale-not-present = Geologo principale non selezionato gc-soggetto-06-principale-not-present = Progettista principale non selezionato +gc-soggetto-07-principale-not-present = Archeologo principale non selezionato gc-soggetti-not-completed = Alcuni soggetti non validi diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java index 1b9a6464..3a42acee 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/FascicoloPortlet.java @@ -27,10 +27,10 @@ import it.tref.liferay.portos.bo.service.ProvinciaLocalServiceUtil; import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil; import it.tref.liferay.portos.bo.service.SorteggioLocalServiceUtil; import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; -import it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil; import it.tref.liferay.portos.bo.shared.util.PortletKeys; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; +import it.tref.liferay.portos.bo.util.DocumentiPraticaUtil; import it.tref.liferay.portos.bo.util.FilesImporter; import it.tref.liferay.portos.bo.util.PraticaUtil; import it.tref.liferay.portos.bo.util.ValidazionePraticaUtil; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoAllegatoBeanBuilder.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoAllegatoBeanBuilder.java index b114450d..f9adfac8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoAllegatoBeanBuilder.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoAllegatoBeanBuilder.java @@ -5,7 +5,7 @@ import it.tref.liferay.portos.bo.model.DocPratica; import it.tref.liferay.portos.bo.report.builder.bean.ReportAvvisoAllegatoBean; import it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.persistence.DocPraticaUtil; -import it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil; +import it.tref.liferay.portos.bo.util.DocumentiPraticaUtil; import it.tref.liferay.portos.bo.util.FilesImporter; import com.liferay.portal.kernel.exception.PortalException; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java index 27ef0590..d585f06e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java @@ -25,11 +25,11 @@ import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil; import it.tref.liferay.portos.bo.service.SorteggioLocalServiceUtil; import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; import it.tref.liferay.portos.bo.shared.util.Constants; -import it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; import it.tref.liferay.portos.bo.util.AvvisoUtil; +import it.tref.liferay.portos.bo.util.DocumentiPraticaUtil; import it.tref.liferay.portos.bo.util.WorkflowConstants; import it.tref.liferay.portos.bo.util.WorkflowUtil; @@ -41,6 +41,7 @@ import java.util.Calendar; import java.util.List; import java.util.Locale; import java.util.Map; + import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.language.LanguageUtil; 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 78195cfd..08042ce5 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 @@ -160,319 +160,325 @@ public class IntPraticaLocalServiceClpInvoker { "com.liferay.portal.service.ServiceContext" }; - _methodName210 = "clearDb"; + _methodName209 = "svuotaDatabase2"; - _methodParameterTypes210 = new String[] { }; + _methodParameterTypes209 = new String[] { + "com.liferay.portal.service.ServiceContext" + }; - _methodName211 = "deleteIntPratica"; + _methodName211 = "clearDb"; - _methodParameterTypes211 = new String[] { - "it.tref.liferay.portos.bo.model.IntPratica", "boolean" - }; + _methodParameterTypes211 = new String[] { }; _methodName212 = "deleteIntPratica"; _methodParameterTypes212 = new String[] { - "it.tref.liferay.portos.bo.model.IntPratica" + "it.tref.liferay.portos.bo.model.IntPratica", "boolean" }; - _methodName213 = "cloneIntPratica"; + _methodName213 = "deleteIntPratica"; _methodParameterTypes213 = new String[] { + "it.tref.liferay.portos.bo.model.IntPratica" + }; + + _methodName214 = "cloneIntPratica"; + + _methodParameterTypes214 = new String[] { "long", "com.liferay.portal.service.ServiceContext" }; - _methodName215 = "updateDelegati"; + _methodName216 = "updateDelegati"; - _methodParameterTypes215 = new String[] { + _methodParameterTypes216 = new String[] { "long", "java.lang.String", "java.lang.String", "boolean" }; - _methodName216 = "fetchIntPratica"; + _methodName217 = "fetchIntPratica"; - _methodParameterTypes216 = new String[] { "long" }; + _methodParameterTypes217 = new String[] { "long" }; - _methodName217 = "findFascicoliNotProgetto"; + _methodName218 = "findFascicoliNotProgetto"; - _methodParameterTypes217 = new String[] { "int", "int" }; + _methodParameterTypes218 = new String[] { "int", "int" }; - _methodName218 = "countFascicoliNotProgetto"; + _methodName219 = "countFascicoliNotProgetto"; - _methodParameterTypes218 = new String[] { }; + _methodParameterTypes219 = new String[] { }; - _methodName220 = "addNumeroProgetto"; + _methodName221 = "addNumeroProgetto"; - _methodParameterTypes220 = new String[] { "long" }; + _methodParameterTypes221 = new String[] { "long" }; - _methodName222 = "sospendiPratica"; + _methodName223 = "sospendiPratica"; - _methodParameterTypes222 = new String[] { "long", "boolean" }; + _methodParameterTypes223 = new String[] { "long", "boolean" }; - _methodName223 = "cambiaTitolare"; + _methodName224 = "cambiaTitolare"; - _methodParameterTypes223 = new String[] { + _methodParameterTypes224 = new String[] { "long", "long", "com.liferay.portal.service.ServiceContext" }; - _methodName224 = "updateStatoPratica"; + _methodName225 = "updateStatoPratica"; - _methodParameterTypes224 = new String[] { + _methodParameterTypes225 = new String[] { "long", "long", "java.lang.String" }; - _methodName226 = "updateIntPraticaSorteggio"; + _methodName227 = "updateIntPraticaSorteggio"; - _methodParameterTypes226 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes227 = new String[] { "long", "java.util.Date" }; - _methodName227 = "updateIntPraticaSorteggio"; + _methodName228 = "updateIntPraticaSorteggio"; - _methodParameterTypes227 = new String[] { + _methodParameterTypes228 = new String[] { "long", "java.util.Date", "java.lang.String" }; - _methodName228 = "findByC_UserId"; - - _methodParameterTypes228 = new String[] { "long", "long", "int", "int" }; + _methodName229 = "findByC_UserId"; - _methodName229 = "countByC_UserId"; + _methodParameterTypes229 = new String[] { "long", "long", "int", "int" }; - _methodParameterTypes229 = new String[] { "long", "long" }; + _methodName230 = "countByC_UserId"; - _methodName230 = "fetchByOldIntPraticaId"; + _methodParameterTypes230 = new String[] { "long", "long" }; - _methodParameterTypes230 = new String[] { "long" }; + _methodName231 = "fetchByOldIntPraticaId"; - _methodName231 = "updateStatus"; + _methodParameterTypes231 = new String[] { "long" }; - _methodParameterTypes231 = new String[] { "long", "int" }; + _methodName232 = "updateStatus"; - _methodName232 = "findByCompanyIdSoggettoProgetti"; + _methodParameterTypes232 = new String[] { "long", "int" }; - _methodParameterTypes232 = new String[] { "long", "long" }; - - _methodName233 = "countByCompanyIdSoggettoProgetti"; + _methodName233 = "findByCompanyIdSoggettoProgetti"; _methodParameterTypes233 = new String[] { "long", "long" }; - _methodName235 = "findByCompanyIdSoggettoArchivio"; + _methodName234 = "countByCompanyIdSoggettoProgetti"; - _methodParameterTypes235 = new String[] { "long", "long" }; + _methodParameterTypes234 = new String[] { "long", "long" }; - _methodName236 = "countByCompanyIdSoggettoArchivio"; + _methodName236 = "findByCompanyIdSoggettoArchivio"; _methodParameterTypes236 = new String[] { "long", "long" }; - _methodName238 = "findByCompanyIdSoggettoAltriProgetti"; + _methodName237 = "countByCompanyIdSoggettoArchivio"; + + _methodParameterTypes237 = new String[] { "long", "long" }; - _methodParameterTypes238 = new String[] { "long", "long", "int", "int" }; + _methodName239 = "findByCompanyIdSoggettoAltriProgetti"; - _methodName239 = "countByCompanyIdSoggettoAltriProgetti"; + _methodParameterTypes239 = new String[] { "long", "long", "int", "int" }; - _methodParameterTypes239 = new String[] { "long", "long" }; + _methodName240 = "countByCompanyIdSoggettoAltriProgetti"; - _methodName241 = "findByCanAddFineLavori"; + _methodParameterTypes240 = new String[] { "long", "long" }; - _methodParameterTypes241 = new String[] { + _methodName242 = "findByCanAddFineLavori"; + + _methodParameterTypes242 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName242 = "countByCanAddFineLavori"; + _methodName243 = "countByCanAddFineLavori"; - _methodParameterTypes242 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes243 = new String[] { "long", "java.lang.String" }; - _methodName244 = "findByCanAddCollaudo"; + _methodName245 = "findByCanAddCollaudo"; - _methodParameterTypes244 = new String[] { + _methodParameterTypes245 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName245 = "countByCanAddCollaudo"; + _methodName246 = "countByCanAddCollaudo"; - _methodParameterTypes245 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes246 = new String[] { "long", "java.lang.String" }; - _methodName247 = "search"; + _methodName248 = "search"; - _methodParameterTypes247 = new String[] { "java.util.List", "int", "int" }; + _methodParameterTypes248 = new String[] { "java.util.List", "int", "int" }; - _methodName248 = "countSearch"; + _methodName249 = "countSearch"; - _methodParameterTypes248 = new String[] { "java.util.List" }; + _methodParameterTypes249 = new String[] { "java.util.List" }; - _methodName249 = "searchWithIntPraticaId"; + _methodName250 = "searchWithIntPraticaId"; - _methodParameterTypes249 = new String[] { + _methodParameterTypes250 = new String[] { "java.util.List", "long", "int", "int" }; - _methodName250 = "countSearchWithIntPraticaId"; + _methodName251 = "countSearchWithIntPraticaId"; - _methodParameterTypes250 = new String[] { "java.util.List", "long" }; + _methodParameterTypes251 = new String[] { "java.util.List", "long" }; - _methodName251 = "allegaFileAnnullamento"; + _methodName252 = "allegaFileAnnullamento"; - _methodParameterTypes251 = new String[] { + _methodParameterTypes252 = new String[] { "long", "byte[][]", "java.lang.String", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName252 = "generateFileAnnullamento"; + _methodName253 = "generateFileAnnullamento"; - _methodParameterTypes252 = new String[] { + _methodParameterTypes253 = new String[] { "long", "com.liferay.portal.service.ServiceContext" }; - _methodName253 = "deleteFileAnnullamento"; + _methodName254 = "deleteFileAnnullamento"; - _methodParameterTypes253 = new String[] { "long" }; + _methodParameterTypes254 = new String[] { "long" }; - _methodName254 = "completeAnnullamento"; + _methodName255 = "completeAnnullamento"; - _methodParameterTypes254 = new String[] { "long" }; + _methodParameterTypes255 = new String[] { "long" }; - _methodName255 = "cambiaIstruttore"; + _methodName256 = "cambiaIstruttore"; - _methodParameterTypes255 = new String[] { "long", "long", "long" }; + _methodParameterTypes256 = new String[] { "long", "long", "long" }; - _methodName256 = "countCaricoLavoroCF"; + _methodName257 = "countCaricoLavoroCF"; - _methodParameterTypes256 = new String[] { + _methodParameterTypes257 = new String[] { "long", "java.lang.String", "java.lang.Boolean", "java.lang.Long[][]" }; - _methodName257 = "countCaricoLavoroIstruttore"; + _methodName258 = "countCaricoLavoroIstruttore"; - _methodParameterTypes257 = new String[] { + _methodParameterTypes258 = new String[] { "long", "java.lang.String", "java.lang.Boolean" }; - _methodName258 = "generateReportPratica"; + _methodName259 = "generateReportPratica"; - _methodParameterTypes258 = new String[] { + _methodParameterTypes259 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName259 = "updateModifiedDate"; + _methodName260 = "updateModifiedDate"; - _methodParameterTypes259 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes260 = new String[] { "long", "java.util.Date" }; - _methodName260 = "countAutorizzazione"; + _methodName261 = "countAutorizzazione"; - _methodParameterTypes260 = new String[] { + _methodParameterTypes261 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName261 = "countSanatorie"; + _methodName262 = "countSanatorie"; - _methodParameterTypes261 = new String[] { + _methodParameterTypes262 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName262 = "countOpereMinoreImportanza"; + _methodName263 = "countOpereMinoreImportanza"; - _methodParameterTypes262 = new String[] { + _methodParameterTypes263 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName263 = "countDeposito"; + _methodName264 = "countDeposito"; - _methodParameterTypes263 = new String[] { + _methodParameterTypes264 = new String[] { "java.util.Date", "java.util.Date", "long", "boolean" }; - _methodName264 = "countVidimate"; + _methodName265 = "countVidimate"; - _methodParameterTypes264 = new String[] { + _methodParameterTypes265 = new String[] { "java.util.Date", "java.util.Date", "long", "java.lang.String", "boolean" }; - _methodName265 = "countControllo"; + _methodName266 = "countControllo"; - _methodParameterTypes265 = new String[] { + _methodParameterTypes266 = new String[] { "java.util.Date", "java.util.Date", "long", "java.lang.String", "boolean" }; - _methodName266 = "importaVecchiFilesFascicolo"; + _methodName267 = "importaVecchiFilesFascicolo"; - _methodParameterTypes266 = new String[] { "long", "int", "int" }; + _methodParameterTypes267 = new String[] { "long", "int", "int" }; - _methodName267 = "findIntPraticaNotExist"; + _methodName268 = "findIntPraticaNotExist"; - _methodParameterTypes267 = new String[] { }; + _methodParameterTypes268 = new String[] { }; - _methodName268 = "riparaWorkflow"; + _methodName269 = "riparaWorkflow"; - _methodParameterTypes268 = new String[] { }; + _methodParameterTypes269 = new String[] { }; - _methodName269 = "reIndexFascicolo"; + _methodName270 = "reIndexFascicolo"; - _methodParameterTypes269 = new String[] { + _methodParameterTypes270 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName270 = "reIndexFasciolo"; - - _methodParameterTypes270 = new String[] { "java.lang.String", "long" }; - _methodName271 = "reIndexFasciolo"; - _methodParameterTypes271 = new String[] { "long", "long" }; + _methodParameterTypes271 = new String[] { "java.lang.String", "long" }; - _methodName272 = "trovaDoppioni"; + _methodName272 = "reIndexFasciolo"; - _methodParameterTypes272 = new String[] { }; + _methodParameterTypes272 = new String[] { "long", "long" }; - _methodName273 = "findByNumeroProgetto"; + _methodName273 = "trovaDoppioni"; - _methodParameterTypes273 = new String[] { "java.lang.String" }; + _methodParameterTypes273 = new String[] { }; - _methodName274 = "findByTerritorioId"; + _methodName274 = "findByNumeroProgetto"; - _methodParameterTypes274 = new String[] { "long" }; + _methodParameterTypes274 = new String[] { "java.lang.String" }; - _methodName275 = "reportTempisticheIstruttorieAvvisiAutorizzazioni"; + _methodName275 = "findByTerritorioId"; - _methodParameterTypes275 = new String[] { - "java.util.Date", "java.util.Date", "long", "java.lang.String" - }; + _methodParameterTypes275 = new String[] { "long" }; - _methodName276 = "reportTempisticheIstruttorieCalcolaDataSorteggio"; + _methodName276 = "reportTempisticheIstruttorieAvvisiAutorizzazioni"; _methodParameterTypes276 = new String[] { - "java.util.Date", "java.util.Date", "long" + "java.util.Date", "java.util.Date", "long", "java.lang.String" }; - _methodName277 = "reportPraticheVidimate"; + _methodName277 = "reportTempisticheIstruttorieCalcolaDataSorteggio"; _methodParameterTypes277 = new String[] { - "java.util.Date", "java.util.Date", "long", "java.lang.String" + "java.util.Date", "java.util.Date", "long" }; - _methodName278 = "reportPraticheVidimateCalcolaDataSorteggio"; + _methodName278 = "reportPraticheVidimate"; _methodParameterTypes278 = new String[] { - "java.util.Date", "java.util.Date", "long" + "java.util.Date", "java.util.Date", "long", "java.lang.String" }; - _methodName279 = "countIngressiAutorizzazioni"; + _methodName279 = "reportPraticheVidimateCalcolaDataSorteggio"; _methodParameterTypes279 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName280 = "countIngressiDepositi"; + _methodName280 = "countIngressiAutorizzazioni"; _methodParameterTypes280 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName281 = "countIngressiCO"; + _methodName281 = "countIngressiDepositi"; _methodParameterTypes281 = new String[] { "java.util.Date", "java.util.Date", "long" }; + + _methodName282 = "countIngressiCO"; + + _methodParameterTypes282 = new String[] { + "java.util.Date", "java.util.Date", "long" + }; } public Object invokeMethod(String name, String[] parameterTypes, @@ -638,238 +644,243 @@ public class IntPraticaLocalServiceClpInvoker { return IntPraticaLocalServiceUtil.svuotaDatabase((com.liferay.portal.service.ServiceContext)arguments[0]); } - if (_methodName210.equals(name) && - Arrays.deepEquals(_methodParameterTypes210, parameterTypes)) { - IntPraticaLocalServiceUtil.clearDb(); - - return null; + if (_methodName209.equals(name) && + Arrays.deepEquals(_methodParameterTypes209, parameterTypes)) { + return IntPraticaLocalServiceUtil.svuotaDatabase2((com.liferay.portal.service.ServiceContext)arguments[0]); } if (_methodName211.equals(name) && Arrays.deepEquals(_methodParameterTypes211, parameterTypes)) { - return IntPraticaLocalServiceUtil.deleteIntPratica((it.tref.liferay.portos.bo.model.IntPratica)arguments[0], - ((Boolean)arguments[1]).booleanValue()); + IntPraticaLocalServiceUtil.clearDb(); + + return null; } if (_methodName212.equals(name) && Arrays.deepEquals(_methodParameterTypes212, parameterTypes)) { - return IntPraticaLocalServiceUtil.deleteIntPratica((it.tref.liferay.portos.bo.model.IntPratica)arguments[0]); + return IntPraticaLocalServiceUtil.deleteIntPratica((it.tref.liferay.portos.bo.model.IntPratica)arguments[0], + ((Boolean)arguments[1]).booleanValue()); } if (_methodName213.equals(name) && Arrays.deepEquals(_methodParameterTypes213, parameterTypes)) { + return IntPraticaLocalServiceUtil.deleteIntPratica((it.tref.liferay.portos.bo.model.IntPratica)arguments[0]); + } + + if (_methodName214.equals(name) && + Arrays.deepEquals(_methodParameterTypes214, parameterTypes)) { return IntPraticaLocalServiceUtil.cloneIntPratica(((Long)arguments[0]).longValue(), (com.liferay.portal.service.ServiceContext)arguments[1]); } - if (_methodName215.equals(name) && - Arrays.deepEquals(_methodParameterTypes215, parameterTypes)) { + if (_methodName216.equals(name) && + Arrays.deepEquals(_methodParameterTypes216, parameterTypes)) { return IntPraticaLocalServiceUtil.updateDelegati(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (java.lang.String)arguments[2], ((Boolean)arguments[3]).booleanValue()); } - if (_methodName216.equals(name) && - Arrays.deepEquals(_methodParameterTypes216, parameterTypes)) { + if (_methodName217.equals(name) && + Arrays.deepEquals(_methodParameterTypes217, parameterTypes)) { return IntPraticaLocalServiceUtil.fetchIntPratica(((Long)arguments[0]).longValue()); } - if (_methodName217.equals(name) && - Arrays.deepEquals(_methodParameterTypes217, parameterTypes)) { + if (_methodName218.equals(name) && + Arrays.deepEquals(_methodParameterTypes218, parameterTypes)) { return IntPraticaLocalServiceUtil.findFascicoliNotProgetto(((Integer)arguments[0]).intValue(), ((Integer)arguments[1]).intValue()); } - if (_methodName218.equals(name) && - Arrays.deepEquals(_methodParameterTypes218, parameterTypes)) { + if (_methodName219.equals(name) && + Arrays.deepEquals(_methodParameterTypes219, parameterTypes)) { return IntPraticaLocalServiceUtil.countFascicoliNotProgetto(); } - if (_methodName220.equals(name) && - Arrays.deepEquals(_methodParameterTypes220, parameterTypes)) { + if (_methodName221.equals(name) && + Arrays.deepEquals(_methodParameterTypes221, parameterTypes)) { return IntPraticaLocalServiceUtil.addNumeroProgetto(((Long)arguments[0]).longValue()); } - if (_methodName222.equals(name) && - Arrays.deepEquals(_methodParameterTypes222, parameterTypes)) { + if (_methodName223.equals(name) && + Arrays.deepEquals(_methodParameterTypes223, parameterTypes)) { return IntPraticaLocalServiceUtil.sospendiPratica(((Long)arguments[0]).longValue(), ((Boolean)arguments[1]).booleanValue()); } - if (_methodName223.equals(name) && - Arrays.deepEquals(_methodParameterTypes223, parameterTypes)) { + if (_methodName224.equals(name) && + Arrays.deepEquals(_methodParameterTypes224, parameterTypes)) { return IntPraticaLocalServiceUtil.cambiaTitolare(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), (com.liferay.portal.service.ServiceContext)arguments[2]); } - if (_methodName224.equals(name) && - Arrays.deepEquals(_methodParameterTypes224, parameterTypes)) { + if (_methodName225.equals(name) && + Arrays.deepEquals(_methodParameterTypes225, parameterTypes)) { return IntPraticaLocalServiceUtil.updateStatoPratica(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), (java.lang.String)arguments[2]); } - if (_methodName226.equals(name) && - Arrays.deepEquals(_methodParameterTypes226, parameterTypes)) { + if (_methodName227.equals(name) && + Arrays.deepEquals(_methodParameterTypes227, parameterTypes)) { return IntPraticaLocalServiceUtil.updateIntPraticaSorteggio(((Long)arguments[0]).longValue(), (java.util.Date)arguments[1]); } - if (_methodName227.equals(name) && - Arrays.deepEquals(_methodParameterTypes227, parameterTypes)) { + if (_methodName228.equals(name) && + Arrays.deepEquals(_methodParameterTypes228, parameterTypes)) { return IntPraticaLocalServiceUtil.updateIntPraticaSorteggio(((Long)arguments[0]).longValue(), (java.util.Date)arguments[1], (java.lang.String)arguments[2]); } - if (_methodName228.equals(name) && - Arrays.deepEquals(_methodParameterTypes228, parameterTypes)) { + if (_methodName229.equals(name) && + Arrays.deepEquals(_methodParameterTypes229, parameterTypes)) { return IntPraticaLocalServiceUtil.findByC_UserId(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName229.equals(name) && - Arrays.deepEquals(_methodParameterTypes229, parameterTypes)) { + if (_methodName230.equals(name) && + Arrays.deepEquals(_methodParameterTypes230, parameterTypes)) { return IntPraticaLocalServiceUtil.countByC_UserId(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName230.equals(name) && - Arrays.deepEquals(_methodParameterTypes230, parameterTypes)) { + if (_methodName231.equals(name) && + Arrays.deepEquals(_methodParameterTypes231, parameterTypes)) { return IntPraticaLocalServiceUtil.fetchByOldIntPraticaId(((Long)arguments[0]).longValue()); } - if (_methodName231.equals(name) && - Arrays.deepEquals(_methodParameterTypes231, parameterTypes)) { + if (_methodName232.equals(name) && + Arrays.deepEquals(_methodParameterTypes232, parameterTypes)) { IntPraticaLocalServiceUtil.updateStatus(((Long)arguments[0]).longValue(), ((Integer)arguments[1]).intValue()); return null; } - if (_methodName232.equals(name) && - Arrays.deepEquals(_methodParameterTypes232, parameterTypes)) { + if (_methodName233.equals(name) && + Arrays.deepEquals(_methodParameterTypes233, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCompanyIdSoggettoProgetti(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName233.equals(name) && - Arrays.deepEquals(_methodParameterTypes233, parameterTypes)) { + if (_methodName234.equals(name) && + Arrays.deepEquals(_methodParameterTypes234, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCompanyIdSoggettoProgetti(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName235.equals(name) && - Arrays.deepEquals(_methodParameterTypes235, parameterTypes)) { + if (_methodName236.equals(name) && + Arrays.deepEquals(_methodParameterTypes236, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCompanyIdSoggettoArchivio(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName236.equals(name) && - Arrays.deepEquals(_methodParameterTypes236, parameterTypes)) { + if (_methodName237.equals(name) && + Arrays.deepEquals(_methodParameterTypes237, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCompanyIdSoggettoArchivio(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName238.equals(name) && - Arrays.deepEquals(_methodParameterTypes238, parameterTypes)) { + if (_methodName239.equals(name) && + Arrays.deepEquals(_methodParameterTypes239, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCompanyIdSoggettoAltriProgetti(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName239.equals(name) && - Arrays.deepEquals(_methodParameterTypes239, parameterTypes)) { + if (_methodName240.equals(name) && + Arrays.deepEquals(_methodParameterTypes240, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCompanyIdSoggettoAltriProgetti(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName241.equals(name) && - Arrays.deepEquals(_methodParameterTypes241, parameterTypes)) { + if (_methodName242.equals(name) && + Arrays.deepEquals(_methodParameterTypes242, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCanAddFineLavori(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName242.equals(name) && - Arrays.deepEquals(_methodParameterTypes242, parameterTypes)) { + if (_methodName243.equals(name) && + Arrays.deepEquals(_methodParameterTypes243, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCanAddFineLavori(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName244.equals(name) && - Arrays.deepEquals(_methodParameterTypes244, parameterTypes)) { + if (_methodName245.equals(name) && + Arrays.deepEquals(_methodParameterTypes245, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCanAddCollaudo(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName245.equals(name) && - Arrays.deepEquals(_methodParameterTypes245, parameterTypes)) { + if (_methodName246.equals(name) && + Arrays.deepEquals(_methodParameterTypes246, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCanAddCollaudo(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName247.equals(name) && - Arrays.deepEquals(_methodParameterTypes247, parameterTypes)) { + if (_methodName248.equals(name) && + Arrays.deepEquals(_methodParameterTypes248, parameterTypes)) { return IntPraticaLocalServiceUtil.search((java.util.List)arguments[0], ((Integer)arguments[1]).intValue(), ((Integer)arguments[2]).intValue()); } - if (_methodName248.equals(name) && - Arrays.deepEquals(_methodParameterTypes248, parameterTypes)) { + if (_methodName249.equals(name) && + Arrays.deepEquals(_methodParameterTypes249, parameterTypes)) { return IntPraticaLocalServiceUtil.countSearch((java.util.List)arguments[0]); } - if (_methodName249.equals(name) && - Arrays.deepEquals(_methodParameterTypes249, parameterTypes)) { + if (_methodName250.equals(name) && + Arrays.deepEquals(_methodParameterTypes250, parameterTypes)) { return IntPraticaLocalServiceUtil.searchWithIntPraticaId((java.util.List)arguments[0], ((Long)arguments[1]).longValue(), ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName250.equals(name) && - Arrays.deepEquals(_methodParameterTypes250, parameterTypes)) { + if (_methodName251.equals(name) && + Arrays.deepEquals(_methodParameterTypes251, parameterTypes)) { return IntPraticaLocalServiceUtil.countSearchWithIntPraticaId((java.util.List)arguments[0], ((Long)arguments[1]).longValue()); } - if (_methodName251.equals(name) && - Arrays.deepEquals(_methodParameterTypes251, parameterTypes)) { + if (_methodName252.equals(name) && + Arrays.deepEquals(_methodParameterTypes252, 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 (_methodName252.equals(name) && - Arrays.deepEquals(_methodParameterTypes252, parameterTypes)) { + if (_methodName253.equals(name) && + Arrays.deepEquals(_methodParameterTypes253, parameterTypes)) { return IntPraticaLocalServiceUtil.generateFileAnnullamento(((Long)arguments[0]).longValue(), (com.liferay.portal.service.ServiceContext)arguments[1]); } - if (_methodName253.equals(name) && - Arrays.deepEquals(_methodParameterTypes253, parameterTypes)) { + if (_methodName254.equals(name) && + Arrays.deepEquals(_methodParameterTypes254, parameterTypes)) { IntPraticaLocalServiceUtil.deleteFileAnnullamento(((Long)arguments[0]).longValue()); return null; } - if (_methodName254.equals(name) && - Arrays.deepEquals(_methodParameterTypes254, parameterTypes)) { + if (_methodName255.equals(name) && + Arrays.deepEquals(_methodParameterTypes255, parameterTypes)) { IntPraticaLocalServiceUtil.completeAnnullamento(((Long)arguments[0]).longValue()); return null; } - if (_methodName255.equals(name) && - Arrays.deepEquals(_methodParameterTypes255, parameterTypes)) { + if (_methodName256.equals(name) && + Arrays.deepEquals(_methodParameterTypes256, parameterTypes)) { IntPraticaLocalServiceUtil.cambiaIstruttore(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Long)arguments[2]).longValue()); @@ -877,67 +888,59 @@ public class IntPraticaLocalServiceClpInvoker { return null; } - if (_methodName256.equals(name) && - Arrays.deepEquals(_methodParameterTypes256, parameterTypes)) { + if (_methodName257.equals(name) && + Arrays.deepEquals(_methodParameterTypes257, parameterTypes)) { return IntPraticaLocalServiceUtil.countCaricoLavoroCF(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (java.lang.Boolean)arguments[2], (java.lang.Long[])arguments[3]); } - if (_methodName257.equals(name) && - Arrays.deepEquals(_methodParameterTypes257, parameterTypes)) { - return IntPraticaLocalServiceUtil.countCaricoLavoroIstruttore(((Long)arguments[0]).longValue(), - (java.lang.String)arguments[1], (java.lang.Boolean)arguments[2]); - } - if (_methodName258.equals(name) && Arrays.deepEquals(_methodParameterTypes258, parameterTypes)) { - return IntPraticaLocalServiceUtil.generateReportPratica((it.tref.liferay.portos.bo.model.IntPratica)arguments[0], - ((Long)arguments[1]).longValue()); + return IntPraticaLocalServiceUtil.countCaricoLavoroIstruttore(((Long)arguments[0]).longValue(), + (java.lang.String)arguments[1], (java.lang.Boolean)arguments[2]); } if (_methodName259.equals(name) && Arrays.deepEquals(_methodParameterTypes259, parameterTypes)) { - return IntPraticaLocalServiceUtil.updateModifiedDate(((Long)arguments[0]).longValue(), - (java.util.Date)arguments[1]); + return IntPraticaLocalServiceUtil.generateReportPratica((it.tref.liferay.portos.bo.model.IntPratica)arguments[0], + ((Long)arguments[1]).longValue()); } if (_methodName260.equals(name) && Arrays.deepEquals(_methodParameterTypes260, parameterTypes)) { - return IntPraticaLocalServiceUtil.countAutorizzazione((java.util.Date)arguments[0], - (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); + return IntPraticaLocalServiceUtil.updateModifiedDate(((Long)arguments[0]).longValue(), + (java.util.Date)arguments[1]); } if (_methodName261.equals(name) && Arrays.deepEquals(_methodParameterTypes261, parameterTypes)) { - return IntPraticaLocalServiceUtil.countSanatorie((java.util.Date)arguments[0], + return IntPraticaLocalServiceUtil.countAutorizzazione((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); } if (_methodName262.equals(name) && Arrays.deepEquals(_methodParameterTypes262, parameterTypes)) { - return IntPraticaLocalServiceUtil.countOpereMinoreImportanza((java.util.Date)arguments[0], + return IntPraticaLocalServiceUtil.countSanatorie((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); } if (_methodName263.equals(name) && Arrays.deepEquals(_methodParameterTypes263, parameterTypes)) { - return IntPraticaLocalServiceUtil.countDeposito((java.util.Date)arguments[0], - (java.util.Date)arguments[1], ((Long)arguments[2]).longValue(), - ((Boolean)arguments[3]).booleanValue()); + return IntPraticaLocalServiceUtil.countOpereMinoreImportanza((java.util.Date)arguments[0], + (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); } if (_methodName264.equals(name) && Arrays.deepEquals(_methodParameterTypes264, parameterTypes)) { - return IntPraticaLocalServiceUtil.countVidimate((java.util.Date)arguments[0], + return IntPraticaLocalServiceUtil.countDeposito((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue(), - (java.lang.String)arguments[3], - ((Boolean)arguments[4]).booleanValue()); + ((Boolean)arguments[3]).booleanValue()); } if (_methodName265.equals(name) && Arrays.deepEquals(_methodParameterTypes265, parameterTypes)) { - return IntPraticaLocalServiceUtil.countControllo((java.util.Date)arguments[0], + return IntPraticaLocalServiceUtil.countVidimate((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue(), (java.lang.String)arguments[3], ((Boolean)arguments[4]).booleanValue()); @@ -945,32 +948,32 @@ public class IntPraticaLocalServiceClpInvoker { if (_methodName266.equals(name) && Arrays.deepEquals(_methodParameterTypes266, parameterTypes)) { - return IntPraticaLocalServiceUtil.importaVecchiFilesFascicolo(((Long)arguments[0]).longValue(), - ((Integer)arguments[1]).intValue(), - ((Integer)arguments[2]).intValue()); + return IntPraticaLocalServiceUtil.countControllo((java.util.Date)arguments[0], + (java.util.Date)arguments[1], ((Long)arguments[2]).longValue(), + (java.lang.String)arguments[3], + ((Boolean)arguments[4]).booleanValue()); } if (_methodName267.equals(name) && Arrays.deepEquals(_methodParameterTypes267, parameterTypes)) { - return IntPraticaLocalServiceUtil.findIntPraticaNotExist(); + return IntPraticaLocalServiceUtil.importaVecchiFilesFascicolo(((Long)arguments[0]).longValue(), + ((Integer)arguments[1]).intValue(), + ((Integer)arguments[2]).intValue()); } if (_methodName268.equals(name) && Arrays.deepEquals(_methodParameterTypes268, parameterTypes)) { - return IntPraticaLocalServiceUtil.riparaWorkflow(); + return IntPraticaLocalServiceUtil.findIntPraticaNotExist(); } if (_methodName269.equals(name) && Arrays.deepEquals(_methodParameterTypes269, parameterTypes)) { - IntPraticaLocalServiceUtil.reIndexFascicolo((it.tref.liferay.portos.bo.model.IntPratica)arguments[0], - ((Long)arguments[1]).longValue()); - - return null; + return IntPraticaLocalServiceUtil.riparaWorkflow(); } if (_methodName270.equals(name) && Arrays.deepEquals(_methodParameterTypes270, parameterTypes)) { - IntPraticaLocalServiceUtil.reIndexFasciolo((java.lang.String)arguments[0], + IntPraticaLocalServiceUtil.reIndexFascicolo((it.tref.liferay.portos.bo.model.IntPratica)arguments[0], ((Long)arguments[1]).longValue()); return null; @@ -978,7 +981,7 @@ public class IntPraticaLocalServiceClpInvoker { if (_methodName271.equals(name) && Arrays.deepEquals(_methodParameterTypes271, parameterTypes)) { - IntPraticaLocalServiceUtil.reIndexFasciolo(((Long)arguments[0]).longValue(), + IntPraticaLocalServiceUtil.reIndexFasciolo((java.lang.String)arguments[0], ((Long)arguments[1]).longValue()); return null; @@ -986,59 +989,67 @@ public class IntPraticaLocalServiceClpInvoker { if (_methodName272.equals(name) && Arrays.deepEquals(_methodParameterTypes272, parameterTypes)) { - return IntPraticaLocalServiceUtil.trovaDoppioni(); + IntPraticaLocalServiceUtil.reIndexFasciolo(((Long)arguments[0]).longValue(), + ((Long)arguments[1]).longValue()); + + return null; } if (_methodName273.equals(name) && Arrays.deepEquals(_methodParameterTypes273, parameterTypes)) { - return IntPraticaLocalServiceUtil.findByNumeroProgetto((java.lang.String)arguments[0]); + return IntPraticaLocalServiceUtil.trovaDoppioni(); } if (_methodName274.equals(name) && Arrays.deepEquals(_methodParameterTypes274, parameterTypes)) { - return IntPraticaLocalServiceUtil.findByTerritorioId(((Long)arguments[0]).longValue()); + return IntPraticaLocalServiceUtil.findByNumeroProgetto((java.lang.String)arguments[0]); } if (_methodName275.equals(name) && Arrays.deepEquals(_methodParameterTypes275, parameterTypes)) { - return IntPraticaLocalServiceUtil.reportTempisticheIstruttorieAvvisiAutorizzazioni((java.util.Date)arguments[0], - (java.util.Date)arguments[1], ((Long)arguments[2]).longValue(), - (java.lang.String)arguments[3]); + return IntPraticaLocalServiceUtil.findByTerritorioId(((Long)arguments[0]).longValue()); } if (_methodName276.equals(name) && Arrays.deepEquals(_methodParameterTypes276, parameterTypes)) { - return IntPraticaLocalServiceUtil.reportTempisticheIstruttorieCalcolaDataSorteggio((java.util.Date)arguments[0], - (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); + return IntPraticaLocalServiceUtil.reportTempisticheIstruttorieAvvisiAutorizzazioni((java.util.Date)arguments[0], + (java.util.Date)arguments[1], ((Long)arguments[2]).longValue(), + (java.lang.String)arguments[3]); } if (_methodName277.equals(name) && Arrays.deepEquals(_methodParameterTypes277, parameterTypes)) { - return IntPraticaLocalServiceUtil.reportPraticheVidimate((java.util.Date)arguments[0], - (java.util.Date)arguments[1], ((Long)arguments[2]).longValue(), - (java.lang.String)arguments[3]); + return IntPraticaLocalServiceUtil.reportTempisticheIstruttorieCalcolaDataSorteggio((java.util.Date)arguments[0], + (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); } if (_methodName278.equals(name) && Arrays.deepEquals(_methodParameterTypes278, parameterTypes)) { - return IntPraticaLocalServiceUtil.reportPraticheVidimateCalcolaDataSorteggio((java.util.Date)arguments[0], - (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); + return IntPraticaLocalServiceUtil.reportPraticheVidimate((java.util.Date)arguments[0], + (java.util.Date)arguments[1], ((Long)arguments[2]).longValue(), + (java.lang.String)arguments[3]); } if (_methodName279.equals(name) && Arrays.deepEquals(_methodParameterTypes279, parameterTypes)) { - return IntPraticaLocalServiceUtil.countIngressiAutorizzazioni((java.util.Date)arguments[0], + return IntPraticaLocalServiceUtil.reportPraticheVidimateCalcolaDataSorteggio((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); } if (_methodName280.equals(name) && Arrays.deepEquals(_methodParameterTypes280, parameterTypes)) { - return IntPraticaLocalServiceUtil.countIngressiDepositi((java.util.Date)arguments[0], + return IntPraticaLocalServiceUtil.countIngressiAutorizzazioni((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); } if (_methodName281.equals(name) && Arrays.deepEquals(_methodParameterTypes281, parameterTypes)) { + return IntPraticaLocalServiceUtil.countIngressiDepositi((java.util.Date)arguments[0], + (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); + } + + if (_methodName282.equals(name) && + Arrays.deepEquals(_methodParameterTypes282, parameterTypes)) { return IntPraticaLocalServiceUtil.countIngressiCO((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); } @@ -1100,32 +1111,32 @@ public class IntPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes207; private String _methodName208; private String[] _methodParameterTypes208; - private String _methodName210; - private String[] _methodParameterTypes210; + private String _methodName209; + private String[] _methodParameterTypes209; private String _methodName211; private String[] _methodParameterTypes211; private String _methodName212; private String[] _methodParameterTypes212; private String _methodName213; private String[] _methodParameterTypes213; - private String _methodName215; - private String[] _methodParameterTypes215; + private String _methodName214; + private String[] _methodParameterTypes214; private String _methodName216; private String[] _methodParameterTypes216; private String _methodName217; private String[] _methodParameterTypes217; private String _methodName218; private String[] _methodParameterTypes218; - private String _methodName220; - private String[] _methodParameterTypes220; - private String _methodName222; - private String[] _methodParameterTypes222; + private String _methodName219; + private String[] _methodParameterTypes219; + private String _methodName221; + private String[] _methodParameterTypes221; private String _methodName223; private String[] _methodParameterTypes223; private String _methodName224; private String[] _methodParameterTypes224; - private String _methodName226; - private String[] _methodParameterTypes226; + private String _methodName225; + private String[] _methodParameterTypes225; private String _methodName227; private String[] _methodParameterTypes227; private String _methodName228; @@ -1140,24 +1151,24 @@ public class IntPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes232; private String _methodName233; private String[] _methodParameterTypes233; - private String _methodName235; - private String[] _methodParameterTypes235; + private String _methodName234; + private String[] _methodParameterTypes234; private String _methodName236; private String[] _methodParameterTypes236; - private String _methodName238; - private String[] _methodParameterTypes238; + private String _methodName237; + private String[] _methodParameterTypes237; private String _methodName239; private String[] _methodParameterTypes239; - private String _methodName241; - private String[] _methodParameterTypes241; + private String _methodName240; + private String[] _methodParameterTypes240; private String _methodName242; private String[] _methodParameterTypes242; - private String _methodName244; - private String[] _methodParameterTypes244; + private String _methodName243; + private String[] _methodParameterTypes243; private String _methodName245; private String[] _methodParameterTypes245; - private String _methodName247; - private String[] _methodParameterTypes247; + private String _methodName246; + private String[] _methodParameterTypes246; private String _methodName248; private String[] _methodParameterTypes248; private String _methodName249; @@ -1226,4 +1237,6 @@ public class IntPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes280; private String _methodName281; private String[] _methodParameterTypes281; + private String _methodName282; + private String[] _methodParameterTypes282; } \ 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/AsseverazioneLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java index 7203a4f6..4fb6e8c5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java @@ -344,11 +344,6 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase TipoSoggettoUtil.DIRETTORE_LAVORI, TipoSoggettoUtil.DITTA, TipoSoggettoUtil.PROGETTISTA }; - // if (SoggettiUtil.isTitolareInCommittenti(intPraticaId)) { - if (ValidazionePraticaUtil.isA98Required(dettPratica)) { - tipoSoggetti = (String[]) ArrayUtils.removeElement(tipoSoggetti, - TipoSoggettoUtil.COMMITTENTE); - } List soggettiPrincipali = soggettoLocalService .getSoggettiPrincipaliValidTmpByDettPratica_TipologiaSoggetto(dettPraticaId, tipoSoggetti); @@ -356,13 +351,7 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase } for (Soggetto soggetto : nuoviSoggetti) { - if (TipoSoggettoUtil.COMMITTENTE.equalsIgnoreCase(soggetto.getTipologiaSoggetto())) { - if (!ValidazionePraticaUtil.isA98Required(dettPratica)) { - addAsseverazione(serviceContext.getUserId(), dettPratica.getIntPraticaId(), - dettPraticaId, soggetto.getTipologiaSoggetto(), soggetto.getCodiceFiscale(), - serviceContext); - } - } else { + if (!TipoSoggettoUtil.COMMITTENTE.equalsIgnoreCase(soggetto.getTipologiaSoggetto())) { addAsseverazione(serviceContext.getUserId(), dettPratica.getIntPraticaId(), dettPraticaId, soggetto.getTipologiaSoggetto(), soggetto.getCodiceFiscale(), serviceContext); @@ -375,8 +364,7 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase List soggetti = soggettoLocalService.getValidTmpByIntPratica(dettPratica .getIntPraticaId()); for (Soggetto soggetto : soggetti) { - if ((TipoSoggettoUtil.COMMITTENTE.equalsIgnoreCase(soggetto.getTipologiaSoggetto()) && !ValidazionePraticaUtil - .isA98Required(dettPratica)) + if ((TipoSoggettoUtil.COMMITTENTE.equalsIgnoreCase(soggetto.getTipologiaSoggetto())) || TipoSoggettoUtil.DITTA.equalsIgnoreCase(soggetto.getTipologiaSoggetto()) || TipoSoggettoUtil.DIRETTORE_LAVORI .equalsIgnoreCase(soggetto.getTipologiaSoggetto()) 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 04c7f37a..bf9de53f 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 @@ -48,13 +48,13 @@ import it.tref.liferay.portos.bo.service.persistence.IntPraticaActionableDynamic import it.tref.liferay.portos.bo.service.persistence.IntPraticaFinderUtil; import it.tref.liferay.portos.bo.shared.bean.FirmeBean; import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants; -import it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil; import it.tref.liferay.portos.bo.shared.util.FascicoloURLUtil; import it.tref.liferay.portos.bo.shared.util.FirmeUtil; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; import it.tref.liferay.portos.bo.util.AvvisoUtil; import it.tref.liferay.portos.bo.util.AzioniPraticheUtil; import it.tref.liferay.portos.bo.util.Constants; +import it.tref.liferay.portos.bo.util.DocumentiPraticaUtil; import it.tref.liferay.portos.bo.util.MailUtil; import it.tref.liferay.portos.bo.util.PraticaUtil; import it.tref.liferay.portos.bo.util.WorkflowConstants; @@ -120,6 +120,8 @@ import com.liferay.portal.kernel.workflow.WorkflowHandlerRegistryUtil; import com.liferay.portal.kernel.workflow.WorkflowInstance; import com.liferay.portal.kernel.workflow.WorkflowTask; import com.liferay.portal.model.Company; +import com.liferay.portal.model.Group; +import com.liferay.portal.model.Organization; import com.liferay.portal.model.Role; import com.liferay.portal.model.User; import com.liferay.portal.model.WorkflowInstanceLink; @@ -144,6 +146,8 @@ import com.liferay.portlet.documentlibrary.service.DLFileEntryLocalServiceUtil; import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; import com.liferay.portlet.dynamicdatamapping.model.DDMContent; import com.liferay.portlet.dynamicdatamapping.model.DDMStorageLink; +import com.liferay.portlet.journal.model.JournalArticle; +import com.liferay.portlet.journal.model.JournalFolder; import com.liferay.portlet.messageboards.model.MBDiscussion; import com.liferay.portlet.social.model.SocialActivity; @@ -357,21 +361,44 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { Connection connection = DataAccess.getUpgradeOptimizedConnection(); Statement s = connection.createStatement(); + long controlloPraticaClassNameId = ClassNameLocalServiceUtil.getClassName( + ControlloPratica.class.getName()).getClassNameId(); + long dettPraticaClassNameId = ClassNameLocalServiceUtil.getClassName(DettPratica.class.getName()) + .getClassNameId(); + long dlFileEntryClassNameId = ClassNameLocalServiceUtil.getClassName(DLFileEntry.class.getName()) + .getClassNameId(); + long dlFolderClassNameId = ClassNameLocalServiceUtil.getClassName(DLFolder.class.getName()) + .getClassNameId(); + long groupClassNameId = ClassNameLocalServiceUtil.getClassName(Group.class.getName()) + .getClassNameId(); + long mbDiscussionClassNameId = ClassNameLocalServiceUtil.getClassName( + MBDiscussion.class.getName()).getClassNameId(); + long organizationClassNameId = ClassNameLocalServiceUtil.getClassName( + Organization.class.getName()).getClassNameId(); long userClassNameId = ClassNameLocalServiceUtil.getClassName(User.class.getName()) .getClassNameId(); - esito.add("User: " + userClassNameId); + + rows = s.executeUpdate("DELETE FROM portos_bo_avviso WHERE avvisoid IN (" + + "SELECT avvisoid FROM portos_bo_avviso a LEFT JOIN portos_bo_dettpratica d " + + "ON a.classpk=d.dettpraticaid WHERE classname='" + DettPratica.class.getName() + + "' AND d.dettpraticaid IS NULL)"); + esitoLog(esito, "Cancellate " + rows + " righe da portos_bo_avviso"); + rows = s.executeUpdate("DELETE FROM group_ WHERE groupid IN (SELECT groupid FROM group_ " + "LEFT JOIN user_ ON group_.classpk=user_.userid WHERE classnameid=" + userClassNameId + " AND user_.userid IS NULL)"); esitoLog(esito, "Cancellate " + rows + " righe da group_"); + rows = s.executeUpdate("DELETE FROM contact_ WHERE contactid IN (" + "SELECT c.contactid FROM contact_ c LEFT JOIN user_ u " + "ON c.contactid=u.contactid WHERE u.userid IS NULL)"); esitoLog(esito, "Cancellate " + rows + " righe da contact_"); + rows = s.executeUpdate("DELETE FROM usergroup WHERE usergroupid IN (" + "SELECT usergroupid FROM usergroup g LEFT JOIN user_ u ON g.userid=u.userid " + "WHERE u.userid IS NULL)"); esitoLog(esito, "Cancellate " + rows + " righe da usergroup"); + rows = s.executeUpdate("DELETE FROM usergrouprole WHERE userid IN (" + "SELECT DISTINCT x.userid FROM usergrouprole x " + "LEFT JOIN user_ u ON x.userid=u.userid " + "WHERE u.userid IS NULL) OR groupid IN (" @@ -382,6 +409,103 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { + "LEFT JOIN role_ r ON x.roleid=r.roleid " + "WHERE r.roleid IS NULL)"); esitoLog(esito, "Cancellate " + rows + " righe da usergrouprole"); + rows = s.executeUpdate("DELETE FROM ddmcontent WHERE contentid IN (" + + "SELECT contentid FROM ddmcontent LEFT JOIN dlfileentrymetadata " + + "ON ddmcontent.contentid=dlfileentrymetadata.ddmstorageid WHERE name='" + + DDMStorageLink.class.getName() + + "' AND dlfileentrymetadata.fileentrymetadataid IS NULL)"); + esitoLog(esito, "Cancellate " + rows + " righe da ddmcontent"); + + rows = s.executeUpdate("DELETE FROM assetentry WHERE entryid IN (" + + "SELECT entryid FROM assetentry a LEFT JOIN dlfileentry b " + + "ON a.classpk=b.fileentryid WHERE a.classnameid=" + dlFileEntryClassNameId + + " AND b.fileentryid IS NULL)"); + rows += s.executeUpdate("DELETE FROM assetentry WHERE entryid IN (" + + "SELECT entryid FROM assetentry a LEFT JOIN dlfolder b ON a.classpk=b.folderid " + + "WHERE a.classnameid=" + dlFolderClassNameId + " AND b.folderid IS NULL)"); + rows += s.executeUpdate("DELETE FROM assetentry WHERE entryid IN (" + + "SELECT entryid FROM assetentry a LEFT JOIN group_ b ON a.classpk=b.groupid " + + "WHERE a.classnameid=" + groupClassNameId + " AND b.groupid IS NULL)"); + rows += s.executeUpdate("DELETE FROM assetentry WHERE entryid IN (" + + "SELECT entryid FROM assetentry a LEFT JOIN mbdiscussion b " + + "ON a.classpk=b.discussionid WHERE a.classnameid=" + mbDiscussionClassNameId + + " AND b.discussionid IS NULL)"); + rows += s.executeUpdate("DELETE FROM assetentry WHERE entryid IN (" + + "SELECT entryid FROM assetentry a LEFT JOIN organization_ b " + + "ON a.classpk=b.organizationid WHERE a.classnameid=" + organizationClassNameId + + " AND b.organizationid IS NULL)"); + rows += s.executeUpdate("DELETE FROM assetentry WHERE entryid IN (" + + "SELECT entryid FROM assetentry a LEFT JOIN portos_bo_controllopratica b " + + "ON a.classpk=b.controllopraticaid WHERE a.classnameid=" + controlloPraticaClassNameId + + " AND b.controllopraticaid IS NULL)"); + rows += s.executeUpdate("DELETE FROM assetentry WHERE entryid IN (" + + "SELECT entryid FROM assetentry a LEFT JOIN portos_bo_dettpratica b " + + "ON a.classpk=b.dettpraticaid WHERE a.classnameid=" + dettPraticaClassNameId + + " AND b.dettpraticaid IS NULL)"); + rows += s.executeUpdate("DELETE FROM assetentry WHERE entryid IN (" + + "SELECT entryid FROM assetentry a LEFT JOIN user_ b ON a.classpk=b.userid " + + "WHERE a.classnameid=" + userClassNameId + " AND b.userid IS NULL)"); + esitoLog(esito, "Cancellate " + rows + " righe da assetentry"); + + rows = s.executeUpdate("DELETE FROM resourcepermission WHERE resourcepermissionid IN (" + + "SELECT resourcepermissionid FROM resourcepermission a LEFT JOIN dlfileentry b " + + "ON a.primkey=b.fileentryid::TEXT WHERE a.name='" + DLFileEntry.class.getName() + + "' AND b.fileentryid IS NULL)"); + rows += s.executeUpdate("DELETE FROM resourcepermission WHERE resourcepermissionid IN (" + + "SELECT resourcepermissionid FROM resourcepermission a LEFT JOIN dlfolder b " + + "ON a.primkey=b.folderid::TEXT WHERE a.name='" + DLFolder.class.getName() + + "' AND b.folderid IS NULL)"); + rows += s + .executeUpdate("DELETE FROM resourcepermission WHERE resourcepermissionid IN (" + + "SELECT resourcepermissionid FROM resourcepermission a LEFT JOIN portos_bo_controllopratica b " + + "ON a.primkey=b.controllopraticaid::TEXT WHERE a.name='" + + ControlloPratica.class.getName() + "' AND b.controllopraticaid IS NULL)"); + rows += s.executeUpdate("DELETE FROM resourcepermission WHERE resourcepermissionid IN (" + + "SELECT resourcepermissionid FROM resourcepermission a LEFT JOIN user_ b " + + "ON a.primkey=b.userid::TEXT WHERE a.name='" + User.class.getName() + + "' AND b.userid IS NULL)"); + esitoLog(esito, "Cancellate " + rows + " righe da resourcepermission"); + + rows = s.executeUpdate("DELETE FROM syncdlobject WHERE syncdlobjectid IN (" + + "SELECT syncdlobjectid FROM syncdlobject LEFT JOIN dlfileentry " + + "ON syncdlobject.typepk=dlfileentry.fileentryid WHERE type_='" + + DLSyncConstants.TYPE_FILE + "' AND dlfileentry.fileentryid IS NULL)"); + rows += s.executeUpdate("DELETE FROM syncdlobject WHERE syncdlobjectid IN (" + + "SELECT syncdlobjectid FROM syncdlobject LEFT JOIN dlfolder " + + "ON syncdlobject.typepk=dlfolder.folderid WHERE type_='" + DLSyncConstants.TYPE_FOLDER + + "' AND dlfolder.folderid IS NULL)"); + esitoLog(esito, "Cancellate " + rows + " righe da syncdlobject"); + + rows = s.executeUpdate("DELETE FROM ratingsstats WHERE statsid IN (" + + "SELECT statsid FROM ratingsstats a LEFT JOIN dlfileentry b " + + "ON a.classpk=b.fileentryid WHERE a.classnameid=" + dlFileEntryClassNameId + + " AND b.fileentryid IS NULL)"); + rows += s.executeUpdate("DELETE FROM ratingsstats WHERE statsid IN (" + + "SELECT statsid FROM ratingsstats a LEFT JOIN dlfolder b " + + "ON a.classpk=b.folderid WHERE a.classnameid=" + dlFolderClassNameId + + " AND b.folderid IS NULL)"); + rows += s.executeUpdate("DELETE FROM ratingsstats WHERE statsid IN (" + + "SELECT statsid FROM ratingsstats a LEFT JOIN portos_bo_controllopratica b " + + "ON a.classpk=b.controllopraticaid WHERE a.classnameid=" + controlloPraticaClassNameId + + " AND b.controllopraticaid IS NULL)"); + esitoLog(esito, "Cancellate " + rows + " righe da ratingsstats"); + + rows = s.executeUpdate("DELETE FROM mbmessage WHERE messageid IN (" + + "SELECT messageid FROM mbmessage a LEFT JOIN dlfileentry b " + + "ON a.classpk=b.fileentryid WHERE a.classnameid=" + + dlFileEntryClassNameId + " AND b.fileentryid IS NULL)"); + esitoLog(esito, "Cancellate " + rows + " righe da mbmessage"); + + rows = s.executeUpdate("DELETE FROM mbdiscussion WHERE discussionid IN (" + + "SELECT discussionid FROM mbdiscussion a LEFT JOIN dlfileentry b " + + "ON a.classpk=b.fileentryid WHERE a.classnameid=" + + dlFileEntryClassNameId + " AND b.fileentryid IS NULL)"); + esitoLog(esito, "Cancellate " + rows + " righe da mbdiscussion"); + + rows = s.executeUpdate("DELETE FROM mbthread WHERE threadid IN (" + + "SELECT DISTINCT mbthread.threadid FROM mbthread LEFT JOIN mbmessage " + + "ON mbthread.threadid=mbmessage.threadid WHERE mbmessage.messageid IS NULL)"); + esitoLog(esito, "Cancellate " + rows + " righe da mbthread"); } catch (SQLException | SystemException e) { esitoLog(esito, "Interrotto per errore: " + e.getMessage()); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java index b0d64d8e..2dd77197 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java @@ -17,7 +17,7 @@ import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.DocPratica; import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.service.base.SoggettoLocalServiceBaseImpl; -import it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil; +import it.tref.liferay.portos.bo.util.DocumentiPraticaUtil; import it.tref.liferay.portos.bo.util.SoggettiUtil; import it.tref.liferay.portos.bo.util.WorkflowConstants; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java index b040f227..5c96356f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchAllegatoManualeException; import it.tref.liferay.portos.bo.model.AllegatoManuale; import it.tref.liferay.portos.bo.model.impl.AllegatoManualeImpl; import it.tref.liferay.portos.bo.model.impl.AllegatoManualeModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AllegatoManualePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java index 63caa01d..15633d6f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchAsseverazioneException; import it.tref.liferay.portos.bo.model.Asseverazione; import it.tref.liferay.portos.bo.model.impl.AsseverazioneImpl; import it.tref.liferay.portos.bo.model.impl.AsseverazioneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AsseverazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java index b95c271d..38e33edc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchAvvisoException; import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.model.impl.AvvisoImpl; import it.tref.liferay.portos.bo.model.impl.AvvisoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AvvisoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java index a0e6a43b..4ce032ca 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchCollaudoException; import it.tref.liferay.portos.bo.model.Collaudo; import it.tref.liferay.portos.bo.model.impl.CollaudoImpl; import it.tref.liferay.portos.bo.model.impl.CollaudoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.CollaudoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java index b0b64b21..4a23bffd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunePersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchComuneException; import it.tref.liferay.portos.bo.model.Comune; import it.tref.liferay.portos.bo.model.impl.ComuneImpl; import it.tref.liferay.portos.bo.model.impl.ComuneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ComunePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java index 0b7f9ee2..f5b8166f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ComunicazionePersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchComunicazioneException; import it.tref.liferay.portos.bo.model.Comunicazione; import it.tref.liferay.portos.bo.model.impl.ComunicazioneImpl; import it.tref.liferay.portos.bo.model.impl.ComunicazioneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ComunicazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java index 66507dd0..32809343 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ConfigurazionePersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchConfigurazioneException; import it.tref.liferay.portos.bo.model.Configurazione; import it.tref.liferay.portos.bo.model.impl.ConfigurazioneImpl; import it.tref.liferay.portos.bo.model.impl.ConfigurazioneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ConfigurazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java index 48cf51eb..a4fa6f91 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ControlloPraticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchControlloPraticaException; import it.tref.liferay.portos.bo.model.ControlloPratica; import it.tref.liferay.portos.bo.model.impl.ControlloPraticaImpl; import it.tref.liferay.portos.bo.model.impl.ControlloPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ControlloPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java index 402cecd0..8c56fb32 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DelegaPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchDelegaException; import it.tref.liferay.portos.bo.model.Delega; import it.tref.liferay.portos.bo.model.impl.DelegaImpl; import it.tref.liferay.portos.bo.model.impl.DelegaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DelegaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java index c7e5131d..f2c2fdfd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchDettPraticaException; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.impl.DettPraticaImpl; import it.tref.liferay.portos.bo.model.impl.DettPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DettPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java index 649a5476..c25ae1dc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchDocAggiuntivaException; import it.tref.liferay.portos.bo.model.DocAggiuntiva; import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaImpl; import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DocAggiuntivaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java index 42630357..255330f7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchDocPraticaException; import it.tref.liferay.portos.bo.model.DocPratica; import it.tref.liferay.portos.bo.model.impl.DocPraticaImpl; import it.tref.liferay.portos.bo.model.impl.DocPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DocPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java index a5f79405..7ba24480 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchFineLavoriException; import it.tref.liferay.portos.bo.model.FineLavori; import it.tref.liferay.portos.bo.model.impl.FineLavoriImpl; import it.tref.liferay.portos.bo.model.impl.FineLavoriModelImpl; +import it.tref.liferay.portos.bo.service.persistence.FineLavoriPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java index ad50d7ea..f80406ab 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/HistoryWorkflowActionPersistenceImpl.java @@ -42,6 +42,7 @@ import it.tref.liferay.portos.bo.NoSuchHistoryWorkflowActionException; import it.tref.liferay.portos.bo.model.HistoryWorkflowAction; import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionImpl; import it.tref.liferay.portos.bo.model.impl.HistoryWorkflowActionModelImpl; +import it.tref.liferay.portos.bo.service.persistence.HistoryWorkflowActionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IUVPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IUVPersistenceImpl.java index a6ba54ac..6f469f0e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IUVPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IUVPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchIUVException; import it.tref.liferay.portos.bo.model.IUV; import it.tref.liferay.portos.bo.model.impl.IUVImpl; import it.tref.liferay.portos.bo.model.impl.IUVModelImpl; +import it.tref.liferay.portos.bo.service.persistence.IUVPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/InfoFascicoloPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/InfoFascicoloPersistenceImpl.java index 12f22a0a..b85535de 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/InfoFascicoloPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/InfoFascicoloPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchInfoFascicoloException; import it.tref.liferay.portos.bo.model.InfoFascicolo; import it.tref.liferay.portos.bo.model.impl.InfoFascicoloImpl; import it.tref.liferay.portos.bo.model.impl.InfoFascicoloModelImpl; +import it.tref.liferay.portos.bo.service.persistence.InfoFascicoloPersistence; import java.io.Serializable; 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 307036e1..ee52c9b7 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 @@ -48,6 +48,7 @@ import it.tref.liferay.portos.bo.NoSuchIntPraticaException; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.impl.IntPraticaImpl; import it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.IntPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java index 8dbf29df..ee3b3b9b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchPagamentoException; import it.tref.liferay.portos.bo.model.Pagamento; import it.tref.liferay.portos.bo.model.impl.PagamentoImpl; import it.tref.liferay.portos.bo.model.impl.PagamentoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.PagamentoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java index c6ce3907..e4133c60 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchParereGeologoException; import it.tref.liferay.portos.bo.model.ParereGeologo; import it.tref.liferay.portos.bo.model.impl.ParereGeologoImpl; import it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ParereGeologoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java index daa33e1b..2c7a846f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java @@ -43,6 +43,7 @@ import it.tref.liferay.portos.bo.NoSuchProvinciaException; import it.tref.liferay.portos.bo.model.Provincia; import it.tref.liferay.portos.bo.model.impl.ProvinciaImpl; import it.tref.liferay.portos.bo.model.impl.ProvinciaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ProvinciaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java index 29c4a390..ef2db5f2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchSoggettoException; import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.model.impl.SoggettoImpl; import it.tref.liferay.portos.bo.model.impl.SoggettoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.SoggettoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java index ec8a983f..fc566b28 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchSorteggioException; import it.tref.liferay.portos.bo.model.Sorteggio; import it.tref.liferay.portos.bo.model.impl.SorteggioImpl; import it.tref.liferay.portos.bo.model.impl.SorteggioModelImpl; +import it.tref.liferay.portos.bo.service.persistence.SorteggioPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java index 78333501..0c095d3d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java @@ -42,6 +42,7 @@ import it.tref.liferay.portos.bo.NoSuchStoricoSoggettoPraticaException; import it.tref.liferay.portos.bo.model.StoricoSoggettoPratica; import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaImpl; import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.StoricoSoggettoPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java index 720078c4..252fc452 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchTempisticaException; import it.tref.liferay.portos.bo.model.Tempistica; import it.tref.liferay.portos.bo.model.impl.TempisticaImpl; import it.tref.liferay.portos.bo.model.impl.TempisticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.TempisticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java index a9c7f7d5..c8e0dee9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java @@ -44,6 +44,7 @@ import it.tref.liferay.portos.bo.NoSuchTerritorioException; import it.tref.liferay.portos.bo.model.Territorio; import it.tref.liferay.portos.bo.model.impl.TerritorioImpl; import it.tref.liferay.portos.bo.model.impl.TerritorioModelImpl; +import it.tref.liferay.portos.bo.service.persistence.TerritorioPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/UtentePortosPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/UtentePortosPersistenceImpl.java index 89f06b61..83b7ed61 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/UtentePortosPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/UtentePortosPersistenceImpl.java @@ -43,6 +43,7 @@ import it.tref.liferay.portos.bo.NoSuchUtentePortosException; import it.tref.liferay.portos.bo.model.UtentePortos; import it.tref.liferay.portos.bo.model.impl.UtentePortosImpl; import it.tref.liferay.portos.bo.model.impl.UtentePortosModelImpl; +import it.tref.liferay.portos.bo.service.persistence.UtentePortosPersistence; import java.io.Serializable; 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 426c2d9d..f3a9f0ee 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=2521 - build.date=1599034143404 + build.number=2536 + build.date=1599139129864 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/cronologia/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/cronologia/view.jsp index c064d7bd..2a9a3003 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/cronologia/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/cronologia/view.jsp @@ -1,5 +1,5 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil"%> +<%@page import="it.tref.liferay.portos.bo.util.DocumentiPraticaUtil"%> <%@page import="com.liferay.portal.service.GroupLocalServiceUtil"%> <%@page import="com.liferay.portal.model.User"%> <%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_allegati.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_allegati.jsp index 65b249fb..90dada08 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_allegati.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_allegati.jsp @@ -7,7 +7,7 @@ <%@page import="com.liferay.portlet.documentlibrary.service.DLFileEntryServiceUtil"%> <%@page import="java.text.DateFormat"%> <%@page import="javax.swing.text.html.parser.DocumentParser"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil"%> +<%@page import="it.tref.liferay.portos.bo.util.DocumentiPraticaUtil"%> <%@page import="it.tref.liferay.portos.bo.util.MockAllegato"%> <%@page import="java.util.List"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_allegati_annullamento.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_allegati_annullamento.jsp index d23ac1a6..b14832d0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_allegati_annullamento.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_allegati_annullamento.jsp @@ -7,7 +7,7 @@ <%@page import="com.liferay.portlet.documentlibrary.service.DLFileEntryServiceUtil"%> <%@page import="java.text.DateFormat"%> <%@page import="javax.swing.text.html.parser.DocumentParser"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil"%> +<%@page import="it.tref.liferay.portos.bo.util.DocumentiPraticaUtil"%> <%@page import="it.tref.liferay.portos.bo.util.MockAllegato"%> <%@page import="java.util.List"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_co_allegati.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_co_allegati.jsp index 482574ef..ad906f19 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_co_allegati.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_co_allegati.jsp @@ -3,7 +3,7 @@ <%@page import="com.liferay.portal.kernel.servlet.ServletContextPool"%> <%@page import="java.util.ArrayList"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil"%> +<%@page import="it.tref.liferay.portos.bo.util.DocumentiPraticaUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> <%@ include file="/html/fascicolo/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_fl_allegati.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_fl_allegati.jsp index 557c387d..600c35bf 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_fl_allegati.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_fl_allegati.jsp @@ -3,7 +3,7 @@ <%@page import="com.liferay.portal.kernel.servlet.ServletContextPool"%> <%@page import="java.util.ArrayList"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil"%> +<%@page import="it.tref.liferay.portos.bo.util.DocumentiPraticaUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> <%@ include file="/html/fascicolo/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_in_allegati.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_in_allegati.jsp index d81645c8..268623ef 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_in_allegati.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_in_allegati.jsp @@ -4,7 +4,7 @@ <%@page import="com.liferay.portal.kernel.servlet.ServletContextPool"%> <%@page import="java.util.ArrayList"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil"%> +<%@page import="it.tref.liferay.portos.bo.util.DocumentiPraticaUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> <%@ include file="/html/fascicolo/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_va_allegati.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_va_allegati.jsp index dca53deb..6a6a1f10 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_va_allegati.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/fascicolo/navigator/page_va_allegati.jsp @@ -4,7 +4,7 @@ <%@page import="com.liferay.portal.kernel.servlet.ServletContextPool"%> <%@page import="java.util.ArrayList"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil"%> +<%@page import="it.tref.liferay.portos.bo.util.DocumentiPraticaUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil"%> <%@ include file="/html/fascicolo/init.jsp" %> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/AllegatiPraticaPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/AllegatiPraticaPortlet.java index 89650312..3d9fb963 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/AllegatiPraticaPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/AllegatiPraticaPortlet.java @@ -34,10 +34,10 @@ import it.tref.liferay.portos.bo.service.DocPraticaServiceUtil; import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.shared.bean.FirmeBean; import it.tref.liferay.portos.bo.shared.util.Constants; -import it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil; import it.tref.liferay.portos.bo.shared.util.FirmeUtil; import it.tref.liferay.portos.bo.shared.util.PortletKeys; import it.tref.liferay.portos.bo.util.DelegheUtil; +import it.tref.liferay.portos.bo.util.DocumentiPraticaUtil; import it.tref.liferay.portos.bo.util.FilesImporter; import java.io.File; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java index 39dc04d7..9d008dc3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java @@ -568,25 +568,23 @@ public class FascicoloFePortlet extends MVCPortlet { } - public void addFascicolo(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { + public void addFascicolo(ActionRequest actionRequest, ActionResponse actionResponse) + throws PortalException, SystemException, IOException { - try { - long territorioId = ParamUtil.getLong(actionRequest, "territorioId"); - String tipoProcedura = ParamUtil.getString(actionRequest, "tipoProcedura"); - String successURL = ParamUtil.getString(actionRequest, "successURL"); - ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); - DettPratica dettPratica = DettPraticaServiceUtil.addDettPratica(territorioId, tipoProcedura, - serviceContext); + long comuneId = ParamUtil.getLong(actionRequest, "comune"); + Territorio territorio = TerritorioLocalServiceUtil.findByComuneId(comuneId, 0, 1).get(0); - successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "mvcPath", - "/html/fascicolofe/edit_fascicolo.jsp"); - successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "dettPraticaId", - String.valueOf(dettPratica.getDettPraticaId())); - actionResponse.sendRedirect(successURL); - } catch (PortalException | SystemException e) { - _log.error(e, e); - throw e; - } + String tipoProcedura = ParamUtil.getString(actionRequest, "tipoProcedura"); + String successURL = ParamUtil.getString(actionRequest, "successURL"); + ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); + DettPratica dettPratica = DettPraticaServiceUtil.addDettPratica(territorio.getTerritorioId(), + tipoProcedura, serviceContext); + + successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "mvcPath", + "/html/fascicolofe/edit_fascicolo.jsp"); + successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "dettPraticaId", + String.valueOf(dettPratica.getDettPraticaId())); + actionResponse.sendRedirect(successURL); } public void addDelega(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { @@ -1296,12 +1294,13 @@ public class FascicoloFePortlet extends MVCPortlet { String livelloDiTutela = ParamUtil.getString(actionRequest, "livelloDiTutela"); String paesaggioLocale = ParamUtil.getString(actionRequest, "paesaggioLocale"); String vincoli = ParamUtil.getString(actionRequest, "vincoli"); - String destinazioneAltroIntervento = ParamUtil.getString(actionRequest, "destinazioneAltroIntervento"); + String destinazioneAltroIntervento = ParamUtil + .getString(actionRequest, "destinazioneAltroIntervento"); Boolean tcCostruzioniEsistenti = ParamUtil.getBoolean(actionRequest, "tcCostruzioniEsistenti"); Boolean tcManutOrdStraord = ParamUtil.getBoolean(actionRequest, "tcManutOrdStraord"); Boolean tcAltriInterventi = ParamUtil.getBoolean(actionRequest, "tcAltriInterventi"); String tcAltriInterventiDesc = ParamUtil.getString(actionRequest, "tcAltriInterventiDesc"); - + boolean collaudoStatico = ParamUtil.getBoolean(actionRequest, "collaudoStatico"); boolean noCollaudo = ParamUtil.getBoolean(actionRequest, "noCollaudo"); boolean lavoriInEconomiaCommittente = ParamUtil.getBoolean(actionRequest, @@ -1358,11 +1357,13 @@ public class FascicoloFePortlet extends MVCPortlet { boolean tcAltro = ParamUtil.getBoolean(actionRequest, "tcAltro"); String tcAltroDescrizione = ParamUtil.getString(actionRequest, "tcAltroDescrizione"); boolean tcConDispositivi = ParamUtil.getBoolean(actionRequest, "tcConDispositivi"); - boolean tcNuovaCostruzionePertinenza = ParamUtil.getBoolean(actionRequest, "tcNuovaCostruzionePertinenza"); - boolean tcInterventoOpereEscavazione = ParamUtil.getBoolean(actionRequest, "tcInterventoOpereEscavazione"); + boolean tcNuovaCostruzionePertinenza = ParamUtil.getBoolean(actionRequest, + "tcNuovaCostruzionePertinenza"); + boolean tcInterventoOpereEscavazione = ParamUtil.getBoolean(actionRequest, + "tcInterventoOpereEscavazione"); boolean tcViarch = ParamUtil.getBoolean(actionRequest, "tcViarch"); boolean tcOperaA25 = ParamUtil.getBoolean(actionRequest, "tcOperaA25"); - + // Descrizione edificio String dePiani = ParamUtil.getString(actionRequest, "dePiani"); String deAltezza = ParamUtil.getString(actionRequest, "deAltezza"); @@ -1597,9 +1598,10 @@ public class FascicoloFePortlet extends MVCPortlet { normDprg01, normDprg02, normAnr, normArt3com3, normArt3com4, normOrd01, normDm04, normDm05, normCI01, normLTC01, suap, normSismaBonus, clRischioPreInt, clRischioPostInt, intervFinPub, intervFinPubDesc, serviceContext, bozza, disabledSubmit, geoDisabledSubmit, - paesaggioLocale, livelloDiTutela, vincoli, destinazioneAltroIntervento, tcCostruzioniEsistenti, tcManutOrdStraord, - tcAltriInterventi, tcAltriInterventiDesc, noCollaudo, tcNuovaCostruzionePertinenza, tcInterventoOpereEscavazione, - tcViarch, tcOperaA25); + paesaggioLocale, livelloDiTutela, vincoli, destinazioneAltroIntervento, + tcCostruzioniEsistenti, tcManutOrdStraord, tcAltriInterventi, tcAltriInterventiDesc, + noCollaudo, tcNuovaCostruzionePertinenza, tcInterventoOpereEscavazione, tcViarch, + tcOperaA25); String redirect = ParamUtil.getString(actionRequest, "redirect"); if (Validator.isNull(redirect)) { @@ -1775,7 +1777,7 @@ public class FascicoloFePortlet extends MVCPortlet { if (disabledCollaudoStatico) { collaudoStatico = dettCheck.getCollaudoStatico(); } - + boolean noCollaudo = ParamUtil.getBoolean(actionRequest, "noCollaudo"); boolean lavoriInEconomiaCommittente = ParamUtil.getBoolean(actionRequest, @@ -2008,17 +2010,19 @@ public class FascicoloFePortlet extends MVCPortlet { String livelloDiTutela = ParamUtil.getString(actionRequest, "livelloDiTutela"); String paesaggioLocale = ParamUtil.getString(actionRequest, "paesaggioLocale"); String vincoli = ParamUtil.getString(actionRequest, "vincoli"); - String destinazioneAltroIntervento = ParamUtil.getString(actionRequest, "destinazioneAltroIntervento"); + String destinazioneAltroIntervento = ParamUtil + .getString(actionRequest, "destinazioneAltroIntervento"); Boolean tcCostruzioniEsistenti = ParamUtil.getBoolean(actionRequest, "tcCostruzioniEsistenti"); Boolean tcManutOrdStraord = ParamUtil.getBoolean(actionRequest, "tcManutOrdStraord"); Boolean tcAltriInterventi = ParamUtil.getBoolean(actionRequest, "tcAltriInterventi"); String tcAltriInterventiDesc = ParamUtil.getString(actionRequest, "tcAltriInterventiDesc"); - Boolean tcNuovaCostruzionePertinenza = ParamUtil.getBoolean(actionRequest, "tcNuovaCostruzionePertinenza"); - Boolean tcInterventoOpereEscavazione = ParamUtil.getBoolean(actionRequest, "tcInterventoOpereEscavazione"); + Boolean tcNuovaCostruzionePertinenza = ParamUtil.getBoolean(actionRequest, + "tcNuovaCostruzionePertinenza"); + Boolean tcInterventoOpereEscavazione = ParamUtil.getBoolean(actionRequest, + "tcInterventoOpereEscavazione"); Boolean tcViarch = ParamUtil.getBoolean(actionRequest, "tcViarch"); Boolean tcOperaA25 = ParamUtil.getBoolean(actionRequest, "tcOperaA25"); - try { DettPraticaServiceUtil.updateDettPratica(userId, dettPratica.getDettPraticaId(), dettPratica.getIntPraticaId(), dettPratica.getIntegrazione(), protocollo, @@ -2078,9 +2082,10 @@ public class FascicoloFePortlet extends MVCPortlet { normDprg01, normDprg02, normAnr, normArt3com3, normArt3com4, normOrd01, normDm04, normDm05, normCI01, normLTC01, suap, normSismaBonus, clRischioPreInt, clRischioPostInt, intervFinPub, intervFinPubDesc, serviceContext, bozza, disabledSubmit, geoDisabledSubmit, - paesaggioLocale, livelloDiTutela, vincoli, destinazioneAltroIntervento, tcCostruzioniEsistenti, tcManutOrdStraord, - tcAltriInterventi, tcAltriInterventiDesc, noCollaudo, tcNuovaCostruzionePertinenza, - tcInterventoOpereEscavazione, tcViarch, tcOperaA25); + paesaggioLocale, livelloDiTutela, vincoli, destinazioneAltroIntervento, + tcCostruzioniEsistenti, tcManutOrdStraord, tcAltriInterventi, tcAltriInterventiDesc, + noCollaudo, tcNuovaCostruzionePertinenza, tcInterventoOpereEscavazione, tcViarch, + tcOperaA25); String redirect = ParamUtil.getString(actionRequest, "redirect"); if (Validator.isNull(redirect)) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/ReportFascicoloUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/ReportFascicoloUtil.java index 688da1e5..5e6d8624 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/ReportFascicoloUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/util/ReportFascicoloUtil.java @@ -27,12 +27,12 @@ import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; import it.tref.liferay.portos.bo.shared.bean.FirmeBean; import it.tref.liferay.portos.bo.shared.bean.FirmeDetail; import it.tref.liferay.portos.bo.shared.util.Constants; -import it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil; import it.tref.liferay.portos.bo.shared.util.FirmeUtil; import it.tref.liferay.portos.bo.shared.util.PagamentoConstants; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; import it.tref.liferay.portos.bo.util.AzioniPraticheUtil; +import it.tref.liferay.portos.bo.util.DocumentiPraticaUtil; import java.text.MessageFormat; import java.text.SimpleDateFormat; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/edit_allegato.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/edit_allegato.jsp index 3fb288b3..b9a07a0d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/edit_allegato.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/edit_allegato.jsp @@ -6,7 +6,7 @@ <%@page import="it.tref.liferay.portos.bo.model.FineLavori"%> <%@page import="java.util.ArrayList"%> <%@page import="it.tref.liferay.portos.bo.service.DocPraticaServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil"%> +<%@page import="it.tref.liferay.portos.bo.util.DocumentiPraticaUtil"%> <%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> <%@page import="java.util.Calendar"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp index 32167b08..59730773 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view.jsp @@ -15,7 +15,7 @@ <%@page import="it.tref.liferay.portos.bo.service.IntPraticaServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.model.IntPratica"%> <%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil"%> +<%@page import="it.tref.liferay.portos.bo.util.DocumentiPraticaUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.util.FirmeUtil"%> <%@page import="it.tref.liferay.portos.bo.shared.bean.FirmeBean"%> <%@page import="it.tref.liferay.portos.bo.model.DocPratica"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view_accordion.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view_accordion.jsp index 378dc1a5..810798c9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view_accordion.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/view_accordion.jsp @@ -23,7 +23,7 @@ <%@page import="com.liferay.portlet.documentlibrary.service.DLFileEntryServiceUtil"%> <%@page import="java.text.DateFormat"%> <%@page import="javax.swing.text.html.parser.DocumentParser"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil"%> +<%@page import="it.tref.liferay.portos.bo.util.DocumentiPraticaUtil"%> <%@page import="java.util.List"%> <%@page import="java.util.ArrayList"%> <%@page import="java.util.Comparator"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/abort_fascicolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/abort_fascicolo.jsp index 0d919ebf..0001b1ca 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/abort_fascicolo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/abort_fascicolo.jsp @@ -8,7 +8,7 @@ <%@page import="com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.service.AsseverazioneLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.model.Asseverazione"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil"%> +<%@page import="it.tref.liferay.portos.bo.util.DocumentiPraticaUtil"%> <%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> <%@page import="java.util.Calendar"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/add_file_asseverazione.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/add_file_asseverazione.jsp index 3b9f36ec..844da382 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/add_file_asseverazione.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/add_file_asseverazione.jsp @@ -2,7 +2,7 @@ <%@page import="it.tref.liferay.portos.bo.shared.util.PortletKeys"%> <%@page import="it.tref.liferay.portos.bo.service.AsseverazioneLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.model.Asseverazione"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil"%> +<%@page import="it.tref.liferay.portos.bo.util.DocumentiPraticaUtil"%> <%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> <%@page import="java.util.Calendar"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/completed_fascicolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/completed_fascicolo.jsp index 9556d4c8..0eba8766 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/completed_fascicolo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/completed_fascicolo.jsp @@ -11,7 +11,7 @@ <%@page import="com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.service.AsseverazioneLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.model.Asseverazione"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil"%> +<%@page import="it.tref.liferay.portos.bo.util.DocumentiPraticaUtil"%> <%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> <%@page import="java.util.Calendar"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_cambio_soggetti.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_cambio_soggetti.jsp index 3255541a..0af17797 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_cambio_soggetti.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_cambio_soggetti.jsp @@ -18,7 +18,7 @@ <%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> <%@page import="it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.model.DocPratica"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil"%> +<%@page import="it.tref.liferay.portos.bo.util.DocumentiPraticaUtil"%> <%@page import="it.tref.liferay.portos.bo.model.IntPratica"%> <%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_collaudo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_collaudo.jsp index 1c94c414..a22e3351 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_collaudo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_collaudo.jsp @@ -11,7 +11,7 @@ <%@page import="it.tref.liferay.portos.bo.util.ValidazionePraticaUtil"%> <%@page import="it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.model.DocPratica"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil"%> +<%@page import="it.tref.liferay.portos.bo.util.DocumentiPraticaUtil"%> <%@ include file="/html/fascicolofe/init.jsp" %> <% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo.jsp index 3b3a5ae8..62bce510 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo.jsp @@ -20,7 +20,7 @@ <%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> <%@page import="it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.model.DocPratica"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil"%> +<%@page import="it.tref.liferay.portos.bo.util.DocumentiPraticaUtil"%> <%@page import="it.tref.liferay.portos.bo.model.IntPratica"%> <%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%> <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> @@ -203,20 +203,19 @@
<% - boolean isSectionCompleted = ValidazionePraticaUtil.isSectionCompleted(section,dettPraticaId); StringBuilder tooltipSection = new StringBuilder(); - if(!isSectionCompleted){ - List notCompleted = ValidazionePraticaUtil.notCompletedSection(section, dettPraticaId); - if(!notCompleted.isEmpty()){ - tooltipSection.append("
    "); - for(String incomplete : notCompleted){ - tooltipSection.append("
  • "+LanguageUtil.get(pageContext, incomplete)+"
    • "); - } - tooltipSection.append("
"); - } - } + List notCompleted = ValidazionePraticaUtil.notCompletedSection(section, dettPraticaId); + if (notCompleted.size() > 0 ) { + if(!notCompleted.isEmpty()){ + tooltipSection.append("
    "); + for(String incomplete : notCompleted){ + tooltipSection.append("
  • "+LanguageUtil.get(pageContext, incomplete)+"
    • "); + } + tooltipSection.append("
"); + } + } %> - +
@@ -432,61 +431,6 @@ clazz +="fa-close txt-red"; } } - } else if( DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A06.equals(codiceDoc) ){ - if(TipoSoggettoUtil.PROGETTISTA.equals(tipoSoggetto) || (TipoSoggettoUtil.DIRETTORE_LAVORI.equals(tipoSoggetto) && dettPratica.isLavoriPubblici()) || TipoSoggettoUtil.GEOLOGO.equals(tipoSoggetto)){ - boolean isValid = false; - if(dettPratica.getNormArt3com3()){ - isValid = true; - } else if(tipoSoggetto.equals(TipoSoggettoUtil.DIRETTORE_LAVORI) && signaturesPerSubject.isEmpty()){ - isValid = false; - } else if(tipoSoggetto.equals(TipoSoggettoUtil.GEOLOGO)){ - boolean progettista = AsseverazioniUtil.signaturesContains(intPraticaId, TipoSoggettoUtil.PROGETTISTA, signatures); - if(progettista || !signaturesPerSubject.isEmpty() ){ - isValid = true; - } - } else if(tipoSoggetto.equals(TipoSoggettoUtil.PROGETTISTA)){ - boolean geologo = AsseverazioniUtil.signaturesContains(intPraticaId, TipoSoggettoUtil.GEOLOGO, signatures); - if(geologo || !signaturesPerSubject.isEmpty() ){ - isValid = true; - } - } else { - isValid = true; - } - -// if(!isValid && dettPratica.isLavoriPubblici() && TipoSoggettoUtil.DIRETTORE_LAVORI.equals(tipoSoggetto)){ -// isValid = true; -// } - - clazz+= " icon-asseverazioni fa "; - if(isValid){ - clazz +="fa-check txt-green"; - } else { - clazz +="fa-close txt-red"; - } - } - } else if( DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A07.equals(codiceDoc) ){ - if(TipoSoggettoUtil.PROGETTISTA.equals(tipoSoggetto) || TipoSoggettoUtil.DIRETTORE_LAVORI.equals(tipoSoggetto) ){ - boolean isValid = false; - if(dettPratica.getNormArt3com3()){ - isValid = true; - } else if(signaturesPerSubject.isEmpty()){ - isValid = false; - } else { - isValid = true; - } - - if(!isValid && dettPratica.isLavoriPubblici() && TipoSoggettoUtil.DIRETTORE_LAVORI.equals(tipoSoggetto)){ - isValid = true; - } - - clazz+= " icon-asseverazioni fa "; - if(isValid){ - clazz +="fa-check txt-green"; - } else { - clazz +="fa-close txt-red"; - } - } - } else if( codiceDoc.equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_A09) ){ boolean isValid = false; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori.jsp index 5f4255a1..4c8435b9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori.jsp @@ -11,7 +11,7 @@ <%@page import="it.tref.liferay.portos.bo.util.ValidazionePraticaUtil"%> <%@page import="it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.model.DocPratica"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.DocumentiPraticaUtil"%> +<%@page import="it.tref.liferay.portos.bo.util.DocumentiPraticaUtil"%> <%@ include file="/html/fascicolofe/init.jsp" %> <% diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/TipoSoggettoUtil.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/TipoSoggettoUtil.java index 102f3e6f..1f788b1b 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/TipoSoggettoUtil.java +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/TipoSoggettoUtil.java @@ -1,119 +1,122 @@ package it.tref.liferay.portos.bo.shared.util; - import java.util.Arrays; import java.util.List; import java.util.regex.Pattern; public class TipoSoggettoUtil { - public static final String COLLAUDATORE = "01"; - public static final String COMMITTENTE = "02"; - public static final String DIRETTORE_LAVORI = "03"; - public static final String DITTA = "04"; - public static final String GEOLOGO = "05"; - public static final String PROGETTISTA = "06"; + public static final String TITOLARE_DIGITALE = "00"; + public static final String COLLAUDATORE = "01"; + public static final String COMMITTENTE = "02"; + public static final String DIRETTORE_LAVORI = "03"; + public static final String DITTA = "04"; + public static final String GEOLOGO = "05"; + public static final String PROGETTISTA = "06"; + public static final String ARCHEOLOGO = "07"; - public static final String JSON_CODICE_FISCALE = "codiceFiscale"; - public static final String JSON_CODICE_RUOLO = "codiceRuolo"; + public static final String JSON_CODICE_FISCALE = "codiceFiscale"; + public static final String JSON_CODICE_RUOLO = "codiceRuolo"; - public static List getAllSubjects() { - return Arrays.asList(TipoSoggettoUtil.COMMITTENTE, TipoSoggettoUtil.DITTA, TipoSoggettoUtil.PROGETTISTA, - TipoSoggettoUtil.DIRETTORE_LAVORI, TipoSoggettoUtil.GEOLOGO, TipoSoggettoUtil.COLLAUDATORE); - } + public static List getAllSubjects() { + return Arrays.asList(TipoSoggettoUtil.COMMITTENTE, TipoSoggettoUtil.DITTA, + TipoSoggettoUtil.PROGETTISTA, TipoSoggettoUtil.DIRETTORE_LAVORI, TipoSoggettoUtil.GEOLOGO, + TipoSoggettoUtil.COLLAUDATORE); + } - public static boolean validaCodiceFiscale(String codiceFiscale, boolean ultimoCarattere) { - // conversione della stringa in caratteri maiuscoli - try { - String cf = codiceFiscale.toUpperCase().replaceAll(" ", ""); - /* - * verifica della lunghezza del codice fiscale - */ - if (cf.length() == 16) { + public static boolean validaCodiceFiscale(String codiceFiscale, boolean ultimoCarattere) { + // conversione della stringa in caratteri maiuscoli + try { + String cf = codiceFiscale.toUpperCase().replaceAll(" ", ""); + /* + * verifica della lunghezza del codice fiscale + */ + if (cf.length() == 16) { - String cfMask = - "^[a-zA-Z]{6}[0-9lmnpqrstuvLMNPQRSTUV]{2}[abcdehlmprstABCDEHLMPRST]{1}[0-9lmnpqrstuvLMNPQRSTUV]{2}([a-zA-Z]{1}[0-9lmnpqrstuvLMNPQRSTUV]{3})[a-zA-Z]{1}$"; - if (!Pattern.matches(cfMask, codiceFiscale)) - return false; - /* - * creazione della matrice con i caratteri dell'alfabeto - */ - char[] Carattere = - {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', - 'V', 'W', 'X', 'Y', 'Z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; - /* - * creazione della matrice con i valori attribuiti ai caratteri dispari, corrispondenti alla - * matrice di caratteri - */ - int[] ValoriDispari = - {1, 0, 5, 7, 9, 13, 15, 17, 19, 21, 2, 4, 18, 20, 11, 3, 6, 8, 12, 14, 16, 10, 22, 25, 24, 23, 1, 0, 5, 7, - 9, 13, 15, 17, 19, 21}; - /* - * creazione della matrice con i valori attribuiti ai caratteri pari, corrispondenti alla - * matrice di caratteri - */ - int[] ValoriPari = new int[36]; - for (int i = 0; i < 26; i++) { - ValoriPari[i] = i; - } - for (int i = 26; i < 36; i++) { - ValoriPari[i] = i - 26; - } - // conversione della stringa da esaminare ad una matrice di caratteri - char[] caratteriCF = cf.toCharArray(); - int valore = 0; - for (int i = 0; i < caratteriCF.length - 1; i++) { - /* - * somma delle posizioni pari in base ai valori corrispondenti contenuti nell'array - * ValoriPari (tranne l'ultimo carattere che è quello di controllo) - */ - if ((i + 1) % 2 == 0) { - for (int j = 0; j < Carattere.length; j++) { + String cfMask = "^[a-zA-Z]{6}[0-9lmnpqrstuvLMNPQRSTUV]{2}[abcdehlmprstABCDEHLMPRST]{1}[0-9lmnpqrstuvLMNPQRSTUV]{2}([a-zA-Z]{1}[0-9lmnpqrstuvLMNPQRSTUV]{3})[a-zA-Z]{1}$"; + if (!Pattern.matches(cfMask, codiceFiscale)) + return false; + /* + * creazione della matrice con i caratteri dell'alfabeto + */ + char[] Carattere = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', + 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '0', '1', '2', '3', '4', + '5', '6', '7', '8', '9' }; + /* + * creazione della matrice con i valori attribuiti ai caratteri + * dispari, corrispondenti alla matrice di caratteri + */ + int[] ValoriDispari = { 1, 0, 5, 7, 9, 13, 15, 17, 19, 21, 2, 4, 18, 20, 11, 3, 6, 8, 12, 14, + 16, 10, 22, 25, 24, 23, 1, 0, 5, 7, 9, 13, 15, 17, 19, 21 }; + /* + * creazione della matrice con i valori attribuiti ai caratteri + * pari, corrispondenti alla matrice di caratteri + */ + int[] ValoriPari = new int[36]; + for (int i = 0; i < 26; i++) { + ValoriPari[i] = i; + } + for (int i = 26; i < 36; i++) { + ValoriPari[i] = i - 26; + } + // conversione della stringa da esaminare ad una matrice di + // caratteri + char[] caratteriCF = cf.toCharArray(); + int valore = 0; + for (int i = 0; i < caratteriCF.length - 1; i++) { + /* + * somma delle posizioni pari in base ai valori + * corrispondenti contenuti nell'array ValoriPari (tranne + * l'ultimo carattere che è quello di controllo) + */ + if ((i + 1) % 2 == 0) { + for (int j = 0; j < Carattere.length; j++) { - if (caratteriCF[i] == Carattere[j]) { - valore += ValoriPari[j]; - } - } - /* - * somma delle posizioni dispari in base ai valori corrispondenti contenuti nell'array - * ValoriDispari - */ - } else { - for (int j = 0; j < Carattere.length; j++) { - if (caratteriCF[i] == Carattere[j]) { - valore += ValoriDispari[j]; - } - } - } - } - /* - * ottenimento del resto della divisione per 26 e valutazione del carattere di controllo - * (ultimo carattere) - */ - valore %= 26; - for (int i = 0; i < 26; i++) { - /* - * verifica che il valore dell'ultimo carattere corrisponda al valore ottenuto attraverso - * l'algoritmo di somma precedente - */ - if (ultimoCarattere) { - if (caratteriCF[caratteriCF.length - 1] == Carattere[i]) { - if (valore == i) { - return true; - } else { - return false; - } - } - } else { - return true; - } - } - return false; - } else { - return false; - } - } catch (Exception e) { - return false; - } - } + if (caratteriCF[i] == Carattere[j]) { + valore += ValoriPari[j]; + } + } + /* + * somma delle posizioni dispari in base ai valori + * corrispondenti contenuti nell'array ValoriDispari + */ + } else { + for (int j = 0; j < Carattere.length; j++) { + if (caratteriCF[i] == Carattere[j]) { + valore += ValoriDispari[j]; + } + } + } + } + /* + * ottenimento del resto della divisione per 26 e valutazione + * del carattere di controllo (ultimo carattere) + */ + valore %= 26; + for (int i = 0; i < 26; i++) { + /* + * verifica che il valore dell'ultimo carattere corrisponda + * al valore ottenuto attraverso l'algoritmo di somma + * precedente + */ + if (ultimoCarattere) { + if (caratteriCF[caratteriCF.length - 1] == Carattere[i]) { + if (valore == i) { + return true; + } else { + return false; + } + } + } else { + return true; + } + } + return false; + } else { + return false; + } + } catch (Exception e) { + return false; + } + } }