From e23daf2998d24e668c73f644e5a6676986d855a1 Mon Sep 17 00:00:00 2001 From: Salvatore La Manna Date: Wed, 12 May 2021 14:11:11 +0200 Subject: [PATCH] Gestione integrazioni/preavvisi scaduti --- .../portos/bo/model/ControlloPratica.java | 1 + .../portos/bo/model/ControlloPraticaClp.java | 19 + .../bo/model/ControlloPraticaWrapper.java | 5 + .../service/ControlloPraticaLocalService.java | 12 + .../ControlloPraticaLocalServiceClp.java | 81 +++ .../ControlloPraticaLocalServiceUtil.java | 15 + .../ControlloPraticaLocalServiceWrapper.java | 17 + .../bo/service/IntPraticaLocalService.java | 32 - .../bo/service/IntPraticaLocalServiceClp.java | 556 +++++------------- .../service/IntPraticaLocalServiceUtil.java | 55 -- .../IntPraticaLocalServiceWrapper.java | 60 -- .../portos/bo/service/IntPraticaService.java | 32 - .../bo/service/IntPraticaServiceClp.java | 339 +---------- .../bo/service/IntPraticaServiceUtil.java | 55 -- .../bo/service/IntPraticaServiceWrapper.java | 59 -- .../bo/service/ParereGeologoLocalService.java | 6 + .../service/ParereGeologoLocalServiceClp.java | 41 ++ .../ParereGeologoLocalServiceUtil.java | 7 + .../ParereGeologoLocalServiceWrapper.java | 9 + .../liferay/portos/bo/util/AvvisoUtil.java | 1 + .../bo/scheduler/SchedulerWorkflow.java | 7 +- .../sismica/bo/util/CarichiLavoroUtil.java | 24 + .../sismica/bo/util/ManutenzioneDatabase.java | 7 +- .../it/mwg/sismica/bo/util/SismicaUtil.java | 307 ++++++++-- .../bo/model/impl/ControlloPraticaImpl.java | 14 + .../bo/portlet/CarichiLavoroPortlet.java | 12 + .../bo/portlet/DocAggiuntivaPortlet.java | 1 + .../bo/scheduler/SchedulerInvioDocumento.java | 4 +- ...ontrolloPraticaLocalServiceClpInvoker.java | 23 + .../IntPraticaLocalServiceClpInvoker.java | 366 +++++------- .../base/IntPraticaServiceClpInvoker.java | 137 +---- .../ParereGeologoLocalServiceClpInvoker.java | 12 + .../service/http/IntPraticaServiceSoap.java | 108 ---- .../ControlloPraticaLocalServiceImpl.java | 90 +++ .../impl/IntPraticaLocalServiceImpl.java | 122 ---- .../service/impl/IntPraticaServiceImpl.java | 56 -- .../impl/ParereGeologoLocalServiceImpl.java | 46 ++ .../AllegatoManualePersistenceImpl.java | 1 + .../AsseverazionePersistenceImpl.java | 1 + .../persistence/AvvisoPersistenceImpl.java | 1 + .../persistence/CollaudoPersistenceImpl.java | 1 + .../persistence/ComunePersistenceImpl.java | 1 + .../ComunicazionePersistenceImpl.java | 1 + .../ConfigurazionePersistenceImpl.java | 1 + .../ControlloPraticaPersistenceImpl.java | 1 + .../persistence/DelegaPersistenceImpl.java | 1 + .../DettPraticaPersistenceImpl.java | 1 + .../DocAggiuntivaPersistenceImpl.java | 1 + .../DocPraticaPersistenceImpl.java | 1 + .../FineLavoriPersistenceImpl.java | 1 + .../HistoryWorkflowActionPersistenceImpl.java | 1 + .../IntPraticaPersistenceImpl.java | 1 + .../persistence/PagamentoPersistenceImpl.java | 1 + .../ParereGeologoPersistenceImpl.java | 1 + .../persistence/ProvinciaPersistenceImpl.java | 1 + .../persistence/SoggettoPersistenceImpl.java | 1 + ...StoricoSoggettoPraticaPersistenceImpl.java | 1 + .../TempisticaPersistenceImpl.java | 1 + .../TerritorioPersistenceImpl.java | 1 + .../docroot/WEB-INF/src/service.properties | 4 +- .../docroot/html/carichilavoro/view.jsp | 365 +++++------- .../portlets/portos-kaleo-portlet/.classpath | 1 + .../org.eclipse.wst.common.component | 1 + .../bo/shared/bean/CarichiLavoroBean.java | 42 ++ .../KaleoActionPersistenceImpl.java | 1 + .../KaleoConditionPersistenceImpl.java | 1 + .../KaleoDefinitionPersistenceImpl.java | 1 + .../KaleoInstancePersistenceImpl.java | 1 + .../KaleoInstanceTokenPersistenceImpl.java | 1 + .../persistence/KaleoLogPersistenceImpl.java | 1 + .../persistence/KaleoNodePersistenceImpl.java | 1 + .../KaleoNotificationPersistenceImpl.java | 1 + ...oNotificationRecipientPersistenceImpl.java | 1 + ...TaskAssignmentInstancePersistenceImpl.java | 1 + .../KaleoTaskAssignmentPersistenceImpl.java | 1 + ...KaleoTaskInstanceTokenPersistenceImpl.java | 1 + .../persistence/KaleoTaskPersistenceImpl.java | 1 + ...aleoTimerInstanceTokenPersistenceImpl.java | 1 + .../KaleoTimerPersistenceImpl.java | 1 + .../KaleoTransitionPersistenceImpl.java | 1 + .../docroot/WEB-INF/src/service.properties | 4 +- 81 files changed, 1271 insertions(+), 1922 deletions(-) create mode 100644 liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/CarichiLavoroUtil.java create mode 100644 liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/bean/CarichiLavoroBean.java diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPratica.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPratica.java index 277c1440..63c0df93 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPratica.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPratica.java @@ -31,4 +31,5 @@ public interface ControlloPratica extends ControlloPraticaModel, PersistedModel * * Never modify this interface directly. Add methods to {@link it.tref.liferay.portos.bo.model.impl.ControlloPraticaImpl} and rerun ServiceBuilder to automatically copy the method declarations to this interface. */ + public int getUnitaOperativa(); } \ 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/model/ControlloPraticaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaClp.java index 5517cc66..d0f1ef2b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaClp.java @@ -557,6 +557,25 @@ public class ControlloPraticaClp extends BaseModelImpl } } + @Override + public int getUnitaOperativa() { + try { + String methodName = "getUnitaOperativa"; + + Class[] parameterTypes = new Class[] { }; + + Object[] parameterValues = new Object[] { }; + + Integer returnObj = (Integer)invokeOnRemoteModel(methodName, + parameterTypes, parameterValues); + + return returnObj; + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + @Override public StagedModelType getStagedModelType() { return new StagedModelType(PortalUtil.getClassNameId( diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaWrapper.java index 76be329e..1ce000b9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/ControlloPraticaWrapper.java @@ -720,6 +720,11 @@ public class ControlloPraticaWrapper implements ControlloPratica, _controlloPratica.persist(); } + @Override + public int getUnitaOperativa() { + return _controlloPratica.getUnitaOperativa(); + } + @Override public boolean equals(Object obj) { if (this == obj) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalService.java index 5493ce01..77e5d7a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalService.java @@ -423,4 +423,16 @@ public interface ControlloPraticaLocalService extends BaseLocalService, long controlloPraticaId) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + + @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) + public com.liferay.portal.model.Organization getOrganizationByControlloPraticaId( + long controlloPraticaId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; + + @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) + public java.util.Map getCarichiLavoro( + long controlloPraticaId, int giorni) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; } \ 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/ControlloPraticaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceClp.java index 2d03383a..fd98569f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceClp.java @@ -225,6 +225,14 @@ public class ControlloPraticaLocalServiceClp _methodName41 = "calculateDateAvvioProcedimento"; _methodParameterTypes41 = new String[] { "long" }; + + _methodName42 = "getOrganizationByControlloPraticaId"; + + _methodParameterTypes42 = new String[] { "long" }; + + _methodName43 = "getCarichiLavoro"; + + _methodParameterTypes43 = new String[] { "long", "int" }; } @Override @@ -1632,6 +1640,75 @@ public class ControlloPraticaLocalServiceClp return (java.lang.Long)ClpSerializer.translateOutput(returnObj); } + @Override + public com.liferay.portal.model.Organization getOrganizationByControlloPraticaId( + long controlloPraticaId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName42, + _methodParameterTypes42, new Object[] { controlloPraticaId }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof com.liferay.portal.kernel.exception.PortalException) { + throw (com.liferay.portal.kernel.exception.PortalException)t; + } + + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { + throw (com.liferay.portal.kernel.exception.SystemException)t; + } + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + + return (com.liferay.portal.model.Organization)ClpSerializer.translateOutput(returnObj); + } + + @Override + public java.util.Map getCarichiLavoro( + long controlloPraticaId, int giorni) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName43, + _methodParameterTypes43, + new Object[] { controlloPraticaId, giorni }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof com.liferay.portal.kernel.exception.PortalException) { + throw (com.liferay.portal.kernel.exception.PortalException)t; + } + + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { + throw (com.liferay.portal.kernel.exception.SystemException)t; + } + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + + return (java.util.Map)ClpSerializer.translateOutput(returnObj); + } + private InvokableLocalService _invokableLocalService; private String _methodName0; private String[] _methodParameterTypes0; @@ -1715,4 +1792,8 @@ public class ControlloPraticaLocalServiceClp private String[] _methodParameterTypes40; private String _methodName41; private String[] _methodParameterTypes41; + private String _methodName42; + private String[] _methodParameterTypes42; + private String _methodName43; + private String[] _methodParameterTypes43; } \ 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/ControlloPraticaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceUtil.java index 656afd2b..2af5d001 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceUtil.java @@ -503,6 +503,21 @@ public class ControlloPraticaLocalServiceUtil { return getService().calculateDateAvvioProcedimento(controlloPraticaId); } + public static com.liferay.portal.model.Organization getOrganizationByControlloPraticaId( + long controlloPraticaId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return getService() + .getOrganizationByControlloPraticaId(controlloPraticaId); + } + + public static java.util.Map getCarichiLavoro( + long controlloPraticaId, int giorni) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return getService().getCarichiLavoro(controlloPraticaId, giorni); + } + public static void clearService() { _service = null; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceWrapper.java index a9f284a1..a7f2604d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceWrapper.java @@ -535,6 +535,23 @@ public class ControlloPraticaLocalServiceWrapper return _controlloPraticaLocalService.calculateDateAvvioProcedimento(controlloPraticaId); } + @Override + public com.liferay.portal.model.Organization getOrganizationByControlloPraticaId( + long controlloPraticaId) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _controlloPraticaLocalService.getOrganizationByControlloPraticaId(controlloPraticaId); + } + + @Override + public java.util.Map getCarichiLavoro( + long controlloPraticaId, int giorni) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _controlloPraticaLocalService.getCarichiLavoro(controlloPraticaId, + giorni); + } + /** * @deprecated As of 6.1.0, replaced by {@link #getWrappedService} */ 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 c01cedf5..a239c284 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 @@ -398,34 +398,6 @@ public interface IntPraticaLocalService extends BaseLocalService, throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; - public java.util.List findByCompanyIdSoggettoProgetti( - long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - - public int countByCompanyIdSoggettoProgetti(long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - - public java.util.List findByCompanyIdSoggettoArchivio( - long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - - public int countByCompanyIdSoggettoArchivio(long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - - public java.util.List findByCompanyIdSoggettoAltriProgetti( - long companyId, long soggettoId, int start, int end) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - - public int countByCompanyIdSoggettoAltriProgetti(long companyId, - long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - public java.util.List findByCanAddFineLavori( long companyId, java.lang.String codiceFiscale, int start, int end) throws com.liferay.portal.kernel.exception.PortalException, @@ -459,10 +431,6 @@ public interface IntPraticaLocalService extends BaseLocalService, java.util.List groupIds, long intPraticaId, int start, int end) throws com.liferay.portal.kernel.exception.SystemException; - public int countSearchWithIntPraticaId( - java.util.List groupIds, long intPraticaId) - throws com.liferay.portal.kernel.exception.SystemException; - public com.liferay.portal.kernel.repository.model.FileEntry allegaFileAnnullamento( long intPraticaId, byte[] content, java.lang.String sourceFileName, java.lang.String jsonFirmatari, 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 d1151409..e09ae821 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 @@ -203,210 +203,182 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { _methodParameterTypes36 = new String[] { "long", "int" }; - _methodName37 = "findByCompanyIdSoggettoProgetti"; + _methodName37 = "findByCanAddFineLavori"; - _methodParameterTypes37 = new String[] { "long", "long" }; - - _methodName38 = "countByCompanyIdSoggettoProgetti"; - - _methodParameterTypes38 = new String[] { "long", "long" }; - - _methodName39 = "findByCompanyIdSoggettoArchivio"; - - _methodParameterTypes39 = new String[] { "long", "long" }; - - _methodName40 = "countByCompanyIdSoggettoArchivio"; - - _methodParameterTypes40 = new String[] { "long", "long" }; - - _methodName41 = "findByCompanyIdSoggettoAltriProgetti"; - - _methodParameterTypes41 = new String[] { "long", "long", "int", "int" }; - - _methodName42 = "countByCompanyIdSoggettoAltriProgetti"; - - _methodParameterTypes42 = new String[] { "long", "long" }; - - _methodName43 = "findByCanAddFineLavori"; - - _methodParameterTypes43 = new String[] { + _methodParameterTypes37 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName44 = "countByCanAddFineLavori"; + _methodName38 = "countByCanAddFineLavori"; - _methodParameterTypes44 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes38 = new String[] { "long", "java.lang.String" }; - _methodName45 = "findByCanAddCollaudo"; + _methodName39 = "findByCanAddCollaudo"; - _methodParameterTypes45 = new String[] { + _methodParameterTypes39 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName46 = "countByCanAddCollaudo"; + _methodName40 = "countByCanAddCollaudo"; - _methodParameterTypes46 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes40 = new String[] { "long", "java.lang.String" }; - _methodName47 = "search"; + _methodName41 = "search"; - _methodParameterTypes47 = new String[] { "java.util.List", "int", "int" }; + _methodParameterTypes41 = new String[] { "java.util.List", "int", "int" }; - _methodName48 = "countSearch"; + _methodName42 = "countSearch"; - _methodParameterTypes48 = new String[] { "java.util.List" }; + _methodParameterTypes42 = new String[] { "java.util.List" }; - _methodName49 = "searchWithIntPraticaId"; + _methodName43 = "searchWithIntPraticaId"; - _methodParameterTypes49 = new String[] { + _methodParameterTypes43 = new String[] { "java.util.List", "long", "int", "int" }; - _methodName50 = "countSearchWithIntPraticaId"; + _methodName44 = "allegaFileAnnullamento"; - _methodParameterTypes50 = new String[] { "java.util.List", "long" }; - - _methodName51 = "allegaFileAnnullamento"; - - _methodParameterTypes51 = new String[] { + _methodParameterTypes44 = new String[] { "long", "byte[][]", "java.lang.String", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName52 = "generateFileAnnullamento"; + _methodName45 = "generateFileAnnullamento"; - _methodParameterTypes52 = new String[] { + _methodParameterTypes45 = new String[] { "long", "com.liferay.portal.service.ServiceContext" }; - _methodName53 = "deleteFileAnnullamento"; + _methodName46 = "deleteFileAnnullamento"; - _methodParameterTypes53 = new String[] { "long" }; + _methodParameterTypes46 = new String[] { "long" }; - _methodName54 = "completeAnnullamento"; + _methodName47 = "completeAnnullamento"; - _methodParameterTypes54 = new String[] { "long" }; + _methodParameterTypes47 = new String[] { "long" }; - _methodName55 = "cambiaIstruttore"; + _methodName48 = "cambiaIstruttore"; - _methodParameterTypes55 = new String[] { "long", "long", "long" }; + _methodParameterTypes48 = new String[] { "long", "long", "long" }; - _methodName56 = "countCaricoLavoroCF"; + _methodName49 = "countCaricoLavoroCF"; - _methodParameterTypes56 = new String[] { + _methodParameterTypes49 = new String[] { "long", "java.lang.String", "java.lang.Long[][]" }; - _methodName57 = "countCaricoLavoroIstruttore"; + _methodName50 = "countCaricoLavoroIstruttore"; - _methodParameterTypes57 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes50 = new String[] { "long", "java.lang.String" }; - _methodName58 = "generateReportPratica"; + _methodName51 = "generateReportPratica"; - _methodParameterTypes58 = new String[] { + _methodParameterTypes51 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName59 = "updateModifiedDate"; + _methodName52 = "updateModifiedDate"; - _methodParameterTypes59 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes52 = new String[] { "long", "java.util.Date" }; - _methodName60 = "countAutorizzazione"; + _methodName53 = "countAutorizzazione"; - _methodParameterTypes60 = new String[] { + _methodParameterTypes53 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName61 = "countSanatorie"; + _methodName54 = "countSanatorie"; - _methodParameterTypes61 = new String[] { + _methodParameterTypes54 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName62 = "countOpereMinoreImportanza"; + _methodName55 = "countOpereMinoreImportanza"; - _methodParameterTypes62 = new String[] { + _methodParameterTypes55 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName63 = "countDeposito"; + _methodName56 = "countDeposito"; - _methodParameterTypes63 = new String[] { + _methodParameterTypes56 = new String[] { "java.util.Date", "java.util.Date", "long", "boolean" }; - _methodName64 = "countVidimate"; + _methodName57 = "countVidimate"; - _methodParameterTypes64 = new String[] { + _methodParameterTypes57 = new String[] { "java.util.Date", "java.util.Date", "long", "java.lang.String", "boolean" }; - _methodName65 = "countControllo"; + _methodName58 = "countControllo"; - _methodParameterTypes65 = new String[] { + _methodParameterTypes58 = new String[] { "java.util.Date", "java.util.Date", "long", "java.lang.String", "boolean" }; - _methodName66 = "riparaWorkflow"; + _methodName59 = "riparaWorkflow"; - _methodParameterTypes66 = new String[] { }; + _methodParameterTypes59 = new String[] { }; - _methodName67 = "reIndexFascicolo"; + _methodName60 = "reIndexFascicolo"; - _methodParameterTypes67 = new String[] { + _methodParameterTypes60 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName68 = "reIndexFasciolo"; + _methodName61 = "reIndexFasciolo"; - _methodParameterTypes68 = new String[] { "java.lang.String", "long" }; + _methodParameterTypes61 = new String[] { "java.lang.String", "long" }; - _methodName69 = "reIndexFasciolo"; + _methodName62 = "reIndexFasciolo"; - _methodParameterTypes69 = new String[] { "long", "long" }; + _methodParameterTypes62 = new String[] { "long", "long" }; - _methodName70 = "findByNumeroProgetto"; + _methodName63 = "findByNumeroProgetto"; - _methodParameterTypes70 = new String[] { "java.lang.String" }; + _methodParameterTypes63 = new String[] { "java.lang.String" }; - _methodName71 = "findByTerritorioId"; + _methodName64 = "findByTerritorioId"; - _methodParameterTypes71 = new String[] { "long" }; + _methodParameterTypes64 = new String[] { "long" }; - _methodName72 = "reportTempisticheIstruttorieAvvisiAutorizzazioni"; + _methodName65 = "reportTempisticheIstruttorieAvvisiAutorizzazioni"; - _methodParameterTypes72 = new String[] { + _methodParameterTypes65 = new String[] { "java.util.Date", "java.util.Date", "long", "java.lang.String" }; - _methodName73 = "reportPraticheVidimate"; + _methodName66 = "reportPraticheVidimate"; - _methodParameterTypes73 = new String[] { + _methodParameterTypes66 = new String[] { "java.util.Date", "java.util.Date", "long", "java.lang.String" }; - _methodName74 = "countIngressiAutorizzazioni"; + _methodName67 = "countIngressiAutorizzazioni"; - _methodParameterTypes74 = new String[] { + _methodParameterTypes67 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName75 = "countIngressiDepositi"; + _methodName68 = "countIngressiDepositi"; - _methodParameterTypes75 = new String[] { + _methodParameterTypes68 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName76 = "countIngressiCO"; + _methodName69 = "countIngressiCO"; - _methodParameterTypes76 = new String[] { + _methodParameterTypes69 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName77 = "getOrganizationByIntPraticaId"; + _methodName70 = "getOrganizationByIntPraticaId"; - _methodParameterTypes77 = new String[] { "long" }; + _methodParameterTypes70 = new String[] { "long" }; } @Override @@ -1631,214 +1603,6 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { } } - @Override - public java.util.List findByCompanyIdSoggettoProgetti( - long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName37, - _methodParameterTypes37, - new Object[] { companyId, soggettoId }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.PortalException) { - throw (com.liferay.portal.kernel.exception.PortalException)t; - } - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - 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 int countByCompanyIdSoggettoProgetti(long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName38, - _methodParameterTypes38, - new Object[] { companyId, soggettoId }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.PortalException) { - throw (com.liferay.portal.kernel.exception.PortalException)t; - } - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return ((Integer)returnObj).intValue(); - } - - @Override - public java.util.List findByCompanyIdSoggettoArchivio( - long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName39, - _methodParameterTypes39, - new Object[] { companyId, soggettoId }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.PortalException) { - throw (com.liferay.portal.kernel.exception.PortalException)t; - } - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - 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 int countByCompanyIdSoggettoArchivio(long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName40, - _methodParameterTypes40, - new Object[] { companyId, soggettoId }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.PortalException) { - throw (com.liferay.portal.kernel.exception.PortalException)t; - } - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return ((Integer)returnObj).intValue(); - } - - @Override - public java.util.List findByCompanyIdSoggettoAltriProgetti( - long companyId, long soggettoId, int start, int end) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName41, - _methodParameterTypes41, - new Object[] { companyId, soggettoId, start, end }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.PortalException) { - throw (com.liferay.portal.kernel.exception.PortalException)t; - } - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - 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 int countByCompanyIdSoggettoAltriProgetti(long companyId, - long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName42, - _methodParameterTypes42, - new Object[] { companyId, soggettoId }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.PortalException) { - throw (com.liferay.portal.kernel.exception.PortalException)t; - } - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return ((Integer)returnObj).intValue(); - } - @Override public java.util.List findByCanAddFineLavori( long companyId, java.lang.String codiceFiscale, int start, int end) @@ -1847,8 +1611,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName43, - _methodParameterTypes43, + returnObj = _invokableLocalService.invokeMethod(_methodName37, + _methodParameterTypes37, new Object[] { companyId, @@ -1890,8 +1654,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName44, - _methodParameterTypes44, + returnObj = _invokableLocalService.invokeMethod(_methodName38, + _methodParameterTypes38, new Object[] { companyId, @@ -1929,8 +1693,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName45, - _methodParameterTypes45, + returnObj = _invokableLocalService.invokeMethod(_methodName39, + _methodParameterTypes39, new Object[] { companyId, @@ -1972,8 +1736,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName46, - _methodParameterTypes46, + returnObj = _invokableLocalService.invokeMethod(_methodName40, + _methodParameterTypes40, new Object[] { companyId, @@ -2010,8 +1774,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName47, - _methodParameterTypes47, + returnObj = _invokableLocalService.invokeMethod(_methodName41, + _methodParameterTypes41, new Object[] { ClpSerializer.translateInput(groupIds), @@ -2045,8 +1809,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName48, - _methodParameterTypes48, + returnObj = _invokableLocalService.invokeMethod(_methodName42, + _methodParameterTypes42, new Object[] { ClpSerializer.translateInput(groupIds) }); } catch (Throwable t) { @@ -2075,8 +1839,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName49, - _methodParameterTypes49, + returnObj = _invokableLocalService.invokeMethod(_methodName43, + _methodParameterTypes43, new Object[] { ClpSerializer.translateInput(groupIds), @@ -2106,40 +1870,6 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { return (java.util.List)ClpSerializer.translateOutput(returnObj); } - @Override - public int countSearchWithIntPraticaId( - java.util.List groupIds, long intPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName50, - _methodParameterTypes50, - new Object[] { - ClpSerializer.translateInput(groupIds), - - intPraticaId - }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return ((Integer)returnObj).intValue(); - } - @Override public com.liferay.portal.kernel.repository.model.FileEntry allegaFileAnnullamento( long intPraticaId, byte[] content, java.lang.String sourceFileName, @@ -2151,8 +1881,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName51, - _methodParameterTypes51, + returnObj = _invokableLocalService.invokeMethod(_methodName44, + _methodParameterTypes44, new Object[] { intPraticaId, @@ -2202,8 +1932,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName52, - _methodParameterTypes52, + returnObj = _invokableLocalService.invokeMethod(_methodName45, + _methodParameterTypes45, new Object[] { intPraticaId, @@ -2242,8 +1972,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName53, - _methodParameterTypes53, + _invokableLocalService.invokeMethod(_methodName46, + _methodParameterTypes46, new Object[] { docPraticaAnnullamentoId }); } catch (Throwable t) { @@ -2272,8 +2002,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName54, - _methodParameterTypes54, new Object[] { intPraticaId }); + _invokableLocalService.invokeMethod(_methodName47, + _methodParameterTypes47, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2302,8 +2032,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName55, - _methodParameterTypes55, + _invokableLocalService.invokeMethod(_methodName48, + _methodParameterTypes48, new Object[] { intPraticaId, controlloPraticaId, istruttoreId }); } catch (Throwable t) { @@ -2335,8 +2065,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName56, - _methodParameterTypes56, + returnObj = _invokableLocalService.invokeMethod(_methodName49, + _methodParameterTypes49, new Object[] { ispettoreId, @@ -2375,8 +2105,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName57, - _methodParameterTypes57, + returnObj = _invokableLocalService.invokeMethod(_methodName50, + _methodParameterTypes50, new Object[] { ispettoreId, @@ -2410,8 +2140,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName58, - _methodParameterTypes58, + returnObj = _invokableLocalService.invokeMethod(_methodName51, + _methodParameterTypes51, new Object[] { ClpSerializer.translateInput(intPratica), @@ -2449,8 +2179,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName59, - _methodParameterTypes59, + returnObj = _invokableLocalService.invokeMethod(_methodName52, + _methodParameterTypes52, new Object[] { intPraticaId, @@ -2487,8 +2217,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName60, - _methodParameterTypes60, + returnObj = _invokableLocalService.invokeMethod(_methodName53, + _methodParameterTypes53, new Object[] { ClpSerializer.translateInput(dtMin), @@ -2523,8 +2253,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName61, - _methodParameterTypes61, + returnObj = _invokableLocalService.invokeMethod(_methodName54, + _methodParameterTypes54, new Object[] { ClpSerializer.translateInput(dtMin), @@ -2559,8 +2289,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName62, - _methodParameterTypes62, + returnObj = _invokableLocalService.invokeMethod(_methodName55, + _methodParameterTypes55, new Object[] { ClpSerializer.translateInput(dtMin), @@ -2595,8 +2325,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName63, - _methodParameterTypes63, + returnObj = _invokableLocalService.invokeMethod(_methodName56, + _methodParameterTypes56, new Object[] { ClpSerializer.translateInput(dtMin), @@ -2633,8 +2363,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName64, - _methodParameterTypes64, + returnObj = _invokableLocalService.invokeMethod(_methodName57, + _methodParameterTypes57, new Object[] { ClpSerializer.translateInput(dtMin), @@ -2674,8 +2404,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName65, - _methodParameterTypes65, + returnObj = _invokableLocalService.invokeMethod(_methodName58, + _methodParameterTypes58, new Object[] { ClpSerializer.translateInput(dtMin), @@ -2713,8 +2443,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName66, - _methodParameterTypes66, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName59, + _methodParameterTypes59, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2739,8 +2469,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { public void reIndexFascicolo( it.tref.liferay.portos.bo.model.IntPratica intPratica, long companyId) { try { - _invokableLocalService.invokeMethod(_methodName67, - _methodParameterTypes67, + _invokableLocalService.invokeMethod(_methodName60, + _methodParameterTypes60, new Object[] { ClpSerializer.translateInput(intPratica), companyId }); } catch (Throwable t) { @@ -2760,8 +2490,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(_methodName68, - _methodParameterTypes68, + _invokableLocalService.invokeMethod(_methodName61, + _methodParameterTypes61, new Object[] { ClpSerializer.translateInput(numeroProgetto), @@ -2790,8 +2520,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName69, - _methodParameterTypes69, + _invokableLocalService.invokeMethod(_methodName62, + _methodParameterTypes62, new Object[] { intPraticaId, companyId }); } catch (Throwable t) { @@ -2822,8 +2552,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName70, - _methodParameterTypes70, + returnObj = _invokableLocalService.invokeMethod(_methodName63, + _methodParameterTypes63, new Object[] { ClpSerializer.translateInput(numeroProgetto) }); } catch (Throwable t) { @@ -2852,8 +2582,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName71, - _methodParameterTypes71, new Object[] { territorioId }); + returnObj = _invokableLocalService.invokeMethod(_methodName64, + _methodParameterTypes64, new Object[] { territorioId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2882,8 +2612,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName72, - _methodParameterTypes72, + returnObj = _invokableLocalService.invokeMethod(_methodName65, + _methodParameterTypes65, new Object[] { ClpSerializer.translateInput(dtMin), @@ -2921,8 +2651,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName73, - _methodParameterTypes73, + returnObj = _invokableLocalService.invokeMethod(_methodName66, + _methodParameterTypes66, new Object[] { ClpSerializer.translateInput(dtMin), @@ -2959,8 +2689,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName74, - _methodParameterTypes74, + returnObj = _invokableLocalService.invokeMethod(_methodName67, + _methodParameterTypes67, new Object[] { ClpSerializer.translateInput(dtMin), @@ -2995,8 +2725,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName75, - _methodParameterTypes75, + returnObj = _invokableLocalService.invokeMethod(_methodName68, + _methodParameterTypes68, new Object[] { ClpSerializer.translateInput(dtMin), @@ -3031,8 +2761,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName76, - _methodParameterTypes76, + returnObj = _invokableLocalService.invokeMethod(_methodName69, + _methodParameterTypes69, new Object[] { ClpSerializer.translateInput(dtMin), @@ -3068,8 +2798,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName77, - _methodParameterTypes77, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName70, + _methodParameterTypes70, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -3235,18 +2965,4 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { private String[] _methodParameterTypes69; private String _methodName70; private String[] _methodParameterTypes70; - private String _methodName71; - private String[] _methodParameterTypes71; - private String _methodName72; - private String[] _methodParameterTypes72; - private String _methodName73; - private String[] _methodParameterTypes73; - private String _methodName74; - private String[] _methodParameterTypes74; - private String _methodName75; - private String[] _methodParameterTypes75; - private String _methodName76; - private String[] _methodParameterTypes76; - private String _methodName77; - private String[] _methodParameterTypes77; } \ 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 70648288..647b90a7 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 @@ -450,55 +450,6 @@ public class IntPraticaLocalServiceUtil { getService().updateStatus(intPraticaId, status); } - public static java.util.List findByCompanyIdSoggettoProgetti( - long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return getService() - .findByCompanyIdSoggettoProgetti(companyId, soggettoId); - } - - public static int countByCompanyIdSoggettoProgetti(long companyId, - long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return getService() - .countByCompanyIdSoggettoProgetti(companyId, soggettoId); - } - - public static java.util.List findByCompanyIdSoggettoArchivio( - long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return getService() - .findByCompanyIdSoggettoArchivio(companyId, soggettoId); - } - - public static int countByCompanyIdSoggettoArchivio(long companyId, - long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return getService() - .countByCompanyIdSoggettoArchivio(companyId, soggettoId); - } - - public static java.util.List findByCompanyIdSoggettoAltriProgetti( - long companyId, long soggettoId, int start, int end) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return getService() - .findByCompanyIdSoggettoAltriProgetti(companyId, soggettoId, - start, end); - } - - public static int countByCompanyIdSoggettoAltriProgetti(long companyId, - long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return getService() - .countByCompanyIdSoggettoAltriProgetti(companyId, soggettoId); - } - public static java.util.List findByCanAddFineLavori( long companyId, java.lang.String codiceFiscale, int start, int end) throws com.liferay.portal.kernel.exception.PortalException, @@ -547,12 +498,6 @@ public class IntPraticaLocalServiceUtil { .searchWithIntPraticaId(groupIds, intPraticaId, start, end); } - public static int countSearchWithIntPraticaId( - java.util.List groupIds, long intPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return getService().countSearchWithIntPraticaId(groupIds, intPraticaId); - } - public static com.liferay.portal.kernel.repository.model.FileEntry allegaFileAnnullamento( long intPraticaId, byte[] content, java.lang.String sourceFileName, java.lang.String jsonFirmatari, 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 6085b1f2..6a75dca7 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 @@ -485,58 +485,6 @@ public class IntPraticaLocalServiceWrapper implements IntPraticaLocalService, _intPraticaLocalService.updateStatus(intPraticaId, status); } - @Override - public java.util.List findByCompanyIdSoggettoProgetti( - long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return _intPraticaLocalService.findByCompanyIdSoggettoProgetti(companyId, - soggettoId); - } - - @Override - public int countByCompanyIdSoggettoProgetti(long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return _intPraticaLocalService.countByCompanyIdSoggettoProgetti(companyId, - soggettoId); - } - - @Override - public java.util.List findByCompanyIdSoggettoArchivio( - long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return _intPraticaLocalService.findByCompanyIdSoggettoArchivio(companyId, - soggettoId); - } - - @Override - public int countByCompanyIdSoggettoArchivio(long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return _intPraticaLocalService.countByCompanyIdSoggettoArchivio(companyId, - soggettoId); - } - - @Override - public java.util.List findByCompanyIdSoggettoAltriProgetti( - long companyId, long soggettoId, int start, int end) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return _intPraticaLocalService.findByCompanyIdSoggettoAltriProgetti(companyId, - soggettoId, start, end); - } - - @Override - public int countByCompanyIdSoggettoAltriProgetti(long companyId, - long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return _intPraticaLocalService.countByCompanyIdSoggettoAltriProgetti(companyId, - soggettoId); - } - @Override public java.util.List findByCanAddFineLavori( long companyId, java.lang.String codiceFiscale, int start, int end) @@ -594,14 +542,6 @@ public class IntPraticaLocalServiceWrapper implements IntPraticaLocalService, intPraticaId, start, end); } - @Override - public int countSearchWithIntPraticaId( - java.util.List groupIds, long intPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return _intPraticaLocalService.countSearchWithIntPraticaId(groupIds, - intPraticaId); - } - @Override public com.liferay.portal.kernel.repository.model.FileEntry allegaFileAnnullamento( long intPraticaId, byte[] content, java.lang.String sourceFileName, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaService.java index def352bd..b5fe18b2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaService.java @@ -97,34 +97,6 @@ public interface IntPraticaService extends BaseService, InvokableService { public int countSearch(java.util.List groupIds) throws com.liferay.portal.kernel.exception.SystemException; - public java.util.List findByCompanyIdSoggettoProgetti( - long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - - public int countByCompanyIdSoggettoProgetti(long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - - public java.util.List findByCompanyIdSoggettoArchivio( - long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - - public int countByCompanyIdSoggettoArchivio(long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - - public java.util.List findByCompanyIdSoggettoAltriProgetti( - long companyId, long soggettoId, int start, int end) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - - public int countByCompanyIdSoggettoAltriProgetti(long companyId, - long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - public java.util.List findByCanAddFineLavori( long companyId, java.lang.String codiceFiscale, int start, int end) throws com.liferay.portal.kernel.exception.PortalException, @@ -161,8 +133,4 @@ public interface IntPraticaService extends BaseService, InvokableService { long istruttoreId) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; - - public java.lang.String geosisma(long intPraticaId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; } \ 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/IntPraticaServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaServiceClp.java index 04c2867c..bad9d174 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaServiceClp.java @@ -62,68 +62,40 @@ public class IntPraticaServiceClp implements IntPraticaService { _methodParameterTypes9 = new String[] { "java.util.List" }; - _methodName10 = "findByCompanyIdSoggettoProgetti"; + _methodName10 = "findByCanAddFineLavori"; - _methodParameterTypes10 = new String[] { "long", "long" }; - - _methodName11 = "countByCompanyIdSoggettoProgetti"; - - _methodParameterTypes11 = new String[] { "long", "long" }; - - _methodName12 = "findByCompanyIdSoggettoArchivio"; - - _methodParameterTypes12 = new String[] { "long", "long" }; - - _methodName13 = "countByCompanyIdSoggettoArchivio"; - - _methodParameterTypes13 = new String[] { "long", "long" }; - - _methodName14 = "findByCompanyIdSoggettoAltriProgetti"; - - _methodParameterTypes14 = new String[] { "long", "long", "int", "int" }; - - _methodName15 = "countByCompanyIdSoggettoAltriProgetti"; - - _methodParameterTypes15 = new String[] { "long", "long" }; - - _methodName16 = "findByCanAddFineLavori"; - - _methodParameterTypes16 = new String[] { + _methodParameterTypes10 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName17 = "countByCanAddFineLavori"; + _methodName11 = "countByCanAddFineLavori"; - _methodParameterTypes17 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes11 = new String[] { "long", "java.lang.String" }; - _methodName18 = "findByCanAddCollaudo"; + _methodName12 = "findByCanAddCollaudo"; - _methodParameterTypes18 = new String[] { + _methodParameterTypes12 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName19 = "countByCanAddCollaudo"; + _methodName13 = "countByCanAddCollaudo"; - _methodParameterTypes19 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes13 = new String[] { "long", "java.lang.String" }; - _methodName20 = "allegaFileAnnullamento"; + _methodName14 = "allegaFileAnnullamento"; - _methodParameterTypes20 = new String[] { + _methodParameterTypes14 = new String[] { "long", "byte[][]", "java.lang.String", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName21 = "completeAnnullamento"; - - _methodParameterTypes21 = new String[] { "long", "long" }; + _methodName15 = "completeAnnullamento"; - _methodName22 = "cambiaIstruttore"; - - _methodParameterTypes22 = new String[] { "long", "long", "long" }; + _methodParameterTypes15 = new String[] { "long", "long" }; - _methodName23 = "geosisma"; + _methodName16 = "cambiaIstruttore"; - _methodParameterTypes23 = new String[] { "long" }; + _methodParameterTypes16 = new String[] { "long", "long", "long" }; } @Override @@ -405,214 +377,6 @@ public class IntPraticaServiceClp implements IntPraticaService { return ((Integer)returnObj).intValue(); } - @Override - public java.util.List findByCompanyIdSoggettoProgetti( - long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableService.invokeMethod(_methodName10, - _methodParameterTypes10, - new Object[] { companyId, soggettoId }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.PortalException) { - throw (com.liferay.portal.kernel.exception.PortalException)t; - } - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - 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 int countByCompanyIdSoggettoProgetti(long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableService.invokeMethod(_methodName11, - _methodParameterTypes11, - new Object[] { companyId, soggettoId }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.PortalException) { - throw (com.liferay.portal.kernel.exception.PortalException)t; - } - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return ((Integer)returnObj).intValue(); - } - - @Override - public java.util.List findByCompanyIdSoggettoArchivio( - long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableService.invokeMethod(_methodName12, - _methodParameterTypes12, - new Object[] { companyId, soggettoId }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.PortalException) { - throw (com.liferay.portal.kernel.exception.PortalException)t; - } - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - 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 int countByCompanyIdSoggettoArchivio(long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableService.invokeMethod(_methodName13, - _methodParameterTypes13, - new Object[] { companyId, soggettoId }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.PortalException) { - throw (com.liferay.portal.kernel.exception.PortalException)t; - } - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return ((Integer)returnObj).intValue(); - } - - @Override - public java.util.List findByCompanyIdSoggettoAltriProgetti( - long companyId, long soggettoId, int start, int end) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableService.invokeMethod(_methodName14, - _methodParameterTypes14, - new Object[] { companyId, soggettoId, start, end }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.PortalException) { - throw (com.liferay.portal.kernel.exception.PortalException)t; - } - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - 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 int countByCompanyIdSoggettoAltriProgetti(long companyId, - long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableService.invokeMethod(_methodName15, - _methodParameterTypes15, - new Object[] { companyId, soggettoId }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.PortalException) { - throw (com.liferay.portal.kernel.exception.PortalException)t; - } - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return ((Integer)returnObj).intValue(); - } - @Override public java.util.List findByCanAddFineLavori( long companyId, java.lang.String codiceFiscale, int start, int end) @@ -621,8 +385,8 @@ public class IntPraticaServiceClp implements IntPraticaService { Object returnObj = null; try { - returnObj = _invokableService.invokeMethod(_methodName16, - _methodParameterTypes16, + returnObj = _invokableService.invokeMethod(_methodName10, + _methodParameterTypes10, new Object[] { companyId, @@ -664,8 +428,8 @@ public class IntPraticaServiceClp implements IntPraticaService { Object returnObj = null; try { - returnObj = _invokableService.invokeMethod(_methodName17, - _methodParameterTypes17, + returnObj = _invokableService.invokeMethod(_methodName11, + _methodParameterTypes11, new Object[] { companyId, @@ -703,8 +467,8 @@ public class IntPraticaServiceClp implements IntPraticaService { Object returnObj = null; try { - returnObj = _invokableService.invokeMethod(_methodName18, - _methodParameterTypes18, + returnObj = _invokableService.invokeMethod(_methodName12, + _methodParameterTypes12, new Object[] { companyId, @@ -746,8 +510,8 @@ public class IntPraticaServiceClp implements IntPraticaService { Object returnObj = null; try { - returnObj = _invokableService.invokeMethod(_methodName19, - _methodParameterTypes19, + returnObj = _invokableService.invokeMethod(_methodName13, + _methodParameterTypes13, new Object[] { companyId, @@ -788,8 +552,8 @@ public class IntPraticaServiceClp implements IntPraticaService { Object returnObj = null; try { - returnObj = _invokableService.invokeMethod(_methodName20, - _methodParameterTypes20, + returnObj = _invokableService.invokeMethod(_methodName14, + _methodParameterTypes14, new Object[] { intPraticaId, @@ -834,8 +598,8 @@ public class IntPraticaServiceClp implements IntPraticaService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableService.invokeMethod(_methodName21, - _methodParameterTypes21, new Object[] { intPraticaId, userId }); + _invokableService.invokeMethod(_methodName15, + _methodParameterTypes15, new Object[] { intPraticaId, userId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -864,8 +628,8 @@ public class IntPraticaServiceClp implements IntPraticaService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableService.invokeMethod(_methodName22, - _methodParameterTypes22, + _invokableService.invokeMethod(_methodName16, + _methodParameterTypes16, new Object[] { intPraticaId, controlloPraticaId, istruttoreId }); } catch (Throwable t) { @@ -889,39 +653,6 @@ public class IntPraticaServiceClp implements IntPraticaService { } } - @Override - public java.lang.String geosisma(long intPraticaId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableService.invokeMethod(_methodName23, - _methodParameterTypes23, new Object[] { intPraticaId }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.PortalException) { - throw (com.liferay.portal.kernel.exception.PortalException)t; - } - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return (java.lang.String)ClpSerializer.translateOutput(returnObj); - } - private InvokableService _invokableService; private String _methodName0; private String[] _methodParameterTypes0; @@ -955,18 +686,4 @@ public class IntPraticaServiceClp implements IntPraticaService { private String[] _methodParameterTypes15; private String _methodName16; private String[] _methodParameterTypes16; - private String _methodName17; - private String[] _methodParameterTypes17; - private String _methodName18; - private String[] _methodParameterTypes18; - private String _methodName19; - private String[] _methodParameterTypes19; - private String _methodName20; - private String[] _methodParameterTypes20; - private String _methodName21; - private String[] _methodParameterTypes21; - private String _methodName22; - private String[] _methodParameterTypes22; - private String _methodName23; - private String[] _methodParameterTypes23; } \ 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/IntPraticaServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaServiceUtil.java index 8b8d52a9..097a3b45 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaServiceUtil.java @@ -107,55 +107,6 @@ public class IntPraticaServiceUtil { return getService().countSearch(groupIds); } - public static java.util.List findByCompanyIdSoggettoProgetti( - long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return getService() - .findByCompanyIdSoggettoProgetti(companyId, soggettoId); - } - - public static int countByCompanyIdSoggettoProgetti(long companyId, - long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return getService() - .countByCompanyIdSoggettoProgetti(companyId, soggettoId); - } - - public static java.util.List findByCompanyIdSoggettoArchivio( - long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return getService() - .findByCompanyIdSoggettoArchivio(companyId, soggettoId); - } - - public static int countByCompanyIdSoggettoArchivio(long companyId, - long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return getService() - .countByCompanyIdSoggettoArchivio(companyId, soggettoId); - } - - public static java.util.List findByCompanyIdSoggettoAltriProgetti( - long companyId, long soggettoId, int start, int end) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return getService() - .findByCompanyIdSoggettoAltriProgetti(companyId, soggettoId, - start, end); - } - - public static int countByCompanyIdSoggettoAltriProgetti(long companyId, - long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return getService() - .countByCompanyIdSoggettoAltriProgetti(companyId, soggettoId); - } - public static java.util.List findByCanAddFineLavori( long companyId, java.lang.String codiceFiscale, int start, int end) throws com.liferay.portal.kernel.exception.PortalException, @@ -212,12 +163,6 @@ public class IntPraticaServiceUtil { .cambiaIstruttore(intPraticaId, controlloPraticaId, istruttoreId); } - public static java.lang.String geosisma(long intPraticaId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return getService().geosisma(intPraticaId); - } - public static void clearService() { _service = null; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaServiceWrapper.java index 31dbadbe..2f850cbb 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaServiceWrapper.java @@ -108,58 +108,6 @@ public class IntPraticaServiceWrapper implements IntPraticaService, return _intPraticaService.countSearch(groupIds); } - @Override - public java.util.List findByCompanyIdSoggettoProgetti( - long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return _intPraticaService.findByCompanyIdSoggettoProgetti(companyId, - soggettoId); - } - - @Override - public int countByCompanyIdSoggettoProgetti(long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return _intPraticaService.countByCompanyIdSoggettoProgetti(companyId, - soggettoId); - } - - @Override - public java.util.List findByCompanyIdSoggettoArchivio( - long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return _intPraticaService.findByCompanyIdSoggettoArchivio(companyId, - soggettoId); - } - - @Override - public int countByCompanyIdSoggettoArchivio(long companyId, long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return _intPraticaService.countByCompanyIdSoggettoArchivio(companyId, - soggettoId); - } - - @Override - public java.util.List findByCompanyIdSoggettoAltriProgetti( - long companyId, long soggettoId, int start, int end) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return _intPraticaService.findByCompanyIdSoggettoAltriProgetti(companyId, - soggettoId, start, end); - } - - @Override - public int countByCompanyIdSoggettoAltriProgetti(long companyId, - long soggettoId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return _intPraticaService.countByCompanyIdSoggettoAltriProgetti(companyId, - soggettoId); - } - @Override public java.util.List findByCanAddFineLavori( long companyId, java.lang.String codiceFiscale, int start, int end) @@ -223,13 +171,6 @@ public class IntPraticaServiceWrapper implements IntPraticaService, istruttoreId); } - @Override - public java.lang.String geosisma(long intPraticaId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return _intPraticaService.geosisma(intPraticaId); - } - /** * @deprecated As of 6.1.0, replaced by {@link #getWrappedService} */ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalService.java index 795f1072..77b3d7a7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalService.java @@ -373,4 +373,10 @@ public interface ParereGeologoLocalService extends BaseLocalService, public int countFindWithParereByGeologoId(long geologoUserId) throws com.liferay.portal.kernel.exception.SystemException; + + @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) + public java.util.Map getCarichiLavoro( + long controlloPraticaId, int giorni) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException; } \ 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/ParereGeologoLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceClp.java index 051993f0..cf0ca5aa 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceClp.java @@ -202,6 +202,10 @@ public class ParereGeologoLocalServiceClp implements ParereGeologoLocalService { _methodName38 = "countFindWithParereByGeologoId"; _methodParameterTypes38 = new String[] { "long" }; + + _methodName39 = "getCarichiLavoro"; + + _methodParameterTypes39 = new String[] { "long", "int" }; } @Override @@ -1384,6 +1388,41 @@ public class ParereGeologoLocalServiceClp implements ParereGeologoLocalService { return ((Integer)returnObj).intValue(); } + @Override + public java.util.Map getCarichiLavoro( + long controlloPraticaId, int giorni) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + Object returnObj = null; + + try { + returnObj = _invokableLocalService.invokeMethod(_methodName39, + _methodParameterTypes39, + new Object[] { controlloPraticaId, giorni }); + } + catch (Throwable t) { + t = ClpSerializer.translateThrowable(t); + + if (t instanceof com.liferay.portal.kernel.exception.PortalException) { + throw (com.liferay.portal.kernel.exception.PortalException)t; + } + + if (t instanceof com.liferay.portal.kernel.exception.SystemException) { + throw (com.liferay.portal.kernel.exception.SystemException)t; + } + + if (t instanceof RuntimeException) { + throw (RuntimeException)t; + } + else { + throw new RuntimeException(t.getClass().getName() + + " is not a valid exception"); + } + } + + return (java.util.Map)ClpSerializer.translateOutput(returnObj); + } + private InvokableLocalService _invokableLocalService; private String _methodName0; private String[] _methodParameterTypes0; @@ -1461,4 +1500,6 @@ public class ParereGeologoLocalServiceClp implements ParereGeologoLocalService { private String[] _methodParameterTypes37; private String _methodName38; private String[] _methodParameterTypes38; + private String _methodName39; + private String[] _methodParameterTypes39; } \ 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/ParereGeologoLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceUtil.java index d44b8684..cf404f6d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceUtil.java @@ -439,6 +439,13 @@ public class ParereGeologoLocalServiceUtil { return getService().countFindWithParereByGeologoId(geologoUserId); } + public static java.util.Map getCarichiLavoro( + long controlloPraticaId, int giorni) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return getService().getCarichiLavoro(controlloPraticaId, giorni); + } + public static void clearService() { _service = null; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceWrapper.java index b1e7dcf8..d78970b4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ParereGeologoLocalServiceWrapper.java @@ -478,6 +478,15 @@ public class ParereGeologoLocalServiceWrapper return _parereGeologoLocalService.countFindWithParereByGeologoId(geologoUserId); } + @Override + public java.util.Map getCarichiLavoro( + long controlloPraticaId, int giorni) + throws com.liferay.portal.kernel.exception.PortalException, + com.liferay.portal.kernel.exception.SystemException { + return _parereGeologoLocalService.getCarichiLavoro(controlloPraticaId, + giorni); + } + /** * @deprecated As of 6.1.0, replaced by {@link #getWrappedService} */ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java index c422c738..667e6d81 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/AvvisoUtil.java @@ -22,6 +22,7 @@ public class AvvisoUtil { private static Log _log = LogFactoryUtil.getLog(AvvisoUtil.class); + // Ogni volta che leggo queste due righe mi sale la cattiveria public final static String DOCUMENTO_INVIATO = "S"; public final static String DOCUMENTO_NON_INVIATO = "N"; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/scheduler/SchedulerWorkflow.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/scheduler/SchedulerWorkflow.java index 030d0e12..ff67f2ef 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/scheduler/SchedulerWorkflow.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/scheduler/SchedulerWorkflow.java @@ -2,7 +2,6 @@ package it.mwg.sismica.bo.scheduler; import it.mwg.sismica.bo.util.SismicaUtil; -import java.util.List; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; @@ -40,10 +39,8 @@ public class SchedulerWorkflow implements MessageListener { User user = UserLocalServiceUtil.getRoleUsers(role.getRoleId(), 0, 1).get(0); PermissionChecker permissionChecker = PermissionCheckerFactoryUtil.create(user); PermissionThreadLocal.setPermissionChecker(permissionChecker); - List esito = SismicaUtil.riparaWorkflow(companyId, user.getUserId()); - for (String riga : esito) { - _log.info(riga); - } + SismicaUtil.riparaWorkflow(companyId, user.getUserId()); + SismicaUtil.integrazioniScadute(); } } catch (Exception e) { e.printStackTrace(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/CarichiLavoroUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/CarichiLavoroUtil.java new file mode 100644 index 00000000..5aed8d00 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/CarichiLavoroUtil.java @@ -0,0 +1,24 @@ +package it.mwg.sismica.bo.util; + +import it.mwg.sismica.bo.shared.bean.CarichiLavoroBean; + +import java.util.Map; + +public class CarichiLavoroUtil { + + public static void incrementaCarico(Map carichi, String istruttore, boolean concluso) { + + if (!istruttore.isEmpty()) { + if (!carichi.containsKey(istruttore)) { + carichi.put(istruttore, new CarichiLavoroBean()); + } + CarichiLavoroBean carico = carichi.get(istruttore); + carico.incTotali(); + if (concluso) { + carico.incConclusi(); + } else { + carico.incInCorso(); + } + } + } +} diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/ManutenzioneDatabase.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/ManutenzioneDatabase.java index d0bc4e09..e401f1fc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/ManutenzioneDatabase.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/ManutenzioneDatabase.java @@ -190,8 +190,11 @@ public class ManutenzioneDatabase { if (mode.contains("!Gestione!")) { esito.addAll(SismicaUtil.gestionePratiche()); } - // if(mode.contains("!Integrazioni!")){SismicaUtil.integrazioniScadute();}if(mode.startsWith("!Workflow!")){String[] - // pezzi=StringUtil.split(mode, '!');esito.addAll(SismicaUtil.aggiungiWorkflow(pezzi[2],pezzi[3]));} + if (mode.contains("!Integrazioni!")) { + esito.addAll(SismicaUtil.integrazioniScadute()); + } + // if(mode.startsWith("!Workflow!")){String[] pezzi=StringUtil.split(mode, + // '!');esito.addAll(SismicaUtil.aggiungiWorkflow(pezzi[2],pezzi[3]));} return esito; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java index 73ae6dc5..813f07c2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java @@ -21,6 +21,7 @@ import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; import it.tref.liferay.portos.bo.util.AvvisoUtil; import it.tref.liferay.portos.bo.util.Constants; +import it.tref.liferay.portos.bo.util.WorkflowConstants; import java.io.Serializable; import java.text.ParseException; @@ -34,9 +35,14 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import com.liferay.counter.service.CounterLocalServiceUtil; +import com.liferay.portal.kernel.dao.orm.Disjunction; +import com.liferay.portal.kernel.dao.orm.DynamicQuery; import com.liferay.portal.kernel.dao.orm.QueryUtil; +import com.liferay.portal.kernel.dao.orm.RestrictionsFactoryUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.json.JSONFactoryUtil; import com.liferay.portal.kernel.language.LanguageUtil; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -46,17 +52,30 @@ import com.liferay.portal.kernel.util.LocaleUtil; import com.liferay.portal.kernel.util.OrderByComparatorFactoryUtil; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.kernel.workflow.WorkflowConstants; import com.liferay.portal.kernel.workflow.WorkflowException; import com.liferay.portal.kernel.workflow.WorkflowHandlerRegistryUtil; import com.liferay.portal.kernel.workflow.WorkflowInstance; import com.liferay.portal.kernel.workflow.WorkflowInstanceManagerUtil; import com.liferay.portal.kernel.workflow.WorkflowTask; import com.liferay.portal.kernel.workflow.WorkflowTaskManagerUtil; +import com.liferay.portal.model.Role; +import com.liferay.portal.model.RoleConstants; import com.liferay.portal.model.User; +import com.liferay.portal.model.WorkflowInstanceLink; +import com.liferay.portal.service.RoleLocalServiceUtil; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserLocalServiceUtil; +import com.liferay.portal.service.WorkflowInstanceLinkLocalServiceUtil; +import com.liferay.portal.workflow.kaleo.definition.LogType; +import com.liferay.portal.workflow.kaleo.model.KaleoInstance; +import com.liferay.portal.workflow.kaleo.model.KaleoInstanceToken; +import com.liferay.portal.workflow.kaleo.model.KaleoLog; +import com.liferay.portal.workflow.kaleo.model.KaleoNode; import com.liferay.portal.workflow.kaleo.model.KaleoTaskInstanceToken; +import com.liferay.portal.workflow.kaleo.service.KaleoInstanceLocalServiceUtil; +import com.liferay.portal.workflow.kaleo.service.KaleoInstanceTokenLocalServiceUtil; +import com.liferay.portal.workflow.kaleo.service.KaleoLogLocalServiceUtil; +import com.liferay.portal.workflow.kaleo.service.KaleoTaskAssignmentInstanceLocalServiceUtil; import com.liferay.portal.workflow.kaleo.service.KaleoTaskInstanceTokenLocalServiceUtil; import com.liferay.portlet.documentlibrary.service.DLAppServiceUtil; @@ -64,7 +83,7 @@ public class SismicaUtil { private final static Log _log = LogFactoryUtil.getLog(SismicaUtil.class); private static final SimpleDateFormat dfmt = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss"); - private static final SimpleDateFormat sdfGiornoDB = new SimpleDateFormat("yyyy-MM-dd"); + public static final SimpleDateFormat sdfGiornoDB = new SimpleDateFormat("yyyy-MM-dd"); private final static int SLICE = 200; public static Date[] getWeekInterval(int dow) { @@ -120,6 +139,160 @@ public class SismicaUtil { return null; } + public static List integrazioniScadute() throws SystemException, PortalException { + + List esito = new ArrayList<>(); + esitoLog(esito, "Controllo integrazioni/preavvisi scaduti"); + final int giorniIntegrazione = 30; + final int giorniPreavviso = 10; + final long taskId = 21642; + final String taskName = "Esito"; + final long nodeId = 21639; + final String nodeName = "Esito"; + final String validCurrentNodeName = "signal_cittadino"; + final String commento = "Pratica riassegnata automaticamente dal sistema per scadenza dei termini di integrazione"; + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.SECOND, 0); + calendar.add(Calendar.DAY_OF_YEAR, -giorniIntegrazione); + Map date = new HashMap<>(); + date.put(StatoPraticaConstants.INTEGRAZIONE, calendar.getTime()); + calendar.add(Calendar.DAY_OF_YEAR, giorniIntegrazione - giorniPreavviso); + date.put(StatoPraticaConstants.PREAVVISO_CONTRARIO, calendar.getTime()); + DynamicQuery query = IntPraticaLocalServiceUtil.dynamicQuery(); + Disjunction or = RestrictionsFactoryUtil.disjunction(); + or.add(RestrictionsFactoryUtil.eq("statoPratica", StatoPraticaConstants.INTEGRAZIONE)); + or.add(RestrictionsFactoryUtil.eq("statoPratica", StatoPraticaConstants.PREAVVISO_CONTRARIO)); + query.add(or); + Map scadute = new HashMap<>(); + scadute.put(StatoPraticaConstants.INTEGRAZIONE, 0); + scadute.put(StatoPraticaConstants.PREAVVISO_CONTRARIO, 0); + @SuppressWarnings("unchecked") + List pratiche = IntPraticaLocalServiceUtil.dynamicQuery(query); + for (IntPratica pratica : pratiche) { + Date dtUltimoAvviso = null; + String stato = pratica.getStatoPratica().toUpperCase(); + List avvisi = AvvisoLocalServiceUtil.findByIntPraticaId_tipoDocumento(pratica.getIntPraticaId(), + stato); + for (Avviso avviso : avvisi) { + if (avviso.getTipoAvviso().equalsIgnoreCase(AvvisoUtil.TIPO_AVVISO_FIRMA) + && avviso.getInviato().equalsIgnoreCase(AvvisoUtil.DOCUMENTO_INVIATO) && !avviso.getAnnullato() + && !avviso.getRifiutato() && !avviso.getErrore() + && (Validator.isNull(dtUltimoAvviso) || dtUltimoAvviso.before(avviso.getDtInvio()))) { + dtUltimoAvviso = avviso.getDtInvio(); + } + } + if (Validator.isNotNull(dtUltimoAvviso) && dtUltimoAvviso.before(date.get(stato))) { + scadute.put(stato, scadute.get(stato) + 1); + esito.addAll(riassegnaAlTecnico(pratica, commento, validCurrentNodeName, taskId, taskName, nodeId, + nodeName)); + } + } + return esito; + } + + private static List riassegnaAlTecnico(IntPratica pratica, String comment, String validCurrentNodeName, + long taskId, String taskName, long nodeId, String nodeName) throws SystemException, PortalException { + + List esito = new ArrayList<>(); + List controlli = ControlloPraticaLocalServiceUtil.findByIntPraticaId_Status( + pratica.getIntPraticaId(), WorkflowConstants.STATUS_PENDING); + if (1 == controlli.size()) { + ControlloPratica controllo = controlli.get(0); + long companyId = controllo.getCompanyId(); + long groupId = controllo.getGroupId(); + long tecnicoUserId = pratica.getStatusByUserId(); + WorkflowInstanceLink instanceLink = WorkflowInstanceLinkLocalServiceUtil.getWorkflowInstanceLink(companyId, + groupId, ControlloPratica.class.getName(), controllo.getPrimaryKey()); + KaleoInstance instance = KaleoInstanceLocalServiceUtil.getKaleoInstance(instanceLink + .getWorkflowInstanceId()); + KaleoInstanceToken instanceToken = KaleoInstanceTokenLocalServiceUtil.getKaleoInstanceToken(instance + .getRootKaleoInstanceTokenId()); + if (Validator.isNull(validCurrentNodeName) + || validCurrentNodeName.equals(instanceToken.getCurrentKaleoNodeName())) { + Date adesso = new Date(); + Role adminRole = RoleLocalServiceUtil.getRole(companyId, RoleConstants.ADMINISTRATOR); + User adminUser = UserLocalServiceUtil.getRoleUsers(adminRole.getRoleId(), 0, 1).get(0); + ServiceContext scAdmin = new ServiceContext(); + scAdmin.setCompanyId(companyId); + scAdmin.setScopeGroupId(groupId); + scAdmin.setUserId(adminUser.getUserId()); + ServiceContext scTecnico = new ServiceContext(); + scTecnico.setCompanyId(companyId); + scTecnico.setScopeGroupId(groupId); + scTecnico.setUserId(tecnicoUserId); + List taskInstanceTokens = KaleoTaskInstanceTokenLocalServiceUtil + .getKaleoTaskInstanceTokens(instance.getKaleoInstanceId(), true, 0, 1, + OrderByComparatorFactoryUtil.create("KaleoTaskInstanceToken", + "kaleoTaskInstanceTokenId", false), scTecnico); + if (taskInstanceTokens.size() > 0) { + @SuppressWarnings("unchecked") + Map workflowContext = (Map) JSONFactoryUtil + .deserialize(taskInstanceTokens.get(0).getWorkflowContext()); + long definitionId = taskInstanceTokens.get(0).getKaleoDefinitionId(); + User tecnicoUser = UserLocalServiceUtil.getUser(tecnicoUserId); + KaleoTaskInstanceToken taskInstanceToken = KaleoTaskInstanceTokenLocalServiceUtil + .createKaleoTaskInstanceToken(CounterLocalServiceUtil.increment()); + taskInstanceToken.setGroupId(groupId); + taskInstanceToken.setCompanyId(companyId); + taskInstanceToken.setUserId(adminUser.getUserId()); + taskInstanceToken.setUserName(adminUser.getFullName()); + taskInstanceToken.setCreateDate(adesso); + taskInstanceToken.setModifiedDate(adesso); + taskInstanceToken.setKaleoDefinitionId(definitionId); + taskInstanceToken.setKaleoInstanceId(instance.getKaleoInstanceId()); + taskInstanceToken.setKaleoInstanceTokenId(instanceToken.getKaleoInstanceTokenId()); + taskInstanceToken.setKaleoTaskId(taskId); + taskInstanceToken.setKaleoTaskName(taskName); + taskInstanceToken.setClassName(ControlloPratica.class.getName()); + taskInstanceToken.setClassPK(controllo.getPrimaryKey()); + taskInstanceToken.setWorkflowContext(JSONFactoryUtil.serialize(workflowContext)); + KaleoTaskAssignmentInstanceLocalServiceUtil.addKaleoTaskAssignmentInstance(groupId, + taskInstanceToken, User.class.getName(), tecnicoUserId, scAdmin); + KaleoTaskInstanceTokenLocalServiceUtil.updateKaleoTaskInstanceToken(taskInstanceToken); + KaleoLog log = KaleoLogLocalServiceUtil.createKaleoLog(CounterLocalServiceUtil.increment()); + log.setUserId(adminUser.getUserId()); + log.setUserName(adminUser.getFullName()); + log.setCompanyId(companyId); + log.setCreateDate(adesso); + log.setModifiedDate(adesso); + log.setKaleoClassName(KaleoNode.class.getName()); + log.setKaleoClassPK(nodeId); + log.setKaleoDefinitionId(definitionId); + log.setKaleoInstanceId(instance.getKaleoInstanceId()); + log.setKaleoInstanceTokenId(instanceToken.getKaleoInstanceTokenId()); + log.setKaleoTaskInstanceTokenId(taskInstanceToken.getKaleoTaskInstanceTokenId()); + log.setKaleoNodeName(nodeName); + log.setCurrentAssigneeClassName(User.class.getName()); + log.setCurrentAssigneeClassPK(tecnicoUserId); + log.setType(LogType.TASK_ASSIGNMENT.name()); + log.setComment(comment); + log.setStartDate(adesso); + log.setWorkflowContext(JSONFactoryUtil.serialize(workflowContext)); + KaleoLogLocalServiceUtil.updateKaleoLog(log); + instanceToken.setCurrentKaleoNodeId(nodeId); + instanceToken.setCurrentKaleoNodeName(nodeName); + KaleoInstanceTokenLocalServiceUtil.updateKaleoInstanceToken(instanceToken); + esitoLog(esito, "Riassegnato workflow instance " + instance.getKaleoInstanceId() + " per pratica " + + pratica.getNumeroProgetto() + " (" + pratica.getIntPraticaId() + "), istruttore " + + tecnicoUser.getFullName()); + } else { + esitoLog( + esito, + "Errore su integrazione. Pratica " + pratica.getNumeroProgetto() + " (" + + pratica.getIntPraticaId() + "), controllo " + controllo.getControlloPraticaId() + + ", taskInstanceToken = " + taskInstanceTokens.size()); + } + } + } else { + esitoLog(esito, + "Errore su integrazione. Pratica " + pratica.getNumeroProgetto() + " (" + pratica.getIntPraticaId() + + "), numero di controlli = " + controlli.size()); + } + return esito; + } + public static List riparaWorkflow(String numeroProgetto) throws SystemException, PortalException { List esito = new ArrayList<>(); @@ -203,7 +376,7 @@ public class SismicaUtil { _log.info("Reindicizzate " + start + " pratiche"); } } while (pratiche.size() > 0); - esito.add("" + start + " pratiche reindicizzate."); + esitoLog(esito, "" + start + " pratiche reindicizzate."); return esito; } @@ -217,14 +390,14 @@ public class SismicaUtil { try { esito.addAll(riparaDocumenti(companyId)); } catch (SystemException | PortalException e) { - esito.add("Errore durante l'elaborazione: " + e.getMessage()); + esitoLog(esito, "Errore durante l'elaborazione: " + e.getMessage()); } return esito; } public static List gestionePratiche() { List esito = new ArrayList<>(); - esito.add("Gestione pratiche"); + esitoLog(esito, "Gestione pratiche"); int start = 0; List pratiche = null; try { @@ -237,8 +410,10 @@ public class SismicaUtil { DettPratica dettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(pratica .getIntPraticaId()); if (Validator.isNotNull(dettPratica)) { - esito.add("Gestione pratica " + pratica.getNumeroProgetto() + " (id " - + pratica.getIntPraticaId() + ")"); + esitoLog( + esito, + "Gestione pratica " + pratica.getNumeroProgetto() + " (id " + + pratica.getIntPraticaId() + ")"); dettPratica.setGestita(false); DettPraticaLocalServiceUtil.updateDettPratica(dettPratica); ServiceContext serviceContext = new ServiceContext(); @@ -252,7 +427,7 @@ public class SismicaUtil { start += pratiche.size(); } while (pratiche.size() > 0); } catch (Exception e) { - esito.add("Errore durante l'elaborazione " + e.getMessage()); + esitoLog(esito, "Errore durante l'elaborazione " + e.getMessage()); } return esito; } @@ -260,14 +435,14 @@ public class SismicaUtil { private static List riparaAssegnazioniAlRuolo(long companyId, long userId) { List esito = new ArrayList<>(); - esito.add("Controllo assegnazioni al ruolo"); + esitoLog(esito, "Controllo assegnazioni al ruolo"); int start = 0; List tasks = null; do { try { tasks = WorkflowTaskManagerUtil.getWorkflowTasks(companyId, false, start, start + SLICE, null); } catch (WorkflowException e) { - esito.add("Errore durante il recupero dei task: " + e.getMessage()); + esitoLog(esito, "Errore durante il recupero dei task: " + e.getMessage()); tasks = new ArrayList<>(); } start += SLICE; @@ -276,8 +451,10 @@ public class SismicaUtil { try { instance = WorkflowInstanceManagerUtil.getWorkflowInstance(companyId, task.getWorkflowInstanceId()); } catch (WorkflowException e) { - esito.add("Errore durante il recupero di WorkflowInstance per WorkflowTask " - + task.getWorkflowTaskId() + ": " + e.getMessage()); + esitoLog( + esito, + "Errore durante il recupero di WorkflowInstance per WorkflowTask " + + task.getWorkflowTaskId() + ": " + e.getMessage()); return esito; } long assigneeId = task.getAssigneeUserId(); @@ -292,15 +469,15 @@ public class SismicaUtil { try { controllo = ControlloPraticaLocalServiceUtil.getControlloPratica(classPK); } catch (PortalException | SystemException e) { - esito.add("Errore durante il recupero del ControlloPratica " + classPK + ", WorkflowTask " - + task.getWorkflowTaskId() + ": " + e.getMessage()); + esitoLog(esito, "Errore durante il recupero del ControlloPratica " + classPK + + ", WorkflowTask " + task.getWorkflowTaskId() + ": " + e.getMessage()); return esito; } IntPratica pratica; try { pratica = IntPraticaLocalServiceUtil.getIntPratica(controllo.getIntPraticaId()); } catch (PortalException | SystemException e) { - esito.add("Errore durante il recupero di IntPratica " + controllo.getIntPraticaId() + esitoLog(esito, "Errore durante il recupero di IntPratica " + controllo.getIntPraticaId() + ", ControlloPratica " + classPK + ", WorkflowTask " + task.getWorkflowTaskId() + ": " + e.getMessage()); return esito; @@ -309,23 +486,25 @@ public class SismicaUtil { try { user = UserLocalServiceUtil.getUser(pratica.getStatusByUserId()); } catch (PortalException | SystemException e) { - esito.add("Errore durante il recupero dell'utente " + pratica.getStatusByUserId()); + esitoLog(esito, "Errore durante il recupero dell'utente " + pratica.getStatusByUserId()); return esito; } - esito.add("Pratica non assegnabile " + pratica.getNumeroProgetto() + " (" - + pratica.getIntPraticaId() + ") - Kaleo disallineato WorkflowInstance " - + instance.getWorkflowInstanceId() + ", riassegno a " + user.getFirstName() - + StringPool.SPACE + user.getLastName()); + esitoLog( + esito, + "Pratica non assegnabile " + pratica.getNumeroProgetto() + " (" + + pratica.getIntPraticaId() + ") - Kaleo disallineato WorkflowInstance " + + instance.getWorkflowInstanceId() + ", riassegno a " + user.getFirstName() + + StringPool.SPACE + user.getLastName()); try { WorkflowTaskManagerUtil.assignWorkflowTaskToUser(companyId, userId, task.getWorkflowTaskId(), pratica.getStatusByUserId(), "Riassegnazione automatica da sistema per recupero workflow", task.getDueDate(), instance.getWorkflowContext()); } catch (WorkflowException e) { - esito.add("Errore durante la riassegnazione: " + e.getMessage()); + esitoLog(esito, "Errore durante la riassegnazione: " + e.getMessage()); } } else { - esito.add("La classe del task è " + taskClass); + esitoLog(esito, "La classe del task è " + taskClass); } } } @@ -336,7 +515,7 @@ public class SismicaUtil { private static List riparaConformita(long companyId) { List esito = new ArrayList<>(); - esito.add("Riparazione avvisi di conformità"); + esitoLog(esito, "Riparazione avvisi di conformità"); List pratiche = null; int start = 0; @@ -344,7 +523,7 @@ public class SismicaUtil { try { pratiche = IntPraticaLocalServiceUtil.getIntPraticas(start, start + SLICE); } catch (SystemException e) { - esito.add("Errore caricamento intPratiche: " + e.getMessage()); + esitoLog(esito, "Errore caricamento intPratiche: " + e.getMessage()); } start += SLICE; List avvisi = null; @@ -356,7 +535,7 @@ public class SismicaUtil { avvisi = AvvisoLocalServiceUtil.findByIntPraticaId_tipoDocumento(pratica.getIntPraticaId(), StatoPraticaConstants.CONFORME); } catch (SystemException e) { - esito.add("Errore caricamento avvisi: " + e.getMessage()); + esitoLog(esito, "Errore caricamento avvisi: " + e.getMessage()); } List totali = null; try { @@ -373,9 +552,12 @@ public class SismicaUtil { controlli = new ArrayList<>(); } if (pratica.getStatoPratica().equals(StatoPraticaConstants.VIDIMATA) && (controlli.size() == 0)) { - esito.add("Progetto: " + pratica.getNumeroProgetto() + " (" + pratica.getIntPraticaId() - + "), procedura=" + pratica.getTipoProcedura() + ", avvisi=" + totali.size() - + ", stato=" + pratica.getStatoPratica() + ", controlli=" + controlli.size()); + esitoLog( + esito, + "Progetto: " + pratica.getNumeroProgetto() + " (" + pratica.getIntPraticaId() + + "), procedura=" + pratica.getTipoProcedura() + ", avvisi=" + + totali.size() + ", stato=" + pratica.getStatoPratica() + ", controlli=" + + controlli.size()); DettPratica dettPratica; try { @@ -423,7 +605,7 @@ public class SismicaUtil { } } else if ((totali.size() == 2) && (avvisi.size() > 0) && stato.equalsIgnoreCase(StatoPraticaConstants.SOTTOPOSTA_A_PARERE)) { - esito.add("Rendo conforme: " + pratica.getNumeroProgetto()); + esitoLog(esito, "Rendo conforme: " + pratica.getNumeroProgetto()); pratica.setStatoPratica(StatoPraticaConstants.CONFORME); try { IntPraticaLocalServiceUtil.updateIntPratica(pratica); @@ -439,14 +621,14 @@ public class SismicaUtil { private static List riparaContextWorkflow(long companyId) { List esito = new ArrayList<>(); - esito.add("Riparazione context workflow"); + esitoLog(esito, "Riparazione context workflow"); int start = 0; List tasks = null; do { try { tasks = WorkflowTaskManagerUtil.getWorkflowTasks(companyId, false, start, start + SLICE, null); } catch (WorkflowException e) { - esito.add("Errore durante il recupero dei task: " + e.getMessage()); + esitoLog(esito, "Errore durante il recupero dei task: " + e.getMessage()); tasks = new ArrayList<>(); } start += SLICE; @@ -466,7 +648,7 @@ public class SismicaUtil { Map workflowContext = workflowInstance.getWorkflowContext(); String className = (String) workflowContext.get(WorkflowConstants.CONTEXT_ENTRY_CLASS_NAME); if (Validator.isNull(className)) { - esito.add("WorkflowInstance " + workflowInstance.getWorkflowInstanceId() + ", WorkflowTask " + esitoLog(esito, "WorkflowInstance " + workflowInstance.getWorkflowInstanceId() + ", WorkflowTask " + workflowTask.getWorkflowTaskId() + " non ha la classe"); Map attributes = workflowTask.getOptionalAttributes(); String taskClass = (String) attributes.get(WorkflowConstants.CONTEXT_ENTRY_CLASS_NAME); @@ -477,27 +659,28 @@ public class SismicaUtil { ControlloPratica controllo = ControlloPraticaLocalServiceUtil.getControlloPratica(classPK); try { IntPratica pratica = IntPraticaLocalServiceUtil.getIntPratica(controllo.getIntPraticaId()); - esito.add("La pratica numero " + pratica.getNumeroProgetto() + " non è lavorabile"); + esitoLog(esito, "La pratica numero " + pratica.getNumeroProgetto() + " non è lavorabile"); try { WorkflowInstanceManagerUtil.updateWorkflowContext(companyId, workflowInstance.getWorkflowInstanceId(), attributes); - esito.add("> Riparazione riuscita"); + esitoLog(esito, "> Riparazione riuscita"); } catch (WorkflowException e) { - esito.add("> Errore durante riparazione."); + esitoLog(esito, "> Errore durante riparazione."); } } catch (PortalException | SystemException e) { - esito.add("Errore di caricamento IntPratica " + controllo.getIntPraticaId() + " (" + esitoLog(esito, "Errore di caricamento IntPratica " + controllo.getIntPraticaId() + " (" + e.getMessage() + StringPool.CLOSE_PARENTHESIS); } } catch (PortalException | SystemException e) { - esito.add("Errore di caricamento ControlloPratica " + classPK + " (" + e.getMessage() + esitoLog(esito, "Errore di caricamento ControlloPratica " + classPK + " (" + e.getMessage() + StringPool.CLOSE_PARENTHESIS); } } } } catch (WorkflowException e) { - esito.add("WorkflowInstance non caricato: " + workflowTask.getWorkflowInstanceId() + " (" + e.getMessage() - + StringPool.CLOSE_PARENTHESIS); + esitoLog(esito, + "WorkflowInstance non caricato: " + workflowTask.getWorkflowInstanceId() + " (" + e.getMessage() + + StringPool.CLOSE_PARENTHESIS); } return esito; } @@ -505,7 +688,7 @@ public class SismicaUtil { private static List creaWorkflowMancanti(long companyId) { List esito = new ArrayList<>(); - esito.add("Creazione workflow mancanti"); + esitoLog(esito, "Creazione workflow mancanti"); List tokens = new ArrayList<>(); try { for (KaleoTaskInstanceToken token : KaleoTaskInstanceTokenLocalServiceUtil.getKaleoTaskInstanceTokens( @@ -547,13 +730,13 @@ public class SismicaUtil { serviceContext.setScopeGroupId(last.getGroupId()); serviceContext.setUserId(last.getUserId()); Map workflowContext = new HashMap(); - esito.add("id: " + pratica.getIntPraticaId() + ", numero: " + pratica.getNumeroProgetto()); + esitoLog(esito, "id: " + pratica.getIntPraticaId() + ", numero: " + pratica.getNumeroProgetto()); try { WorkflowHandlerRegistryUtil.startWorkflowInstance(last.getCompanyId(), last.getGroupId(), last.getUserId(), ControlloPratica.class.getName(), last.getPrimaryKey(), last, serviceContext, workflowContext); } catch (PortalException | SystemException e) { - esito.add("Errore " + e.getMessage()); + esitoLog(esito, "Errore " + e.getMessage()); } } } @@ -570,7 +753,7 @@ public class SismicaUtil { private static List riparaDocumenti(long companyId) throws SystemException, PortalException { List esito = new ArrayList(); - esito.add("Riparazione generazione documenti"); + esitoLog(esito, "Riparazione generazione documenti"); initTemplate(companyId); List intPratiche = null; int index = 0; @@ -578,7 +761,7 @@ public class SismicaUtil { try { intPratiche = IntPraticaLocalServiceUtil.getIntPraticas(index, index + SLICE); } catch (SystemException e) { - esito.add("Errore caricamento intPratiche: " + e.getMessage()); + esitoLog(esito, "Errore caricamento intPratiche: " + e.getMessage()); } for (IntPratica intPratica : intPratiche) { esito.addAll(verificaAvvisi(intPratica)); @@ -674,11 +857,11 @@ public class SismicaUtil { case StatoPraticaConstants.VIDIMATA: if (avviso.getTipoAvviso().equals(AvvisoUtil.TIPO_AVVISO_DIRETTO)) { esito.addAll(addStoricoAvvisi(intPratica, avvisi)); - esito.add("Invio " + template + " (" + controlli.size() + " controlli)"); + esitoLog(esito, "Invio " + template + " (" + controlli.size() + " controlli)"); try { if (Validator.isNull(controllo)) { controllo = aggiungiControlloPratica(intPratica); - esito.add(intPratica.getNumeroProgetto() + " aggiunto ControlloPratica " + esitoLog(esito, intPratica.getNumeroProgetto() + " aggiunto ControlloPratica " + controllo.getControlloPraticaId()); } AvvisoLocalServiceUtil.addAvviso(intPraticaId, StringPool.BLANK, @@ -687,14 +870,14 @@ public class SismicaUtil { DettPratica.class.getName(), controllo.getControlloPraticaId(), serviceContext); } catch (Exception e) { - esito.add("Errore durante l'invio: " + e.getMessage()); + esitoLog(esito, "Errore durante l'invio: " + e.getMessage()); } } break; default: if (avviso.getTipoAvviso().equals(AvvisoUtil.TIPO_AVVISO_DIRETTO)) { esito.addAll(addStoricoAvvisi(intPratica, avvisi)); - esito.add("Procederei all'invio di avviso " + template); + esitoLog(esito, "Procederei all'invio di avviso " + template); } break; } @@ -741,22 +924,26 @@ public class SismicaUtil { List esito = new ArrayList(); String tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-" + intPratica.getTipoPratica()); - esito.add("intPraticaId=" + intPratica.getIntPraticaId() + ", numeroProgetto=" - + intPratica.getNumeroProgetto() + ", procedura=" + intPratica.getTipoProcedura() + ", stato=" - + intPratica.getStatoPratica() + ", tipo=" + tipoPratica + ", data=" - + dfmt.format(intPratica.getCreateDate()) + ", modificata=" + dfmt.format(intPratica.getModifiedDate()) - + ""); + esitoLog( + esito, + "intPraticaId=" + intPratica.getIntPraticaId() + ", numeroProgetto=" + + intPratica.getNumeroProgetto() + ", procedura=" + intPratica.getTipoProcedura() + ", stato=" + + intPratica.getStatoPratica() + ", tipo=" + tipoPratica + ", data=" + + dfmt.format(intPratica.getCreateDate()) + ", modificata=" + + dfmt.format(intPratica.getModifiedDate()) + ""); for (Avviso avviso : avvisi) { String template = templateById.get(avviso.getFileEntryIdTemplate()); if (template == null) { template = templateByKey.get(avviso.getTipoDocumento()); } boolean inviato = avviso.getInviato().equalsIgnoreCase(AvvisoUtil.DOCUMENTO_INVIATO); - esito.add(dfmt.format(avviso.getDtAvviso()) + " Avviso " + template + " " - + (inviato ? "inviato " + dfmt.format(avviso.getDtInvio()) : "non inviato") - + " - tipo avviso " + avviso.getTipoAvviso() + " - tipo documento " - + avviso.getTipoDocumento()); + esitoLog( + esito, + dfmt.format(avviso.getDtAvviso()) + " Avviso " + template + " " + + (inviato ? "inviato " + dfmt.format(avviso.getDtInvio()) : "non inviato") + + " - tipo avviso " + avviso.getTipoAvviso() + " - tipo documento " + + avviso.getTipoDocumento()); } return esito; } @@ -801,8 +988,8 @@ public class SismicaUtil { List controlli = ControlloPraticaLocalServiceUtil.findByIntPratica(pratica .getIntPraticaId()); if (controlli.size() > 0) { - esito.add("Pratica " + tipoPratica + StringPool.SPACE + pratica.getNumeroProgetto() + " (" - + pratica.getIntPraticaId() + ") invio vidimazione per " + varianti.size() + esitoLog(esito, "Pratica " + tipoPratica + StringPool.SPACE + pratica.getNumeroProgetto() + + " (" + pratica.getIntPraticaId() + ") invio vidimazione per " + varianti.size() + " varianti non sostanziali, già inviate " + inviate); for (Avviso avviso : varianti) { DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(avviso diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ControlloPraticaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ControlloPraticaImpl.java index 04064702..1942838f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ControlloPraticaImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/ControlloPraticaImpl.java @@ -14,6 +14,11 @@ package it.tref.liferay.portos.bo.model.impl; +import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.exception.SystemException; + +import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; + /** * The extended model implementation for the ControlloPratica service. Represents a row in the * "portos_bo_ControlloPratica" database table, with each column mapped to a property of this class. @@ -33,4 +38,13 @@ public class ControlloPraticaImpl extends ControlloPraticaBaseImpl { */ public ControlloPraticaImpl() { } + + public int getUnitaOperativa() { + + try { + return IntPraticaLocalServiceUtil.getIntPratica(getIntPraticaId()).getUnitaOperativa(); + } catch (PortalException | SystemException e) { + return 0; + } + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/CarichiLavoroPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/CarichiLavoroPortlet.java index a28e40d4..19bb4fbe 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/CarichiLavoroPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/CarichiLavoroPortlet.java @@ -1,6 +1,18 @@ package it.tref.liferay.portos.bo.portlet; +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; + +import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.util.PortalUtil; import com.liferay.util.bridges.mvc.MVCPortlet; public class CarichiLavoroPortlet extends MVCPortlet { + + public void calcolaCarichi(ActionRequest actionRequest, ActionResponse actionResponse) throws PortalException, + SystemException { + + PortalUtil.copyRequestParameters(actionRequest, actionResponse); + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/DocAggiuntivaPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/DocAggiuntivaPortlet.java index 92683351..3b1fc092 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/DocAggiuntivaPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/DocAggiuntivaPortlet.java @@ -45,6 +45,7 @@ public class DocAggiuntivaPortlet extends MVCPortlet { public void uploadDocAggiuntiva(ActionRequest actionRequest, ActionResponse actionResponse) throws PortalException, SystemException { + try { UploadPortletRequest uploadRequest = PortalUtil.getUploadPortletRequest(actionRequest); ServiceContext serviceContext = ServiceContextFactory.getInstance(uploadRequest); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerInvioDocumento.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerInvioDocumento.java index 2cf542e0..e724022f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerInvioDocumento.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerInvioDocumento.java @@ -163,7 +163,7 @@ public class SchedulerInvioDocumento implements MessageListener { .getControlloPraticaId()); invioSignal(avviso, controlloPratica); } catch (Exception e) { - _log.info(e.getMessage() + StringPool.SPACE + avviso.getAvvisoId() + StringPool.SPACE + _log.info(e.getMessage() + ", avviso " + avviso.getAvvisoId() + ", controlloPratica " + avviso.getControlloPraticaId()); _log.debug("Error", e); } @@ -207,7 +207,7 @@ public class SchedulerInvioDocumento implements MessageListener { .getControlloPratica(controlloPraticaId); gestioneTempistica(avviso, controlloPratica); } catch (Exception e) { - _log.info(e.getMessage() + StringPool.SPACE + avviso.getAvvisoId() + StringPool.SPACE + _log.info(e.getMessage() + ", avviso " + avviso.getAvvisoId() + ", controlloPratica " + avviso.getControlloPraticaId()); _log.debug("Error", e); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceClpInvoker.java index cf28f031..93f48f5b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceClpInvoker.java @@ -233,6 +233,14 @@ public class ControlloPraticaLocalServiceClpInvoker { _methodName228 = "calculateDateAvvioProcedimento"; _methodParameterTypes228 = new String[] { "long" }; + + _methodName229 = "getOrganizationByControlloPraticaId"; + + _methodParameterTypes229 = new String[] { "long" }; + + _methodName230 = "getCarichiLavoro"; + + _methodParameterTypes230 = new String[] { "long", "int" }; } public Object invokeMethod(String name, String[] parameterTypes, @@ -501,6 +509,17 @@ public class ControlloPraticaLocalServiceClpInvoker { return ControlloPraticaLocalServiceUtil.calculateDateAvvioProcedimento(((Long)arguments[0]).longValue()); } + if (_methodName229.equals(name) && + Arrays.deepEquals(_methodParameterTypes229, parameterTypes)) { + return ControlloPraticaLocalServiceUtil.getOrganizationByControlloPraticaId(((Long)arguments[0]).longValue()); + } + + if (_methodName230.equals(name) && + Arrays.deepEquals(_methodParameterTypes230, parameterTypes)) { + return ControlloPraticaLocalServiceUtil.getCarichiLavoro(((Long)arguments[0]).longValue(), + ((Integer)arguments[1]).intValue()); + } + throw new UnsupportedOperationException(); } @@ -590,4 +609,8 @@ public class ControlloPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes227; private String _methodName228; private String[] _methodParameterTypes228; + private String _methodName229; + private String[] _methodParameterTypes229; + private String _methodName230; + private String[] _methodParameterTypes230; } \ 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/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 c509cd31..48b0640d 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 @@ -212,210 +212,182 @@ public class IntPraticaLocalServiceClpInvoker { _methodParameterTypes195 = new String[] { "long", "int" }; - _methodName196 = "findByCompanyIdSoggettoProgetti"; + _methodName196 = "findByCanAddFineLavori"; - _methodParameterTypes196 = new String[] { "long", "long" }; - - _methodName197 = "countByCompanyIdSoggettoProgetti"; - - _methodParameterTypes197 = new String[] { "long", "long" }; - - _methodName199 = "findByCompanyIdSoggettoArchivio"; - - _methodParameterTypes199 = new String[] { "long", "long" }; - - _methodName200 = "countByCompanyIdSoggettoArchivio"; - - _methodParameterTypes200 = new String[] { "long", "long" }; - - _methodName202 = "findByCompanyIdSoggettoAltriProgetti"; - - _methodParameterTypes202 = new String[] { "long", "long", "int", "int" }; - - _methodName203 = "countByCompanyIdSoggettoAltriProgetti"; - - _methodParameterTypes203 = new String[] { "long", "long" }; - - _methodName205 = "findByCanAddFineLavori"; - - _methodParameterTypes205 = new String[] { + _methodParameterTypes196 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName206 = "countByCanAddFineLavori"; + _methodName197 = "countByCanAddFineLavori"; - _methodParameterTypes206 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes197 = new String[] { "long", "java.lang.String" }; - _methodName208 = "findByCanAddCollaudo"; + _methodName199 = "findByCanAddCollaudo"; - _methodParameterTypes208 = new String[] { + _methodParameterTypes199 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName209 = "countByCanAddCollaudo"; + _methodName200 = "countByCanAddCollaudo"; - _methodParameterTypes209 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes200 = new String[] { "long", "java.lang.String" }; - _methodName210 = "search"; + _methodName201 = "search"; - _methodParameterTypes210 = new String[] { "java.util.List", "int", "int" }; + _methodParameterTypes201 = new String[] { "java.util.List", "int", "int" }; - _methodName211 = "countSearch"; + _methodName202 = "countSearch"; - _methodParameterTypes211 = new String[] { "java.util.List" }; + _methodParameterTypes202 = new String[] { "java.util.List" }; - _methodName212 = "searchWithIntPraticaId"; + _methodName203 = "searchWithIntPraticaId"; - _methodParameterTypes212 = new String[] { + _methodParameterTypes203 = new String[] { "java.util.List", "long", "int", "int" }; - _methodName213 = "countSearchWithIntPraticaId"; - - _methodParameterTypes213 = new String[] { "java.util.List", "long" }; + _methodName204 = "allegaFileAnnullamento"; - _methodName214 = "allegaFileAnnullamento"; - - _methodParameterTypes214 = new String[] { + _methodParameterTypes204 = new String[] { "long", "byte[][]", "java.lang.String", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName215 = "generateFileAnnullamento"; + _methodName205 = "generateFileAnnullamento"; - _methodParameterTypes215 = new String[] { + _methodParameterTypes205 = new String[] { "long", "com.liferay.portal.service.ServiceContext" }; - _methodName216 = "deleteFileAnnullamento"; + _methodName206 = "deleteFileAnnullamento"; - _methodParameterTypes216 = new String[] { "long" }; + _methodParameterTypes206 = new String[] { "long" }; - _methodName217 = "completeAnnullamento"; + _methodName207 = "completeAnnullamento"; - _methodParameterTypes217 = new String[] { "long" }; + _methodParameterTypes207 = new String[] { "long" }; - _methodName218 = "cambiaIstruttore"; + _methodName208 = "cambiaIstruttore"; - _methodParameterTypes218 = new String[] { "long", "long", "long" }; + _methodParameterTypes208 = new String[] { "long", "long", "long" }; - _methodName219 = "countCaricoLavoroCF"; + _methodName209 = "countCaricoLavoroCF"; - _methodParameterTypes219 = new String[] { + _methodParameterTypes209 = new String[] { "long", "java.lang.String", "java.lang.Long[][]" }; - _methodName220 = "countCaricoLavoroIstruttore"; + _methodName210 = "countCaricoLavoroIstruttore"; - _methodParameterTypes220 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes210 = new String[] { "long", "java.lang.String" }; - _methodName221 = "generateReportPratica"; + _methodName211 = "generateReportPratica"; - _methodParameterTypes221 = new String[] { + _methodParameterTypes211 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName222 = "updateModifiedDate"; + _methodName212 = "updateModifiedDate"; - _methodParameterTypes222 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes212 = new String[] { "long", "java.util.Date" }; - _methodName223 = "countAutorizzazione"; + _methodName213 = "countAutorizzazione"; - _methodParameterTypes223 = new String[] { + _methodParameterTypes213 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName224 = "countSanatorie"; + _methodName214 = "countSanatorie"; - _methodParameterTypes224 = new String[] { + _methodParameterTypes214 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName225 = "countOpereMinoreImportanza"; + _methodName215 = "countOpereMinoreImportanza"; - _methodParameterTypes225 = new String[] { + _methodParameterTypes215 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName226 = "countDeposito"; + _methodName216 = "countDeposito"; - _methodParameterTypes226 = new String[] { + _methodParameterTypes216 = new String[] { "java.util.Date", "java.util.Date", "long", "boolean" }; - _methodName227 = "countVidimate"; + _methodName217 = "countVidimate"; - _methodParameterTypes227 = new String[] { + _methodParameterTypes217 = new String[] { "java.util.Date", "java.util.Date", "long", "java.lang.String", "boolean" }; - _methodName228 = "countControllo"; + _methodName218 = "countControllo"; - _methodParameterTypes228 = new String[] { + _methodParameterTypes218 = new String[] { "java.util.Date", "java.util.Date", "long", "java.lang.String", "boolean" }; - _methodName229 = "riparaWorkflow"; + _methodName219 = "riparaWorkflow"; - _methodParameterTypes229 = new String[] { }; + _methodParameterTypes219 = new String[] { }; - _methodName230 = "reIndexFascicolo"; + _methodName220 = "reIndexFascicolo"; - _methodParameterTypes230 = new String[] { + _methodParameterTypes220 = new String[] { "it.tref.liferay.portos.bo.model.IntPratica", "long" }; - _methodName231 = "reIndexFasciolo"; + _methodName221 = "reIndexFasciolo"; - _methodParameterTypes231 = new String[] { "java.lang.String", "long" }; + _methodParameterTypes221 = new String[] { "java.lang.String", "long" }; - _methodName232 = "reIndexFasciolo"; + _methodName222 = "reIndexFasciolo"; - _methodParameterTypes232 = new String[] { "long", "long" }; + _methodParameterTypes222 = new String[] { "long", "long" }; - _methodName233 = "findByNumeroProgetto"; + _methodName223 = "findByNumeroProgetto"; - _methodParameterTypes233 = new String[] { "java.lang.String" }; + _methodParameterTypes223 = new String[] { "java.lang.String" }; - _methodName234 = "findByTerritorioId"; + _methodName224 = "findByTerritorioId"; - _methodParameterTypes234 = new String[] { "long" }; + _methodParameterTypes224 = new String[] { "long" }; - _methodName235 = "reportTempisticheIstruttorieAvvisiAutorizzazioni"; + _methodName225 = "reportTempisticheIstruttorieAvvisiAutorizzazioni"; - _methodParameterTypes235 = new String[] { + _methodParameterTypes225 = new String[] { "java.util.Date", "java.util.Date", "long", "java.lang.String" }; - _methodName236 = "reportPraticheVidimate"; + _methodName226 = "reportPraticheVidimate"; - _methodParameterTypes236 = new String[] { + _methodParameterTypes226 = new String[] { "java.util.Date", "java.util.Date", "long", "java.lang.String" }; - _methodName237 = "countIngressiAutorizzazioni"; + _methodName227 = "countIngressiAutorizzazioni"; - _methodParameterTypes237 = new String[] { + _methodParameterTypes227 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName238 = "countIngressiDepositi"; + _methodName228 = "countIngressiDepositi"; - _methodParameterTypes238 = new String[] { + _methodParameterTypes228 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName239 = "countIngressiCO"; + _methodName229 = "countIngressiCO"; - _methodParameterTypes239 = new String[] { + _methodParameterTypes229 = new String[] { "java.util.Date", "java.util.Date", "long" }; - _methodName240 = "getOrganizationByIntPraticaId"; + _methodName230 = "getOrganizationByIntPraticaId"; - _methodParameterTypes240 = new String[] { "long" }; + _methodParameterTypes230 = new String[] { "long" }; } public Object invokeMethod(String name, String[] parameterTypes, @@ -651,126 +623,82 @@ public class IntPraticaLocalServiceClpInvoker { if (_methodName196.equals(name) && Arrays.deepEquals(_methodParameterTypes196, parameterTypes)) { - return IntPraticaLocalServiceUtil.findByCompanyIdSoggettoProgetti(((Long)arguments[0]).longValue(), - ((Long)arguments[1]).longValue()); - } - - if (_methodName197.equals(name) && - Arrays.deepEquals(_methodParameterTypes197, parameterTypes)) { - return IntPraticaLocalServiceUtil.countByCompanyIdSoggettoProgetti(((Long)arguments[0]).longValue(), - ((Long)arguments[1]).longValue()); - } - - if (_methodName199.equals(name) && - Arrays.deepEquals(_methodParameterTypes199, parameterTypes)) { - return IntPraticaLocalServiceUtil.findByCompanyIdSoggettoArchivio(((Long)arguments[0]).longValue(), - ((Long)arguments[1]).longValue()); - } - - if (_methodName200.equals(name) && - Arrays.deepEquals(_methodParameterTypes200, parameterTypes)) { - return IntPraticaLocalServiceUtil.countByCompanyIdSoggettoArchivio(((Long)arguments[0]).longValue(), - ((Long)arguments[1]).longValue()); - } - - if (_methodName202.equals(name) && - Arrays.deepEquals(_methodParameterTypes202, parameterTypes)) { - return IntPraticaLocalServiceUtil.findByCompanyIdSoggettoAltriProgetti(((Long)arguments[0]).longValue(), - ((Long)arguments[1]).longValue(), - ((Integer)arguments[2]).intValue(), - ((Integer)arguments[3]).intValue()); - } - - if (_methodName203.equals(name) && - Arrays.deepEquals(_methodParameterTypes203, parameterTypes)) { - return IntPraticaLocalServiceUtil.countByCompanyIdSoggettoAltriProgetti(((Long)arguments[0]).longValue(), - ((Long)arguments[1]).longValue()); - } - - if (_methodName205.equals(name) && - Arrays.deepEquals(_methodParameterTypes205, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCanAddFineLavori(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName206.equals(name) && - Arrays.deepEquals(_methodParameterTypes206, parameterTypes)) { + if (_methodName197.equals(name) && + Arrays.deepEquals(_methodParameterTypes197, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCanAddFineLavori(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName208.equals(name) && - Arrays.deepEquals(_methodParameterTypes208, parameterTypes)) { + if (_methodName199.equals(name) && + Arrays.deepEquals(_methodParameterTypes199, parameterTypes)) { return IntPraticaLocalServiceUtil.findByCanAddCollaudo(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName209.equals(name) && - Arrays.deepEquals(_methodParameterTypes209, parameterTypes)) { + if (_methodName200.equals(name) && + Arrays.deepEquals(_methodParameterTypes200, parameterTypes)) { return IntPraticaLocalServiceUtil.countByCanAddCollaudo(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName210.equals(name) && - Arrays.deepEquals(_methodParameterTypes210, parameterTypes)) { + if (_methodName201.equals(name) && + Arrays.deepEquals(_methodParameterTypes201, parameterTypes)) { return IntPraticaLocalServiceUtil.search((java.util.List)arguments[0], ((Integer)arguments[1]).intValue(), ((Integer)arguments[2]).intValue()); } - if (_methodName211.equals(name) && - Arrays.deepEquals(_methodParameterTypes211, parameterTypes)) { + if (_methodName202.equals(name) && + Arrays.deepEquals(_methodParameterTypes202, parameterTypes)) { return IntPraticaLocalServiceUtil.countSearch((java.util.List)arguments[0]); } - if (_methodName212.equals(name) && - Arrays.deepEquals(_methodParameterTypes212, parameterTypes)) { + if (_methodName203.equals(name) && + Arrays.deepEquals(_methodParameterTypes203, parameterTypes)) { return IntPraticaLocalServiceUtil.searchWithIntPraticaId((java.util.List)arguments[0], ((Long)arguments[1]).longValue(), ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName213.equals(name) && - Arrays.deepEquals(_methodParameterTypes213, parameterTypes)) { - return IntPraticaLocalServiceUtil.countSearchWithIntPraticaId((java.util.List)arguments[0], - ((Long)arguments[1]).longValue()); - } - - if (_methodName214.equals(name) && - Arrays.deepEquals(_methodParameterTypes214, parameterTypes)) { + if (_methodName204.equals(name) && + Arrays.deepEquals(_methodParameterTypes204, 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 (_methodName215.equals(name) && - Arrays.deepEquals(_methodParameterTypes215, parameterTypes)) { + if (_methodName205.equals(name) && + Arrays.deepEquals(_methodParameterTypes205, parameterTypes)) { return IntPraticaLocalServiceUtil.generateFileAnnullamento(((Long)arguments[0]).longValue(), (com.liferay.portal.service.ServiceContext)arguments[1]); } - if (_methodName216.equals(name) && - Arrays.deepEquals(_methodParameterTypes216, parameterTypes)) { + if (_methodName206.equals(name) && + Arrays.deepEquals(_methodParameterTypes206, parameterTypes)) { IntPraticaLocalServiceUtil.deleteFileAnnullamento(((Long)arguments[0]).longValue()); return null; } - if (_methodName217.equals(name) && - Arrays.deepEquals(_methodParameterTypes217, parameterTypes)) { + if (_methodName207.equals(name) && + Arrays.deepEquals(_methodParameterTypes207, parameterTypes)) { IntPraticaLocalServiceUtil.completeAnnullamento(((Long)arguments[0]).longValue()); return null; } - if (_methodName218.equals(name) && - Arrays.deepEquals(_methodParameterTypes218, parameterTypes)) { + if (_methodName208.equals(name) && + Arrays.deepEquals(_methodParameterTypes208, parameterTypes)) { IntPraticaLocalServiceUtil.cambiaIstruttore(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Long)arguments[2]).longValue()); @@ -778,144 +706,144 @@ public class IntPraticaLocalServiceClpInvoker { return null; } - if (_methodName219.equals(name) && - Arrays.deepEquals(_methodParameterTypes219, parameterTypes)) { + if (_methodName209.equals(name) && + Arrays.deepEquals(_methodParameterTypes209, parameterTypes)) { return IntPraticaLocalServiceUtil.countCaricoLavoroCF(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (java.lang.Long[])arguments[2]); } - if (_methodName220.equals(name) && - Arrays.deepEquals(_methodParameterTypes220, parameterTypes)) { + if (_methodName210.equals(name) && + Arrays.deepEquals(_methodParameterTypes210, parameterTypes)) { return IntPraticaLocalServiceUtil.countCaricoLavoroIstruttore(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName221.equals(name) && - Arrays.deepEquals(_methodParameterTypes221, parameterTypes)) { + if (_methodName211.equals(name) && + Arrays.deepEquals(_methodParameterTypes211, parameterTypes)) { return IntPraticaLocalServiceUtil.generateReportPratica((it.tref.liferay.portos.bo.model.IntPratica)arguments[0], ((Long)arguments[1]).longValue()); } - if (_methodName222.equals(name) && - Arrays.deepEquals(_methodParameterTypes222, parameterTypes)) { + if (_methodName212.equals(name) && + Arrays.deepEquals(_methodParameterTypes212, parameterTypes)) { return IntPraticaLocalServiceUtil.updateModifiedDate(((Long)arguments[0]).longValue(), (java.util.Date)arguments[1]); } - if (_methodName223.equals(name) && - Arrays.deepEquals(_methodParameterTypes223, parameterTypes)) { + if (_methodName213.equals(name) && + Arrays.deepEquals(_methodParameterTypes213, parameterTypes)) { return IntPraticaLocalServiceUtil.countAutorizzazione((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); } - if (_methodName224.equals(name) && - Arrays.deepEquals(_methodParameterTypes224, parameterTypes)) { + if (_methodName214.equals(name) && + Arrays.deepEquals(_methodParameterTypes214, parameterTypes)) { return IntPraticaLocalServiceUtil.countSanatorie((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); } - if (_methodName225.equals(name) && - Arrays.deepEquals(_methodParameterTypes225, parameterTypes)) { + if (_methodName215.equals(name) && + Arrays.deepEquals(_methodParameterTypes215, parameterTypes)) { return IntPraticaLocalServiceUtil.countOpereMinoreImportanza((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); } - if (_methodName226.equals(name) && - Arrays.deepEquals(_methodParameterTypes226, parameterTypes)) { + if (_methodName216.equals(name) && + Arrays.deepEquals(_methodParameterTypes216, parameterTypes)) { return IntPraticaLocalServiceUtil.countDeposito((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue(), ((Boolean)arguments[3]).booleanValue()); } - if (_methodName227.equals(name) && - Arrays.deepEquals(_methodParameterTypes227, parameterTypes)) { + if (_methodName217.equals(name) && + Arrays.deepEquals(_methodParameterTypes217, parameterTypes)) { 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()); } - if (_methodName228.equals(name) && - Arrays.deepEquals(_methodParameterTypes228, parameterTypes)) { + if (_methodName218.equals(name) && + Arrays.deepEquals(_methodParameterTypes218, parameterTypes)) { 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 (_methodName229.equals(name) && - Arrays.deepEquals(_methodParameterTypes229, parameterTypes)) { + if (_methodName219.equals(name) && + Arrays.deepEquals(_methodParameterTypes219, parameterTypes)) { return IntPraticaLocalServiceUtil.riparaWorkflow(); } - if (_methodName230.equals(name) && - Arrays.deepEquals(_methodParameterTypes230, parameterTypes)) { + if (_methodName220.equals(name) && + Arrays.deepEquals(_methodParameterTypes220, parameterTypes)) { IntPraticaLocalServiceUtil.reIndexFascicolo((it.tref.liferay.portos.bo.model.IntPratica)arguments[0], ((Long)arguments[1]).longValue()); return null; } - if (_methodName231.equals(name) && - Arrays.deepEquals(_methodParameterTypes231, parameterTypes)) { + if (_methodName221.equals(name) && + Arrays.deepEquals(_methodParameterTypes221, parameterTypes)) { IntPraticaLocalServiceUtil.reIndexFasciolo((java.lang.String)arguments[0], ((Long)arguments[1]).longValue()); return null; } - if (_methodName232.equals(name) && - Arrays.deepEquals(_methodParameterTypes232, parameterTypes)) { + if (_methodName222.equals(name) && + Arrays.deepEquals(_methodParameterTypes222, parameterTypes)) { IntPraticaLocalServiceUtil.reIndexFasciolo(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); return null; } - if (_methodName233.equals(name) && - Arrays.deepEquals(_methodParameterTypes233, parameterTypes)) { + if (_methodName223.equals(name) && + Arrays.deepEquals(_methodParameterTypes223, parameterTypes)) { return IntPraticaLocalServiceUtil.findByNumeroProgetto((java.lang.String)arguments[0]); } - if (_methodName234.equals(name) && - Arrays.deepEquals(_methodParameterTypes234, parameterTypes)) { + if (_methodName224.equals(name) && + Arrays.deepEquals(_methodParameterTypes224, parameterTypes)) { return IntPraticaLocalServiceUtil.findByTerritorioId(((Long)arguments[0]).longValue()); } - if (_methodName235.equals(name) && - Arrays.deepEquals(_methodParameterTypes235, parameterTypes)) { + if (_methodName225.equals(name) && + Arrays.deepEquals(_methodParameterTypes225, parameterTypes)) { return IntPraticaLocalServiceUtil.reportTempisticheIstruttorieAvvisiAutorizzazioni((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue(), (java.lang.String)arguments[3]); } - if (_methodName236.equals(name) && - Arrays.deepEquals(_methodParameterTypes236, parameterTypes)) { + if (_methodName226.equals(name) && + Arrays.deepEquals(_methodParameterTypes226, parameterTypes)) { return IntPraticaLocalServiceUtil.reportPraticheVidimate((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue(), (java.lang.String)arguments[3]); } - if (_methodName237.equals(name) && - Arrays.deepEquals(_methodParameterTypes237, parameterTypes)) { + if (_methodName227.equals(name) && + Arrays.deepEquals(_methodParameterTypes227, parameterTypes)) { return IntPraticaLocalServiceUtil.countIngressiAutorizzazioni((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); } - if (_methodName238.equals(name) && - Arrays.deepEquals(_methodParameterTypes238, parameterTypes)) { + if (_methodName228.equals(name) && + Arrays.deepEquals(_methodParameterTypes228, parameterTypes)) { return IntPraticaLocalServiceUtil.countIngressiDepositi((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); } - if (_methodName239.equals(name) && - Arrays.deepEquals(_methodParameterTypes239, parameterTypes)) { + if (_methodName229.equals(name) && + Arrays.deepEquals(_methodParameterTypes229, parameterTypes)) { return IntPraticaLocalServiceUtil.countIngressiCO((java.util.Date)arguments[0], (java.util.Date)arguments[1], ((Long)arguments[2]).longValue()); } - if (_methodName240.equals(name) && - Arrays.deepEquals(_methodParameterTypes240, parameterTypes)) { + if (_methodName230.equals(name) && + Arrays.deepEquals(_methodParameterTypes230, parameterTypes)) { return IntPraticaLocalServiceUtil.getOrganizationByIntPraticaId(((Long)arguments[0]).longValue()); } @@ -1006,14 +934,20 @@ public class IntPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes199; private String _methodName200; private String[] _methodParameterTypes200; + private String _methodName201; + private String[] _methodParameterTypes201; private String _methodName202; private String[] _methodParameterTypes202; private String _methodName203; private String[] _methodParameterTypes203; + private String _methodName204; + private String[] _methodParameterTypes204; private String _methodName205; private String[] _methodParameterTypes205; private String _methodName206; private String[] _methodParameterTypes206; + private String _methodName207; + private String[] _methodParameterTypes207; private String _methodName208; private String[] _methodParameterTypes208; private String _methodName209; @@ -1060,24 +994,4 @@ public class IntPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes229; private String _methodName230; private String[] _methodParameterTypes230; - private String _methodName231; - private String[] _methodParameterTypes231; - private String _methodName232; - private String[] _methodParameterTypes232; - private String _methodName233; - private String[] _methodParameterTypes233; - private String _methodName234; - private String[] _methodParameterTypes234; - private String _methodName235; - private String[] _methodParameterTypes235; - private String _methodName236; - private String[] _methodParameterTypes236; - private String _methodName237; - private String[] _methodParameterTypes237; - private String _methodName238; - private String[] _methodParameterTypes238; - private String _methodName239; - private String[] _methodParameterTypes239; - private String _methodName240; - private String[] _methodParameterTypes240; } \ 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/base/IntPraticaServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaServiceClpInvoker.java index 8717540e..8b5826bf 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/IntPraticaServiceClpInvoker.java @@ -62,68 +62,40 @@ public class IntPraticaServiceClpInvoker { _methodParameterTypes164 = new String[] { "java.util.List" }; - _methodName165 = "findByCompanyIdSoggettoProgetti"; + _methodName165 = "findByCanAddFineLavori"; - _methodParameterTypes165 = new String[] { "long", "long" }; - - _methodName166 = "countByCompanyIdSoggettoProgetti"; - - _methodParameterTypes166 = new String[] { "long", "long" }; - - _methodName167 = "findByCompanyIdSoggettoArchivio"; - - _methodParameterTypes167 = new String[] { "long", "long" }; - - _methodName168 = "countByCompanyIdSoggettoArchivio"; - - _methodParameterTypes168 = new String[] { "long", "long" }; - - _methodName169 = "findByCompanyIdSoggettoAltriProgetti"; - - _methodParameterTypes169 = new String[] { "long", "long", "int", "int" }; - - _methodName170 = "countByCompanyIdSoggettoAltriProgetti"; - - _methodParameterTypes170 = new String[] { "long", "long" }; - - _methodName171 = "findByCanAddFineLavori"; - - _methodParameterTypes171 = new String[] { + _methodParameterTypes165 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName172 = "countByCanAddFineLavori"; + _methodName166 = "countByCanAddFineLavori"; - _methodParameterTypes172 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes166 = new String[] { "long", "java.lang.String" }; - _methodName173 = "findByCanAddCollaudo"; + _methodName167 = "findByCanAddCollaudo"; - _methodParameterTypes173 = new String[] { + _methodParameterTypes167 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName174 = "countByCanAddCollaudo"; + _methodName168 = "countByCanAddCollaudo"; - _methodParameterTypes174 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes168 = new String[] { "long", "java.lang.String" }; - _methodName175 = "allegaFileAnnullamento"; + _methodName169 = "allegaFileAnnullamento"; - _methodParameterTypes175 = new String[] { + _methodParameterTypes169 = new String[] { "long", "byte[][]", "java.lang.String", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName176 = "completeAnnullamento"; - - _methodParameterTypes176 = new String[] { "long", "long" }; + _methodName170 = "completeAnnullamento"; - _methodName177 = "cambiaIstruttore"; - - _methodParameterTypes177 = new String[] { "long", "long", "long" }; + _methodParameterTypes170 = new String[] { "long", "long" }; - _methodName178 = "geosisma"; + _methodName171 = "cambiaIstruttore"; - _methodParameterTypes178 = new String[] { "long" }; + _methodParameterTypes171 = new String[] { "long", "long", "long" }; } public Object invokeMethod(String name, String[] parameterTypes, @@ -192,88 +164,50 @@ public class IntPraticaServiceClpInvoker { if (_methodName165.equals(name) && Arrays.deepEquals(_methodParameterTypes165, parameterTypes)) { - return IntPraticaServiceUtil.findByCompanyIdSoggettoProgetti(((Long)arguments[0]).longValue(), - ((Long)arguments[1]).longValue()); - } - - if (_methodName166.equals(name) && - Arrays.deepEquals(_methodParameterTypes166, parameterTypes)) { - return IntPraticaServiceUtil.countByCompanyIdSoggettoProgetti(((Long)arguments[0]).longValue(), - ((Long)arguments[1]).longValue()); - } - - if (_methodName167.equals(name) && - Arrays.deepEquals(_methodParameterTypes167, parameterTypes)) { - return IntPraticaServiceUtil.findByCompanyIdSoggettoArchivio(((Long)arguments[0]).longValue(), - ((Long)arguments[1]).longValue()); - } - - if (_methodName168.equals(name) && - Arrays.deepEquals(_methodParameterTypes168, parameterTypes)) { - return IntPraticaServiceUtil.countByCompanyIdSoggettoArchivio(((Long)arguments[0]).longValue(), - ((Long)arguments[1]).longValue()); - } - - if (_methodName169.equals(name) && - Arrays.deepEquals(_methodParameterTypes169, parameterTypes)) { - return IntPraticaServiceUtil.findByCompanyIdSoggettoAltriProgetti(((Long)arguments[0]).longValue(), - ((Long)arguments[1]).longValue(), - ((Integer)arguments[2]).intValue(), - ((Integer)arguments[3]).intValue()); - } - - if (_methodName170.equals(name) && - Arrays.deepEquals(_methodParameterTypes170, parameterTypes)) { - return IntPraticaServiceUtil.countByCompanyIdSoggettoAltriProgetti(((Long)arguments[0]).longValue(), - ((Long)arguments[1]).longValue()); - } - - if (_methodName171.equals(name) && - Arrays.deepEquals(_methodParameterTypes171, parameterTypes)) { return IntPraticaServiceUtil.findByCanAddFineLavori(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName172.equals(name) && - Arrays.deepEquals(_methodParameterTypes172, parameterTypes)) { + if (_methodName166.equals(name) && + Arrays.deepEquals(_methodParameterTypes166, parameterTypes)) { return IntPraticaServiceUtil.countByCanAddFineLavori(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName173.equals(name) && - Arrays.deepEquals(_methodParameterTypes173, parameterTypes)) { + if (_methodName167.equals(name) && + Arrays.deepEquals(_methodParameterTypes167, parameterTypes)) { return IntPraticaServiceUtil.findByCanAddCollaudo(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName174.equals(name) && - Arrays.deepEquals(_methodParameterTypes174, parameterTypes)) { + if (_methodName168.equals(name) && + Arrays.deepEquals(_methodParameterTypes168, parameterTypes)) { return IntPraticaServiceUtil.countByCanAddCollaudo(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName175.equals(name) && - Arrays.deepEquals(_methodParameterTypes175, parameterTypes)) { + if (_methodName169.equals(name) && + Arrays.deepEquals(_methodParameterTypes169, parameterTypes)) { return IntPraticaServiceUtil.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 (_methodName176.equals(name) && - Arrays.deepEquals(_methodParameterTypes176, parameterTypes)) { + if (_methodName170.equals(name) && + Arrays.deepEquals(_methodParameterTypes170, parameterTypes)) { IntPraticaServiceUtil.completeAnnullamento(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); return null; } - if (_methodName177.equals(name) && - Arrays.deepEquals(_methodParameterTypes177, parameterTypes)) { + if (_methodName171.equals(name) && + Arrays.deepEquals(_methodParameterTypes171, parameterTypes)) { IntPraticaServiceUtil.cambiaIstruttore(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Long)arguments[2]).longValue()); @@ -281,11 +215,6 @@ public class IntPraticaServiceClpInvoker { return null; } - if (_methodName178.equals(name) && - Arrays.deepEquals(_methodParameterTypes178, parameterTypes)) { - return IntPraticaServiceUtil.geosisma(((Long)arguments[0]).longValue()); - } - throw new UnsupportedOperationException(); } @@ -321,18 +250,4 @@ public class IntPraticaServiceClpInvoker { private String[] _methodParameterTypes170; private String _methodName171; private String[] _methodParameterTypes171; - private String _methodName172; - private String[] _methodParameterTypes172; - private String _methodName173; - private String[] _methodParameterTypes173; - private String _methodName174; - private String[] _methodParameterTypes174; - private String _methodName175; - private String[] _methodParameterTypes175; - private String _methodName176; - private String[] _methodParameterTypes176; - private String _methodName177; - private String[] _methodParameterTypes177; - private String _methodName178; - private String[] _methodParameterTypes178; } \ 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/base/ParereGeologoLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoLocalServiceClpInvoker.java index 3b2e4ac1..d3c3ef58 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ParereGeologoLocalServiceClpInvoker.java @@ -217,6 +217,10 @@ public class ParereGeologoLocalServiceClpInvoker { _methodName196 = "countFindWithParereByGeologoId"; _methodParameterTypes196 = new String[] { "long" }; + + _methodName197 = "getCarichiLavoro"; + + _methodParameterTypes197 = new String[] { "long", "int" }; } public Object invokeMethod(String name, String[] parameterTypes, @@ -460,6 +464,12 @@ public class ParereGeologoLocalServiceClpInvoker { return ParereGeologoLocalServiceUtil.countFindWithParereByGeologoId(((Long)arguments[0]).longValue()); } + if (_methodName197.equals(name) && + Arrays.deepEquals(_methodParameterTypes197, parameterTypes)) { + return ParereGeologoLocalServiceUtil.getCarichiLavoro(((Long)arguments[0]).longValue(), + ((Integer)arguments[1]).intValue()); + } + throw new UnsupportedOperationException(); } @@ -545,4 +555,6 @@ public class ParereGeologoLocalServiceClpInvoker { private String[] _methodParameterTypes195; private String _methodName196; private String[] _methodParameterTypes196; + private String _methodName197; + private String[] _methodParameterTypes197; } \ 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/http/IntPraticaServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/IntPraticaServiceSoap.java index 5214adbc..ab733819 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/IntPraticaServiceSoap.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/IntPraticaServiceSoap.java @@ -157,100 +157,6 @@ public class IntPraticaServiceSoap { } } - public static it.tref.liferay.portos.bo.model.IntPraticaSoap[] findByCompanyIdSoggettoProgetti( - long companyId, long soggettoId) throws RemoteException { - try { - java.util.List returnValue = - IntPraticaServiceUtil.findByCompanyIdSoggettoProgetti(companyId, - soggettoId); - - return it.tref.liferay.portos.bo.model.IntPraticaSoap.toSoapModels(returnValue); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static int countByCompanyIdSoggettoProgetti(long companyId, - long soggettoId) throws RemoteException { - try { - int returnValue = IntPraticaServiceUtil.countByCompanyIdSoggettoProgetti(companyId, - soggettoId); - - return returnValue; - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static it.tref.liferay.portos.bo.model.IntPraticaSoap[] findByCompanyIdSoggettoArchivio( - long companyId, long soggettoId) throws RemoteException { - try { - java.util.List returnValue = - IntPraticaServiceUtil.findByCompanyIdSoggettoArchivio(companyId, - soggettoId); - - return it.tref.liferay.portos.bo.model.IntPraticaSoap.toSoapModels(returnValue); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static int countByCompanyIdSoggettoArchivio(long companyId, - long soggettoId) throws RemoteException { - try { - int returnValue = IntPraticaServiceUtil.countByCompanyIdSoggettoArchivio(companyId, - soggettoId); - - return returnValue; - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static it.tref.liferay.portos.bo.model.IntPraticaSoap[] findByCompanyIdSoggettoAltriProgetti( - long companyId, long soggettoId, int start, int end) - throws RemoteException { - try { - java.util.List returnValue = - IntPraticaServiceUtil.findByCompanyIdSoggettoAltriProgetti(companyId, - soggettoId, start, end); - - return it.tref.liferay.portos.bo.model.IntPraticaSoap.toSoapModels(returnValue); - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - - public static int countByCompanyIdSoggettoAltriProgetti(long companyId, - long soggettoId) throws RemoteException { - try { - int returnValue = IntPraticaServiceUtil.countByCompanyIdSoggettoAltriProgetti(companyId, - soggettoId); - - return returnValue; - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - public static it.tref.liferay.portos.bo.model.IntPraticaSoap[] findByCanAddFineLavori( long companyId, java.lang.String codiceFiscale, int start, int end) throws RemoteException { @@ -358,19 +264,5 @@ public class IntPraticaServiceSoap { } } - public static java.lang.String geosisma(long intPraticaId) - throws RemoteException { - try { - java.lang.String returnValue = IntPraticaServiceUtil.geosisma(intPraticaId); - - return returnValue; - } - catch (Exception e) { - _log.error(e, e); - - throw new RemoteException(e.getMessage()); - } - } - private static Log _log = LogFactoryUtil.getLog(IntPraticaServiceSoap.class); } \ 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/ControlloPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java index 42ed14e6..02e18fc6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java @@ -12,6 +12,8 @@ package it.tref.liferay.portos.bo.service.impl; +import it.mwg.sismica.bo.shared.bean.CarichiLavoroBean; +import it.mwg.sismica.bo.util.CarichiLavoroUtil; import it.mwg.sismica.bo.util.SismicaUtil; import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.model.ControlloPratica; @@ -38,6 +40,7 @@ import it.tref.liferay.portos.kaleo.service.FormLogLocalServiceUtil; import it.tref.liferay.portos.kaleo.shared.util.WorkflowConstants; import java.io.Serializable; +import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -46,6 +49,7 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; +import com.liferay.portal.NoSuchWorkflowInstanceLinkException; import com.liferay.portal.kernel.bean.PortletBeanLocatorUtil; import com.liferay.portal.kernel.dao.orm.DynamicQuery; import com.liferay.portal.kernel.dao.orm.DynamicQueryFactoryUtil; @@ -73,13 +77,19 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.kernel.workflow.WorkflowHandlerRegistryUtil; import com.liferay.portal.kernel.workflow.WorkflowTask; +import com.liferay.portal.model.Group; +import com.liferay.portal.model.Organization; import com.liferay.portal.model.ResourceConstants; import com.liferay.portal.model.User; import com.liferay.portal.model.UserGroupRole; +import com.liferay.portal.service.GroupLocalServiceUtil; +import com.liferay.portal.service.OrganizationLocalServiceUtil; import com.liferay.portal.service.RoleLocalServiceUtil; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserGroupRoleLocalServiceUtil; import com.liferay.portal.service.UserLocalServiceUtil; +import com.liferay.portal.service.WorkflowInstanceLinkLocalServiceUtil; +import com.liferay.portal.util.PortalUtil; import com.liferay.portal.workflow.kaleo.model.KaleoInstance; import com.liferay.portal.workflow.kaleo.service.KaleoInstanceLocalServiceUtil; import com.liferay.portlet.asset.NoSuchEntryException; @@ -713,4 +723,84 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi } return giorni - stop; } + + @Override + public Organization getOrganizationByControlloPraticaId(long controlloPraticaId) throws PortalException, + SystemException { + + ControlloPratica controlloPratica = getControlloPratica(controlloPraticaId); + IntPratica intPratica = intPraticaLocalService.getIntPratica(controlloPratica.getIntPraticaId()); + Group group = GroupLocalServiceUtil.getGroup(intPratica.getGroupId()); + Organization organization = OrganizationLocalServiceUtil.getOrganization(group.getOrganizationId()); + return organization; + } + + @Override + @SuppressWarnings("unchecked") + public Map getCarichiLavoro(long controlloPraticaId, int giorni) throws SystemException, + PortalException { + + ControlloPratica cp = getControlloPratica(controlloPraticaId); + long companyId = cp.getCompanyId(); + long groupId = cp.getGroupId(); + int unitaOperativa = cp.getUnitaOperativa(); + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.DATE, -giorni); + calendar.set(Calendar.HOUR, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.SECOND, 0); + calendar.set(Calendar.MILLISECOND, 0); + DynamicQuery queryCP = dynamicQuery(); + queryCP.add(RestrictionsFactoryUtil.ge("createDate", calendar.getTime())); + queryCP.add(RestrictionsFactoryUtil.eq("groupId", groupId)); + Map carichi = new TreeMap<>(); + int start = 0; + List controlli; + do { + controlli = controlloPraticaPersistence.findWithDynamicQuery(queryCP, start, start + 10); + for (ControlloPratica controllo : controlli) { + IntPratica pratica = IntPraticaLocalServiceUtil.getIntPratica(controllo.getIntPraticaId()); + if ((0 == unitaOperativa) || (pratica.getUnitaOperativa() == unitaOperativa)) { + long workflowInstanceId = 0L; + try { + workflowInstanceId = WorkflowInstanceLinkLocalServiceUtil.getWorkflowInstanceLink(companyId, + groupId, ControlloPratica.class.getName(), controllo.getPrimaryKey()) + .getWorkflowInstanceId(); + } catch (NoSuchWorkflowInstanceLinkException e) { + } + if (workflowInstanceId != 0L) { + DynamicQuery queryFL = FormLogLocalServiceUtil.dynamicQuery(); + queryFL.add(RestrictionsFactoryUtil.eq("workflowInstanceId", workflowInstanceId)); + queryFL.addOrder(OrderFactoryUtil.asc("createDate")); + List logs = FormLogLocalServiceUtil.dynamicQuery(queryFL); + if (logs.size() > 0) { + String istruttore = StringPool.BLANK; + boolean concluso = false; + for (FormLog log : logs) { + switch (log.getTransitionName().toLowerCase()) { + case "assegna": + case "cambio-istruttore": + case "riassegna": + if (concluso) { + CarichiLavoroUtil.incrementaCarico(carichi, istruttore, concluso); + } + JSONObject parameters = JSONFactoryUtil.createJSONObject(log.getFormParameters()); + istruttore = PortalUtil.getUserName(parameters.getLong("istruttore"), + StringPool.BLANK); + concluso = false; + break; + case "registra-esito": + concluso = true; + break; + } + } + CarichiLavoroUtil.incrementaCarico(carichi, istruttore, concluso); + } + } + } + } + start += controlli.size(); + } while (controlli.size() > 0); + return carichi; + } } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java index e7b13cd7..62dbc95e 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 @@ -57,7 +57,6 @@ import it.tref.liferay.portos.report.shared.util.ReportUtil; import java.io.IOException; import java.io.Serializable; import java.util.Calendar; -import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -470,116 +469,6 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { intPratica = updateIntPratica(intPratica); } - @SuppressWarnings("unchecked") - @Override - public List findByCompanyIdSoggettoProgetti(long companyId, long soggettoId) throws SystemException, - PortalException { - - DynamicQuery dynamicQuery = createQueryProgetti(companyId, soggettoId); - return intPraticaPersistence.findWithDynamicQuery(dynamicQuery); - } - - @Override - public int countByCompanyIdSoggettoProgetti(long companyId, long soggettoId) throws SystemException, - PortalException { - - DynamicQuery dynamicQuery = createQueryProgetti(companyId, soggettoId); - return (int) intPraticaPersistence.countWithDynamicQuery(dynamicQuery); - } - - private DynamicQuery createQueryProgetti(long companyId, long soggettoId) throws SystemException, PortalException { - - DynamicQuery dynamicQuery = dynamicQuery(); - dynamicQuery.add(PropertyFactoryUtil.forName("companyId").eq(companyId)); - dynamicQuery.add(PropertyFactoryUtil.forName("userId").eq(soggettoId)); - dynamicQuery.add(RestrictionsFactoryUtil.ne("statoPratica", StatoPraticaConstants.ANNULLATA)); - Disjunction disjunction = RestrictionsFactoryUtil.disjunction(); - disjunction.add(RestrictionsFactoryUtil.eq("status", WorkflowConstants.STATUS_ANY)); - disjunction.add(RestrictionsFactoryUtil.eq("status", WorkflowConstants.STATUS_INCOMPLETE)); - dynamicQuery.add(disjunction); - return dynamicQuery; - } - - @SuppressWarnings("unchecked") - @Override - public List findByCompanyIdSoggettoArchivio(long companyId, long soggettoId) throws SystemException, - PortalException { - - List ids = soggettoLocalService.findIntPraticaBySoggettoId(soggettoId); - if (ids.isEmpty()) { - return Collections. emptyList(); - } - DynamicQuery dynamicQuery = createQueryArchivio(companyId, soggettoId, ids); - return intPraticaPersistence.findWithDynamicQuery(dynamicQuery); - } - - @Override - public int countByCompanyIdSoggettoArchivio(long companyId, long soggettoId) throws SystemException, - PortalException { - - List ids = soggettoLocalService.findIntPraticaBySoggettoId(soggettoId); - if (ids.isEmpty()) { - return 0; - } - DynamicQuery dynamicQuery = createQueryArchivio(companyId, soggettoId, ids); - return (int) intPraticaPersistence.countWithDynamicQuery(dynamicQuery); - } - - private DynamicQuery createQueryArchivio(long companyId, long soggettoId, List ids) throws SystemException, - PortalException { - - DynamicQuery dynamicQuery = dynamicQuery(); - dynamicQuery.add(PropertyFactoryUtil.forName("companyId").eq(companyId)); - Disjunction disjunction = RestrictionsFactoryUtil.disjunction(); - disjunction.add(RestrictionsFactoryUtil.eq("status", WorkflowConstants.STATUS_EXPIRED)); - disjunction.add(RestrictionsFactoryUtil.eq("status", WorkflowConstants.STATUS_IN_TRASH)); - disjunction.add(RestrictionsFactoryUtil.eq("status", WorkflowConstants.STATUS_APPROVED)); - disjunction.add(RestrictionsFactoryUtil.eq("statoPratica", StatoPraticaConstants.ANNULLATA)); - dynamicQuery.add(disjunction); - Disjunction disjunctionSoggetti = RestrictionsFactoryUtil.disjunction(); - disjunctionSoggetti.add(RestrictionsFactoryUtil.eq("userId", soggettoId)); - disjunctionSoggetti.add(RestrictionsFactoryUtil.in("intPraticaId", ids)); - dynamicQuery.add(disjunctionSoggetti); - return dynamicQuery; - } - - @SuppressWarnings("unchecked") - @Override - public List findByCompanyIdSoggettoAltriProgetti(long companyId, long soggettoId, int start, int end) - throws SystemException, PortalException { - - List ids = soggettoLocalService.findIntPraticaBySoggettoId(soggettoId); - if (ids.isEmpty()) { - return Collections.EMPTY_LIST; - } - DynamicQuery dynamicQuery = createQueryAltriProgetti(companyId, ids); - return intPraticaPersistence.findWithDynamicQuery(dynamicQuery, start, end); - } - - @Override - public int countByCompanyIdSoggettoAltriProgetti(long companyId, long soggettoId) throws SystemException, - PortalException { - - List ids = soggettoLocalService.findIntPraticaBySoggettoId(soggettoId); - if (ids.isEmpty()) { - return 0; - } - DynamicQuery dynamicQuery = createQueryAltriProgetti(companyId, ids); - return (int) intPraticaPersistence.countWithDynamicQuery(dynamicQuery); - } - - private DynamicQuery createQueryAltriProgetti(long companyId, List ids) throws SystemException, - PortalException { - - DynamicQuery dynamicQuery = dynamicQuery(); - dynamicQuery.add(PropertyFactoryUtil.forName("companyId").eq(companyId)); - dynamicQuery.add(RestrictionsFactoryUtil.ne("status", WorkflowConstants.STATUS_ANY)); - dynamicQuery.add(RestrictionsFactoryUtil.ne("status", WorkflowConstants.STATUS_INCOMPLETE)); - dynamicQuery.add(RestrictionsFactoryUtil.ne("statoPratica", StatoPraticaConstants.ANNULLATA)); - dynamicQuery.add(RestrictionsFactoryUtil.in("intPraticaId", ids)); - return dynamicQuery; - } - @SuppressWarnings("unchecked") @Override public List findByCanAddFineLavori(long companyId, String codiceFiscale, int start, int end) @@ -657,17 +546,6 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { return intPraticaPersistence.findWithDynamicQuery(dynamicQuery, start, end); } - @Override - public int countSearchWithIntPraticaId(List groupIds, long intPraticaId) throws SystemException { - - // TODO Modificare tramite Indexer - DynamicQuery dynamicQuery = dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); - dynamicQuery.add(RestrictionsFactoryUtil.isNotNull("dtPratica")); - dynamicQuery.add(RestrictionsFactoryUtil.ne("statoPratica", StatoPraticaConstants.ANNULLATA)); - return (int) intPraticaPersistence.countWithDynamicQuery(dynamicQuery); - } - @Override public FileEntry allegaFileAnnullamento(long intPraticaId, byte[] content, String sourceFileName, String jsonFirmatari, ServiceContext serviceContext) throws SystemException, PortalException, IOException { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaServiceImpl.java index 00031943..a1c3091e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaServiceImpl.java @@ -27,10 +27,7 @@ import java.util.List; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; -import com.liferay.portal.kernel.json.JSONFactoryUtil; -import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.repository.model.FileEntry; -import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.service.ServiceContext; /** @@ -117,48 +114,6 @@ public class IntPraticaServiceImpl extends IntPraticaServiceBaseImpl { return intPraticaLocalService.countSearch(groupIds); } - @Override - public List findByCompanyIdSoggettoProgetti(long companyId, long soggettoId) throws SystemException, - PortalException { - - return intPraticaLocalService.findByCompanyIdSoggettoProgetti(companyId, soggettoId); - } - - @Override - public int countByCompanyIdSoggettoProgetti(long companyId, long soggettoId) throws SystemException, - PortalException { - - return intPraticaLocalService.countByCompanyIdSoggettoProgetti(companyId, soggettoId); - } - - @Override - public List findByCompanyIdSoggettoArchivio(long companyId, long soggettoId) throws SystemException, - PortalException { - - return intPraticaLocalService.findByCompanyIdSoggettoArchivio(companyId, soggettoId); - } - - @Override - public int countByCompanyIdSoggettoArchivio(long companyId, long soggettoId) throws SystemException, - PortalException { - - return intPraticaLocalService.countByCompanyIdSoggettoArchivio(companyId, soggettoId); - } - - @Override - public List findByCompanyIdSoggettoAltriProgetti(long companyId, long soggettoId, int start, int end) - throws SystemException, PortalException { - - return intPraticaLocalService.findByCompanyIdSoggettoAltriProgetti(companyId, soggettoId, start, end); - } - - @Override - public int countByCompanyIdSoggettoAltriProgetti(long companyId, long soggettoId) throws SystemException, - PortalException { - - return intPraticaLocalService.countByCompanyIdSoggettoAltriProgetti(companyId, soggettoId); - } - @Override public List findByCanAddFineLavori(long companyId, String codiceFiscale, int start, int end) throws SystemException, PortalException { @@ -209,15 +164,4 @@ public class IntPraticaServiceImpl extends IntPraticaServiceBaseImpl { intPraticaLocalService.cambiaIstruttore(intPraticaId, controlloPraticaId, istruttoreId); } - - @Override - public String geosisma(long intPraticaId) throws PortalException, SystemException { - - JSONObject json = JSONFactoryUtil.createJSONObject(); - IntPratica intPratica = intPraticaLocalService.fetchIntPratica(intPraticaId); - if (Validator.isNotNull(intPratica)) { - json.put("intPraticaId", intPratica.getIntPraticaId()); - } - return json.toString(); - } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java index c1344bd1..1fd24592 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java @@ -12,19 +12,28 @@ package it.tref.liferay.portos.bo.service.impl; +import it.mwg.sismica.bo.shared.bean.CarichiLavoroBean; +import it.mwg.sismica.bo.util.CarichiLavoroUtil; +import it.tref.liferay.portos.bo.model.ControlloPratica; +import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.ParereGeologo; import it.tref.liferay.portos.bo.service.base.ParereGeologoLocalServiceBaseImpl; import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants; import it.tref.liferay.portos.bo.util.PraticaUtil; +import java.util.Calendar; import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.TreeMap; import com.liferay.portal.NoSuchRepositoryEntryException; import com.liferay.portal.kernel.dao.orm.DynamicQuery; import com.liferay.portal.kernel.dao.orm.RestrictionsFactoryUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.Folder; import com.liferay.portal.kernel.util.MimeTypesUtil; @@ -33,6 +42,7 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.model.User; import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.UserLocalServiceUtil; +import com.liferay.portal.util.PortalUtil; import com.liferay.portlet.documentlibrary.NoSuchFileEntryException; import com.liferay.portlet.documentlibrary.NoSuchFolderException; @@ -58,6 +68,8 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase * it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil} to access the parere geologo local service. */ + private static final Log _log = LogFactoryUtil.getLog(ParereGeologoLocalServiceImpl.class); + @Override public ParereGeologo addParereGeologo(long geologoUserId, long intPraticaId, long dettPraticaId, ServiceContext serviceContext) throws SystemException, PortalException { @@ -250,4 +262,38 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase dynamicQuery.add(RestrictionsFactoryUtil.ne("parere", StringPool.BLANK)); return (int) parereGeologoPersistence.countWithDynamicQuery(dynamicQuery); } + + @Override + @SuppressWarnings("unchecked") + public Map getCarichiLavoro(long controlloPraticaId, int giorni) throws PortalException, + SystemException { + + ControlloPratica cp = controlloPraticaLocalService.getControlloPratica(controlloPraticaId); + long groupId = cp.getGroupId(); + int unitaOperativa = cp.getUnitaOperativa(); + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.DATE, -giorni); + calendar.set(Calendar.HOUR, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.SECOND, 0); + calendar.set(Calendar.MILLISECOND, 0); + DynamicQuery query = dynamicQuery(); + query.add(RestrictionsFactoryUtil.ge("createDate", calendar.getTime())); + Map carichi = new TreeMap<>(); + int start = 0; + List pareri; + do { + pareri = parereGeologoPersistence.findWithDynamicQuery(query, start, start + 10); + for (ParereGeologo parere : pareri) { + IntPratica pratica = intPraticaLocalService.getIntPratica(parere.getIntPraticaId()); + if ((pratica.getGroupId() == groupId) && (pratica.getUnitaOperativa() == unitaOperativa)) { + CarichiLavoroUtil.incrementaCarico(carichi, + PortalUtil.getUserName(parere.getGeologoUserId(), StringPool.BLANK), + Validator.isNotNull(parere.getDtCompilazione())); + } + } + start += pareri.size(); + } while (pareri.size() > 0); + return carichi; + } } 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 73a46094..3e5128f0 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 8f8bd310..d73613ab 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 0b546e1a..02dcaba3 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 54770e6b..44f394c4 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 689264dd..3adff95b 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 f4a4b84a..13bd7b4f 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 41c1b2be..15f0504f 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/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 4c9f980c..fc5b994d 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 12fb36d2..863e32df 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 35a48fdf..90251acb 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/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 da5af496..26f13dda 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 90d5b692..de92727b 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 6e60848d..030778b4 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/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties index 444cf8b0..939bf8d5 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=3060 - build.date=1620640069434 + build.number=3088 + build.date=1620745225558 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/carichilavoro/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/carichilavoro/view.jsp index 0375e57e..a6573f42 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/carichilavoro/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/carichilavoro/view.jsp @@ -1,221 +1,182 @@ +<%@page import="java.util.Map.Entry"%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="com.liferay.portal.kernel.util.ArrayUtil"%> -<%@page import="com.liferay.portal.kernel.dao.orm.QueryPos"%> -<%@page import="com.liferay.portal.service.OrganizationLocalServiceUtil"%> <%@page import="com.liferay.portal.model.Organization"%> -<%@page import="com.liferay.portal.service.GroupLocalServiceUtil"%> -<%@page import="com.liferay.portal.model.User"%> -<%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> <%@page import="com.liferay.portal.model.Role"%> -<%@page import="it.tref.liferay.portos.bo.util.Constants"%> -<%@page import="com.liferay.portal.service.RoleLocalServiceUtil"%> +<%@page import="com.liferay.portal.model.User"%> <%@page import="com.liferay.portal.model.UserGroupRole"%> +<%@page import="com.liferay.portal.service.GroupLocalServiceUtil"%> +<%@page import="com.liferay.portal.service.OrganizationLocalServiceUtil"%> +<%@page import="com.liferay.portal.service.RoleLocalServiceUtil"%> <%@page import="com.liferay.portal.service.UserGroupRoleLocalServiceUtil"%> -<%@ include file="/html/carichilavoro/init.jsp" %> - +<%@page import="com.liferay.portal.service.UserLocalServiceUtil"%> +<%@page import="it.mwg.sismica.bo.shared.bean.CarichiLavoroBean"%> +<%@page import="it.tref.liferay.portos.bo.util.Constants"%> +<%@page import="java.util.Map"%> +<%@include file="/html/carichilavoro/init.jsp"%> <% - - long controlloPraticaId = ParamUtil.getLong(request, "controlloPraticaId"); - boolean geologo = ParamUtil.getBoolean(request, "geologo"); - String ruolo = Constants.ROLE_NAME_ISTRUTTORE; - Organization org =null; - long[] userIds = new long[]{}; - Role role =null; - ControlloPratica controlloPratica =null; - - if(geologo){ - ruolo = Constants.ROLE_NAME_GEOLOGO; - role = RoleLocalServiceUtil.getRole(themeDisplay.getCompanyId(), ruolo); - - }else{ - controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(controlloPraticaId); - Group genioGroup = GroupLocalServiceUtil.getGroup(controlloPratica.getGroupId()); - org = OrganizationLocalServiceUtil.getOrganization(genioGroup.getOrganizationId()); - role = RoleLocalServiceUtil.getRole(controlloPratica.getCompanyId(), ruolo); - } - - if(!geologo){ - List userGroupRoleList = UserGroupRoleLocalServiceUtil.getUserGroupRolesByGroupAndRole(controlloPratica.getGroupId(),role.getRoleId()); - for(UserGroupRole userGroupRole:userGroupRoleList){ - userIds = ArrayUtil.append(userIds,userGroupRole.getUserId()); - } - }else{ - - userIds = UserLocalServiceUtil.getRoleUserIds(role.getRoleId()); +final int[] periodi = new int[] { 30, 90, 180, 360 }; +long controlloPraticaId = ParamUtil.getLong(request, "controlloPraticaId"); +boolean geologo = ParamUtil.getBoolean(request, "geologo"); +long[] userIds = new long[] {}; +int giorni = ParamUtil.getInteger(renderRequest, "giorni", 90); +int unitaOperativa = 0; +String title; +StringBuilder elencoUtenti = new StringBuilder(); +StringBuilder elencoTotali = new StringBuilder(); +StringBuilder elencoConclusi = new StringBuilder(); +StringBuilder elencoInCorso = new StringBuilder(); +int valMax = 0; +Map carichi; +if (geologo) { + title = "endoprocedimentali"; + carichi = ParereGeologoLocalServiceUtil.getCarichiLavoro(controlloPraticaId, giorni); +} else { + ControlloPratica controllo = ControlloPraticaLocalServiceUtil.getControlloPratica(controlloPraticaId); + Organization org = ControlloPraticaLocalServiceUtil.getOrganizationByControlloPraticaId(controlloPraticaId); + title = "istruttore per: " + org.getName(); + if (controllo.getUnitaOperativa() == 0) { + title += " tutte le U.O."; + } else { + title += " U.O. " + controllo.getUnitaOperativa(); } - StringBuilder elencoUtenti = new StringBuilder(); - StringBuilder elencoTotali = new StringBuilder(); - StringBuilder elencoSorteggio = new StringBuilder(); - StringBuilder elencoDeposito = new StringBuilder(); - StringBuilder elencoAutorizzazione = new StringBuilder(); - int valMax= 0; - for(long istruttoreIds: userIds){ - User istruttore = UserLocalServiceUtil.getUser(istruttoreIds); - int totale = 0; - int sorteggio = 0; - int deposito = 0; - int autorizzazione = 0; - if(geologo){ - - List pareriGeologo = ParereGeologoLocalServiceUtil.findByGeologoId(istruttoreIds, QueryUtil.ALL_POS, QueryUtil.ALL_POS); - if(!pareriGeologo.isEmpty()){ - Long[] intPraticaIds = new Long[]{}; - for(ParereGeologo parereGeologo: pareriGeologo){ - intPraticaIds = ArrayUtil.append(intPraticaIds, parereGeologo.getIntPraticaId()); - } - totale = IntPraticaLocalServiceUtil.countCaricoLavoroCF(0l,StringPool.BLANK , null,intPraticaIds); - sorteggio = IntPraticaLocalServiceUtil.countCaricoLavoroCF(0l, StringPool.BLANK, true,intPraticaIds); - deposito = IntPraticaLocalServiceUtil.countCaricoLavoroCF(0l, Constants.TIPO_PRATICA_DEPOSITO, false,intPraticaIds); - autorizzazione = IntPraticaLocalServiceUtil.countCaricoLavoroCF(0l, Constants.TIPO_PRATICA_AUTORIZZAZIONE, false,intPraticaIds); - } - }else{ - totale = IntPraticaLocalServiceUtil.countCaricoLavoroIstruttore(istruttoreIds,StringPool.BLANK , null); - sorteggio = IntPraticaLocalServiceUtil.countCaricoLavoroIstruttore(istruttoreIds, StringPool.BLANK, true); - deposito = IntPraticaLocalServiceUtil.countCaricoLavoroIstruttore(istruttoreIds, Constants.TIPO_PRATICA_DEPOSITO, false); - autorizzazione = IntPraticaLocalServiceUtil.countCaricoLavoroIstruttore(istruttoreIds, Constants.TIPO_PRATICA_AUTORIZZAZIONE, false); - } - - if(elencoUtenti.length()!=0){ - elencoUtenti.append(","); - elencoTotali.append(","); - elencoSorteggio.append(","); - elencoDeposito.append(","); - elencoAutorizzazione.append(","); - } - elencoUtenti.append("\""+istruttore.getFullName()+"\""); - - elencoTotali.append(totale); - elencoSorteggio.append(sorteggio); - elencoDeposito.append(deposito); - elencoAutorizzazione.append(autorizzazione); - - if(valMax < totale){ - valMax = totale; - } + carichi = ControlloPraticaLocalServiceUtil.getCarichiLavoro(controlloPraticaId, giorni); +} +for (Entry entry : carichi.entrySet()) { + String utente = entry.getKey(); + CarichiLavoroBean carico = entry.getValue(); + if (elencoUtenti.length() != 0) { + elencoUtenti.append(StringPool.COMMA); + elencoTotali.append(StringPool.COMMA); + elencoConclusi.append(StringPool.COMMA); + elencoInCorso.append(StringPool.COMMA); } - int stepSize = (valMax/10)+1; + elencoUtenti.append(StringPool.QUOTE).append(utente).append(StringPool.QUOTE); + elencoTotali.append(carico.getTotali()); + elencoConclusi.append(carico.getConclusi()); + elencoInCorso.append(carico.getInCorso()); + valMax = Math.max(valMax, carico.getTotali()); +} +int stepSize = (valMax / 10) + 1; %> - - + + + + + + + + <% + for (int i = 0; i < periodi.length; i++) { + %> + <%= periodi[i] %> giorni + <% + } + %> + + + + - - -
+
- - +Chart.plugins.register({ + afterDatasetsDraw: function(chart, easing) { + // To only draw at the end of animation, check for easing === 1 + var ctx = chart.ctx; + chart.data.datasets.forEach(function (dataset, i) { + var meta = chart.getDatasetMeta(i); + if (!meta.hidden) { + meta.data.forEach(function(element, index) { + // Draw the text in black, with the specified font + ctx.fillStyle = 'rgb(0, 0, 0)'; + var fontSize = 16; + var fontStyle = 'normal'; + var fontFamily = 'Helvetica Neue'; + ctx.font = Chart.helpers.fontString(fontSize, fontStyle, fontFamily); + // Just naively convert to string for now + var dataString = dataset.data[index].toString(); + // Make sure alignment settings are correct + ctx.textAlign = 'center'; + ctx.textBaseline = 'middle'; + var padding = 10; + var position = element.tooltipPosition(); + ctx.fillText(dataString, position.x + padding, position.y); + }); + } + }); + } +}); + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.classpath index 9975372f..6de1aafe 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.classpath @@ -1,6 +1,7 @@ + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.wst.common.component index 7788a07b..52ca29e6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.settings/org.eclipse.wst.common.component @@ -2,6 +2,7 @@ + diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/bean/CarichiLavoroBean.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/bean/CarichiLavoroBean.java new file mode 100644 index 00000000..3b146ed5 --- /dev/null +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/mwg/sismica/bo/shared/bean/CarichiLavoroBean.java @@ -0,0 +1,42 @@ +package it.mwg.sismica.bo.shared.bean; + +public class CarichiLavoroBean { + + private int totali = 0; + private int conclusi = 0; + private int inCorso = 0; + + public CarichiLavoroBean() { + + } + + public void incTotali() { + + totali++; + } + + public int getTotali() { + + return totali; + } + + public void incConclusi() { + + conclusi++; + } + + public int getConclusi() { + + return conclusi; + } + + public void incInCorso() { + + inCorso++; + } + + public int getInCorso() { + + return inCorso; + } +} diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoActionPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoActionPersistenceImpl.java index d7ba9d57..b821dc6a 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoActionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoActionPersistenceImpl.java @@ -42,6 +42,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchActionException; import com.liferay.portal.workflow.kaleo.model.KaleoAction; import com.liferay.portal.workflow.kaleo.model.impl.KaleoActionImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoActionModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoActionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoConditionPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoConditionPersistenceImpl.java index 8a53a412..67825a03 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoConditionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoConditionPersistenceImpl.java @@ -41,6 +41,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchConditionException; import com.liferay.portal.workflow.kaleo.model.KaleoCondition; import com.liferay.portal.workflow.kaleo.model.impl.KaleoConditionImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoConditionModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoConditionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoDefinitionPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoDefinitionPersistenceImpl.java index ec133caa..7b518a17 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoDefinitionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoDefinitionPersistenceImpl.java @@ -43,6 +43,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchDefinitionException; import com.liferay.portal.workflow.kaleo.model.KaleoDefinition; import com.liferay.portal.workflow.kaleo.model.impl.KaleoDefinitionImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoDefinitionModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoDefinitionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstancePersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstancePersistenceImpl.java index 7a81a480..0ac20c87 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstancePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstancePersistenceImpl.java @@ -43,6 +43,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchInstanceException; import com.liferay.portal.workflow.kaleo.model.KaleoInstance; import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoInstancePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstanceTokenPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstanceTokenPersistenceImpl.java index 6c526317..b0115dda 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstanceTokenPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoInstanceTokenPersistenceImpl.java @@ -43,6 +43,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchInstanceTokenException; import com.liferay.portal.workflow.kaleo.model.KaleoInstanceToken; import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceTokenImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoInstanceTokenModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoInstanceTokenPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoLogPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoLogPersistenceImpl.java index e9e4c818..9ade21a4 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoLogPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoLogPersistenceImpl.java @@ -43,6 +43,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchLogException; import com.liferay.portal.workflow.kaleo.model.KaleoLog; import com.liferay.portal.workflow.kaleo.model.impl.KaleoLogImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoLogModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoLogPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNodePersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNodePersistenceImpl.java index dfad2b8c..005b6749 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNodePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNodePersistenceImpl.java @@ -42,6 +42,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchNodeException; import com.liferay.portal.workflow.kaleo.model.KaleoNode; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNodeImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNodeModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoNodePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationPersistenceImpl.java index 0932f643..02168960 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationPersistenceImpl.java @@ -42,6 +42,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchNotificationException; import com.liferay.portal.workflow.kaleo.model.KaleoNotification; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoNotificationPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationRecipientPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationRecipientPersistenceImpl.java index d8c0fb51..0cd7db55 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationRecipientPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoNotificationRecipientPersistenceImpl.java @@ -41,6 +41,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchNotificationRecipientException; import com.liferay.portal.workflow.kaleo.model.KaleoNotificationRecipient; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationRecipientImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoNotificationRecipientModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoNotificationRecipientPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java index fd427cf1..eb7c922f 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java @@ -42,6 +42,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchTaskAssignmentInstanceException; import com.liferay.portal.workflow.kaleo.model.KaleoTaskAssignmentInstance; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentInstanceImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentInstanceModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskAssignmentInstancePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentPersistenceImpl.java index 8e52911f..a2a99f9b 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskAssignmentPersistenceImpl.java @@ -42,6 +42,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchTaskAssignmentException; import com.liferay.portal.workflow.kaleo.model.KaleoTaskAssignment; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskAssignmentModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskAssignmentPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskInstanceTokenPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskInstanceTokenPersistenceImpl.java index 032e8512..8ab6fafe 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskInstanceTokenPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskInstanceTokenPersistenceImpl.java @@ -42,6 +42,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchTaskInstanceTokenException; import com.liferay.portal.workflow.kaleo.model.KaleoTaskInstanceToken; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskInstanceTokenImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskInstanceTokenModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskInstanceTokenPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskPersistenceImpl.java index 9a339c6a..2749e5fe 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTaskPersistenceImpl.java @@ -41,6 +41,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchTaskException; import com.liferay.portal.workflow.kaleo.model.KaleoTask; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTaskModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTaskPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerInstanceTokenPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerInstanceTokenPersistenceImpl.java index 1400f6a2..725af5ed 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerInstanceTokenPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerInstanceTokenPersistenceImpl.java @@ -41,6 +41,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchTimerInstanceTokenException; import com.liferay.portal.workflow.kaleo.model.KaleoTimerInstanceToken; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerInstanceTokenImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerInstanceTokenModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTimerInstanceTokenPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerPersistenceImpl.java index a2e69d22..653aca47 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTimerPersistenceImpl.java @@ -42,6 +42,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchTimerException; import com.liferay.portal.workflow.kaleo.model.KaleoTimer; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTimerModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTimerPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTransitionPersistenceImpl.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTransitionPersistenceImpl.java index 5c157fbc..79172e1a 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTransitionPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/com/liferay/portal/workflow/kaleo/service/persistence/KaleoTransitionPersistenceImpl.java @@ -42,6 +42,7 @@ import com.liferay.portal.workflow.kaleo.NoSuchTransitionException; import com.liferay.portal.workflow.kaleo.model.KaleoTransition; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTransitionImpl; import com.liferay.portal.workflow.kaleo.model.impl.KaleoTransitionModelImpl; +import com.liferay.portal.workflow.kaleo.service.persistence.KaleoTransitionPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties index 446b7b6b..1c899a13 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=Kaleo - build.number=44 - build.date=1620640161284 + build.number=45 + build.date=1620641395229 build.auto.upgrade=true ##