From bdceac3880b79da45f7036e381143bc29ff46f0f Mon Sep 17 00:00:00 2001 From: Salvatore La Manna Date: Wed, 25 Aug 2021 17:19:12 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20asseverazioni=20per=20soggetto=20censito?= =?UTF-8?q?=20in=20pi=C3=B9=20ambiti=20professionali?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docroot/WEB-INF/service.xml | 3 +- .../bo/service/AsseverazioneLocalService.java | 28 +- .../service/AsseverazioneLocalServiceClp.java | 431 ++++++--------- .../AsseverazioneLocalServiceUtil.java | 41 +- .../AsseverazioneLocalServiceWrapper.java | 48 +- .../portos/bo/util/AsseverazioniUtil.java | 2 +- .../bo/startup/DatabaseUpdateAction.java | 4 +- .../sismica/bo/util/ManutenzioneDatabase.java | 3 +- .../AsseverazioneLocalServiceClpInvoker.java | 67 +-- .../impl/AllegatoManualeLocalServiceImpl.java | 2 +- .../impl/AllegatoManualeServiceImpl.java | 3 +- .../impl/AsseverazioneLocalServiceImpl.java | 173 +++---- .../service/impl/AvvisoLocalServiceImpl.java | 17 +- .../impl/CollaudoLocalServiceImpl.java | 17 +- .../service/impl/ComuneLocalServiceImpl.java | 84 ++- .../bo/service/impl/ComuneServiceImpl.java | 39 +- .../impl/ComunicazioneServiceImpl.java | 44 +- .../impl/ConfigurazioneServiceImpl.java | 51 +- .../ControlloPraticaLocalServiceImpl.java | 52 +- .../service/impl/DelegaLocalServiceImpl.java | 7 +- .../impl/DettPraticaLocalServiceImpl.java | 39 +- .../service/impl/DettPraticaServiceImpl.java | 35 +- .../impl/DocPraticaLocalServiceImpl.java | 2 +- .../impl/FineLavoriLocalServiceImpl.java | 15 +- ...HistoryWorkflowActionLocalServiceImpl.java | 4 +- .../impl/IntPraticaLocalServiceImpl.java | 49 +- .../service/impl/IntPraticaServiceImpl.java | 16 +- .../impl/PagamentoLocalServiceImpl.java | 33 +- .../bo/service/impl/PagamentoServiceImpl.java | 55 +- .../impl/ParereGeologoLocalServiceImpl.java | 130 ++--- .../impl/ParereGeologoServiceImpl.java | 33 +- .../impl/SoggettoLocalServiceImpl.java | 33 +- .../impl/TempisticaLocalServiceImpl.java | 23 +- .../service/impl/TerritorioServiceImpl.java | 15 +- .../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 + .../persistence/SorteggioPersistenceImpl.java | 1 + ...StoricoSoggettoPraticaPersistenceImpl.java | 1 + .../TempisticaPersistenceImpl.java | 1 + .../TerritorioPersistenceImpl.java | 1 + .../docroot/WEB-INF/src/portlet.properties | 2 +- .../docroot/WEB-INF/src/service.properties | 4 +- .../navigator/common/save_actions.jspf | 489 ++++++++---------- .../docroot/WEB-INF/src/service.properties | 4 +- 61 files changed, 881 insertions(+), 1239 deletions(-) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml index 1fe643f0..153113cf 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml @@ -1627,8 +1627,7 @@ - + > required = new HashMap>() { { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/startup/DatabaseUpdateAction.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/startup/DatabaseUpdateAction.java index 56fe0880..dad5b557 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/startup/DatabaseUpdateAction.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/startup/DatabaseUpdateAction.java @@ -128,12 +128,12 @@ public class DatabaseUpdateAction extends SimpleAction { s.executeUpdate("ALTER TABLE " + DelegaImpl.TABLE_NAME + " ADD COLUMN dichiarazioni TEXT NULL"); } - + if (!hasColumn(IntPraticaImpl.TABLE_NAME, "inLavorazioneSue")) { _log.info("Aggiornamento a v4 di " + IntPraticaImpl.TABLE_NAME); s.executeUpdate("ALTER TABLE " + IntPraticaImpl.TABLE_NAME + " ADD COLUMN inLavorazioneSue BOOL"); } - + } catch (SQLException e) { _log.error("Errore di accesso al database: ", e); throw new ActionException(e); 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 b4289c29..7fd63552 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 @@ -204,10 +204,9 @@ public class ManutenzioneDatabase { } private static List svuotaDatabase(long companyId) throws SystemException, PortalException { - List esito = new ArrayList<>(); + List esito = new ArrayList<>(); esitoLog(esito, svuotaDettPratica()); - esitoLog(esito, svuotaAllegatoManuale()); esitoLog(esito, svuotaAssetEntry(companyId)); esitoLog(esito, svuotaAsseverazione()); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AsseverazioneLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AsseverazioneLocalServiceClpInvoker.java index 2ad7dca5..5887f5b7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AsseverazioneLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/AsseverazioneLocalServiceClpInvoker.java @@ -133,38 +133,17 @@ public class AsseverazioneLocalServiceClpInvoker { _methodName186 = "anteprimaAsseverazione"; _methodParameterTypes186 = new String[] { - "java.lang.String", "com.liferay.portal.model.User", - "it.tref.liferay.portos.bo.model.DettPratica", - "java.lang.String" + "it.tref.liferay.portos.bo.model.Asseverazione" }; - _methodName187 = "testoAsseverazione"; + _methodName187 = "anteprimaAsseverazioneGeologo"; - _methodParameterTypes187 = new String[] { - "java.lang.String", "com.liferay.portal.model.User", "long", - "java.lang.String" - }; + _methodParameterTypes187 = new String[] { "java.lang.String", "long" }; - _methodName188 = "testoAsseverazione"; + _methodName188 = "testoAsseverazioneGeologo"; _methodParameterTypes188 = new String[] { - "java.lang.String", "java.lang.String", "long", - "java.lang.String" - }; - - _methodName189 = "testoAsseverazione"; - - _methodParameterTypes189 = new String[] { - "java.lang.String", "java.lang.String", - "it.tref.liferay.portos.bo.model.DettPratica", - "java.lang.String" - }; - - _methodName192 = "addAsseverazione"; - - _methodParameterTypes192 = new String[] { - "long", "long", "long", "java.lang.String", "java.lang.String", - "com.liferay.portal.service.ServiceContext" + "java.lang.String", "long", "java.lang.String" }; _methodName193 = "richiediAsseverazioni"; @@ -498,41 +477,19 @@ public class AsseverazioneLocalServiceClpInvoker { if (_methodName186.equals(name) && Arrays.deepEquals(_methodParameterTypes186, parameterTypes)) { - return AsseverazioneLocalServiceUtil.anteprimaAsseverazione((java.lang.String)arguments[0], - (com.liferay.portal.model.User)arguments[1], - (it.tref.liferay.portos.bo.model.DettPratica)arguments[2], - (java.lang.String)arguments[3]); + return AsseverazioneLocalServiceUtil.anteprimaAsseverazione((it.tref.liferay.portos.bo.model.Asseverazione)arguments[0]); } if (_methodName187.equals(name) && Arrays.deepEquals(_methodParameterTypes187, parameterTypes)) { - return AsseverazioneLocalServiceUtil.testoAsseverazione((java.lang.String)arguments[0], - (com.liferay.portal.model.User)arguments[1], - ((Long)arguments[2]).longValue(), (java.lang.String)arguments[3]); + return AsseverazioneLocalServiceUtil.anteprimaAsseverazioneGeologo((java.lang.String)arguments[0], + ((Long)arguments[1]).longValue()); } if (_methodName188.equals(name) && Arrays.deepEquals(_methodParameterTypes188, parameterTypes)) { - return AsseverazioneLocalServiceUtil.testoAsseverazione((java.lang.String)arguments[0], - (java.lang.String)arguments[1], - ((Long)arguments[2]).longValue(), (java.lang.String)arguments[3]); - } - - if (_methodName189.equals(name) && - Arrays.deepEquals(_methodParameterTypes189, parameterTypes)) { - return AsseverazioneLocalServiceUtil.testoAsseverazione((java.lang.String)arguments[0], - (java.lang.String)arguments[1], - (it.tref.liferay.portos.bo.model.DettPratica)arguments[2], - (java.lang.String)arguments[3]); - } - - if (_methodName192.equals(name) && - Arrays.deepEquals(_methodParameterTypes192, parameterTypes)) { - return AsseverazioneLocalServiceUtil.addAsseverazione(((Long)arguments[0]).longValue(), - ((Long)arguments[1]).longValue(), - ((Long)arguments[2]).longValue(), - (java.lang.String)arguments[3], (java.lang.String)arguments[4], - (com.liferay.portal.service.ServiceContext)arguments[5]); + return AsseverazioneLocalServiceUtil.testoAsseverazioneGeologo((java.lang.String)arguments[0], + ((Long)arguments[1]).longValue(), (java.lang.String)arguments[2]); } if (_methodName193.equals(name) && @@ -846,10 +803,6 @@ public class AsseverazioneLocalServiceClpInvoker { private String[] _methodParameterTypes187; private String _methodName188; private String[] _methodParameterTypes188; - private String _methodName189; - private String[] _methodParameterTypes189; - private String _methodName192; - private String[] _methodParameterTypes192; private String _methodName193; private String[] _methodParameterTypes193; private String _methodName194; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AllegatoManualeLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AllegatoManualeLocalServiceImpl.java index 91551fc0..4375811e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AllegatoManualeLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AllegatoManualeLocalServiceImpl.java @@ -169,6 +169,6 @@ public class AllegatoManualeLocalServiceImpl extends AllegatoManualeLocalService @Override public AllegatoManuale deleteAllegatoManuale(long allegatoManualeId) throws PortalException, SystemException { - return deleteAllegatoManuale(allegatoManualeLocalService.getAllegatoManuale(allegatoManualeId)); + return deleteAllegatoManuale(getAllegatoManuale(allegatoManualeId)); } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AllegatoManualeServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AllegatoManualeServiceImpl.java index 53d8b2c4..dffcf810 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AllegatoManualeServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AllegatoManualeServiceImpl.java @@ -14,7 +14,6 @@ package it.tref.liferay.portos.bo.service.impl; import it.tref.liferay.portos.bo.model.AllegatoManuale; import it.tref.liferay.portos.bo.model.Avviso; -import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.AllegatoManualeServiceBaseImpl; import java.util.List; @@ -96,7 +95,7 @@ public class AllegatoManualeServiceImpl extends AllegatoManualeServiceBaseImpl { @Override public AllegatoManuale deleteAllegatoManuale(AllegatoManuale allegatoManuale) throws SystemException { - Avviso avviso = AvvisoLocalServiceUtil.fetchAvviso(allegatoManuale.getAvvisoId()); + Avviso avviso = avvisoLocalService.fetchAvviso(allegatoManuale.getAvvisoId()); if (Validator.isNotNull(avviso) && Validator.isNull(avviso.getFileEntryIdInvio())) { return allegatoManualeLocalService.deleteAllegatoManuale(allegatoManuale); } else { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java index 199ebfb5..f5b0a0f3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AsseverazioneLocalServiceImpl.java @@ -17,11 +17,6 @@ import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.model.Territorio; -import it.tref.liferay.portos.bo.service.DelegaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil; -import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.AsseverazioneLocalServiceBaseImpl; import it.tref.liferay.portos.bo.shared.util.ConfigurazioneConstants; import it.tref.liferay.portos.bo.shared.util.GenericUtils; @@ -51,6 +46,7 @@ import java.util.Scanner; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; +import com.liferay.portal.NoSuchUserException; import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; @@ -65,9 +61,7 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.model.User; import com.liferay.portal.security.permission.ActionKeys; import com.liferay.portal.service.ServiceContext; -import com.liferay.portal.service.UserLocalServiceUtil; import com.liferay.portlet.documentlibrary.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; /** * The implementation of the asseverazione local service. @@ -95,66 +89,70 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase Log _log = LogFactoryUtil.getLog(AsseverazioneLocalServiceImpl.class); @Override - public String anteprimaAsseverazione(String tipo, User user, DettPratica dettPratica, String relazioni) - throws IOException, SystemException, PortalException { + public String anteprimaAsseverazione(Asseverazione asseverazione) throws SystemException, PortalException, + IOException { - return testoAsseverazione(tipo, user.getScreenName(), dettPratica, relazioni, true); + return testoAsseverazione(asseverazione, null, true); } @Override - public String testoAsseverazione(String tipo, User user, long dettPraticaId, String relazioni) - throws SystemException, PortalException, IOException { + public String anteprimaAsseverazioneGeologo(String codiceFiscale, long dettPraticaId) throws SystemException, + PortalException, IOException { - return testoAsseverazione(tipo, user.getScreenName(), dettPraticaId, relazioni); + return testoAsseverazioneGeologo(codiceFiscale, dettPraticaId, null, true); } @Override - public String testoAsseverazione(String tipo, String codiceFiscale, long dettPraticaId, String relazioni) - throws PortalException, SystemException, IOException { + public String testoAsseverazioneGeologo(String codiceFiscale, long dettPraticaId, String relazioni) + throws SystemException, PortalException, IOException { - DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId); - return testoAsseverazione(tipo, codiceFiscale, dettPratica, relazioni); + return testoAsseverazioneGeologo(codiceFiscale, dettPraticaId, relazioni, false); } - @Override - public String testoAsseverazione(String tipo, String codiceFiscale, DettPratica dettPratica, String relazioni) - throws SystemException, PortalException, IOException { + private String testoAsseverazioneGeologo(String codiceFiscale, long dettPraticaId, String relazioni, + boolean anteprima) throws SystemException, PortalException, IOException { - return testoAsseverazione(tipo, codiceFiscale, dettPratica, relazioni, false); + List soggetti = soggettoLocalService.findByDettPratica_TipologiaSoggetto_CodiceFiscale(dettPraticaId, + TipoSoggettoUtil.GEOLOGO, codiceFiscale); + if (soggetti.isEmpty()) { + return null; + } + DettPratica dettPratica = dettPraticaLocalService.getDettPratica(dettPraticaId); + return testoAsseverazione(soggetti.get(0), dettPratica, relazioni, false); } - private String testoAsseverazione(String tipo, String codiceFiscale, DettPratica dettPratica, String relazioni, - boolean anteprima) throws SystemException, PortalException, IOException { + private String testoAsseverazione(Asseverazione asseverazione, String relazioni, boolean anteprima) + throws SystemException, PortalException, IOException { - Soggetto soggetto = SoggettoLocalServiceUtil.getValidTmpByIntPratica_CodiceFiscale_TipologiaSoggetto( - dettPratica.getIntPraticaId(), codiceFiscale, tipo); - if (Validator.isNotNull(soggetto)) { - String nome = Validator.isNull(soggetto.getCognome()) ? soggetto.getLegaleRap() : soggetto.getNome(); - String cognome = Validator.isNull(soggetto.getCognome()) ? StringPool.BLANK : soggetto.getCognome(); - String albo = soggetto.getAlbo(); - String albon = soggetto.getNumIscrAlbo(); - String albop = soggetto.getProvinciaAlbo(); - - return testoAsseverazione(tipo, nome, cognome, codiceFiscale, soggetto.getAmbitoProfessione(), dettPratica, - relazioni, false, albo, albon, albop); + Soggetto soggetto = null; + try { + soggetto = soggettoLocalService.getSoggetto(asseverazione.getSoggettoId()); + } catch (SystemException | PortalException e) { } - User user = UserLocalServiceUtil.fetchUserByScreenName(dettPratica.getCompanyId(), codiceFiscale); - if (Validator.isNotNull(user)) { - return testoAsseverazione(tipo, user.getFirstName(), user.getLastName(), user.getScreenName(), - StringPool.BLANK, dettPratica, relazioni, anteprima, StringPool.BLANK, StringPool.BLANK, - StringPool.BLANK); + if (Validator.isNull(soggetto) + || !soggetto.getCodiceFiscale().equalsIgnoreCase(asseverazione.getCodiceFiscale())) { + soggetto = null; + List soggetti = soggettoLocalService.findByDettPratica_TipologiaSoggetto_CodiceFiscale( + asseverazione.getDettPraticaId(), asseverazione.getTipologia(), asseverazione.getCodiceFiscale()); + if (!soggetti.isEmpty()) { + _log.info("Asseverazione " + asseverazione.getAsseverazioneId() + " recuperato per codice fiscale"); + soggetto = soggetti.get(0); + } + } + if (Validator.isNull(soggetto)) { + _log.error("Asseverazione " + asseverazione.getAsseverazioneId() + " soggetto non trovato"); + return null; } - return null; + DettPratica dettPratica = dettPraticaLocalService.getDettPratica(asseverazione.getDettPraticaId()); + return testoAsseverazione(soggetto, dettPratica, relazioni, anteprima); } - private String testoAsseverazione(String tipo, String nome, String cognome, String codiceFiscale, - String ambitoProfessione, DettPratica dettPratica, String relazioni, boolean anteprima, String albo, - String albon, String albop) throws IOException, SystemException, PortalException { - - IntPratica intpratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); + private String testoAsseverazione(Soggetto soggetto, DettPratica dettPratica, String relazioni, boolean anteprima) + throws SystemException, PortalException, IOException { + String tipoProcedura = intPraticaLocalService.getIntPratica(dettPratica.getIntPraticaId()).getTipoProcedura(); String file = null; - switch (tipo) { + switch (soggetto.getTipologiaSoggetto()) { case TipoSoggettoUtil.COLLAUDATORE: file = "collaudatore"; break; @@ -171,9 +169,9 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase file = "geologo"; break; case TipoSoggettoUtil.PROGETTISTA: - if (intpratica.getTipoProcedura().equalsIgnoreCase(Constants.PROCEDURA_C)) { + if (tipoProcedura.equalsIgnoreCase(Constants.PROCEDURA_C)) { file = "progettista_c"; - } else if (ambitoProfessione.equalsIgnoreCase("architettonico")) { + } else if (soggetto.getAmbitoProfessione().equalsIgnoreCase("architettonico")) { file = "progettista_architettonico"; } else { file = "calcolista"; @@ -201,8 +199,8 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase boolean rischio = (RG.equals("3") || RG.equals("4") || RG.equals("5") || RI.equals("3") || RI.equals("4") || PG.equals("3") || PG.equals("4") || PI.equals("3") || PI.equals("4") || PI.equals("5")); boolean coniugio = Validator.isNotNull(relazioni); - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); + IntPratica intPratica = intPraticaLocalService.getIntPratica(dettPratica.getIntPraticaId()); + Territorio territorio = territorioLocalService.getTerritorio(intPratica.getTerritorioId()); float ag = 0; if (Validator.isNotNull(dettPratica.getAg())) { ag = Float.parseFloat(dettPratica.getAg().replace(',', '.')); @@ -236,16 +234,18 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase .replace("{{agalto}}", agAlto ? CHECKED : StringPool.SPACE) .replace("{{agmedio}}", agMedio ? CHECKED : StringPool.SPACE) .replace("{{agricoli}}", agricoli ? CHECKED : StringPool.SPACE) - .replace("{{codicefiscale}}", codiceFiscale).replace("{{cognome}}", cognome) - .replace("{{complesse}}", complesse ? CHECKED : StringPool.SPACE).replace("{{nome}}", nome) - .replace("{{nuove}}", nuove ? CHECKED : StringPool.SPACE) + .replace("{{codicefiscale}}", soggetto.getCodiceFiscale()) + .replace("{{cognome}}", soggetto.getCognome()) + .replace("{{complesse}}", complesse ? CHECKED : StringPool.SPACE) + .replace("{{nome}}", soggetto.getNome()).replace("{{nuove}}", nuove ? CHECKED : StringPool.SPACE) .replace("{{rilevanti}}", rilevanti ? CHECKED : StringPool.SPACE) .replace("{{nonrilevanti}}", nonRilevanti ? CHECKED : StringPool.SPACE) .replace("{{riparazioni}}", riparazioni ? CHECKED : StringPool.SPACE) .replace("{{rischio}}", rischio ? CHECKED : StringPool.SPACE) .replace("{{!rischio}}", rischio ? StringPool.SPACE : CHECKED) - .replace("{{strategico}}", strategico ? CHECKED : StringPool.SPACE).replace("{{albo}}", albo) - .replace("{{albop}}", albop).replace("{{albon}}", albon); + .replace("{{strategico}}", strategico ? CHECKED : StringPool.SPACE) + .replace("{{albo}}", soggetto.getAlbo()).replace("{{albop}}", soggetto.getProvinciaAlbo()) + .replace("{{albon}}", soggetto.getNumIscrAlbo()); if (null == relazioni) { html = html.replace("{{coniugio}}", StringPool.SPACE).replace("{{!coniugio}}", StringPool.SPACE) .replace("{{relazioni}}", StringPool.BLANK); @@ -258,29 +258,24 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase return html; } - @Override - public Asseverazione addAsseverazione(long userId, long intPraticaId, long dettPraticaId, String tipologia, - String codiceFiscale, ServiceContext serviceContext) throws PortalException, SystemException { + private Asseverazione addAsseverazione(long userId, long intPraticaId, long dettPraticaId, Soggetto soggetto, + ServiceContext serviceContext) throws NoSuchUserException, SystemException { - User user = userPersistence.findByPrimaryKey(userId); Date now = new Date(); Asseverazione asseverazione = asseverazionePersistence.create(counterLocalService.increment(Asseverazione.class .getName())); asseverazione.setCompanyId(serviceContext.getCompanyId()); - asseverazione.setUserId(user.getUserId()); - asseverazione.setUserName(user.getFullName()); - asseverazione.setCreateDate(serviceContext.getCreateDate(now)); - asseverazione.setModifiedDate(serviceContext.getModifiedDate(now)); + asseverazione.setUserId(userId); + asseverazione.setUserName(userPersistence.findByPrimaryKey(userId).getFullName()); + asseverazione.setCreateDate(now); + asseverazione.setModifiedDate(now); asseverazione.setGroupId(serviceContext.getScopeGroupId()); asseverazione.setIntPraticaId(intPraticaId); asseverazione.setDettPraticaId(dettPraticaId); - asseverazione.setTipologia(tipologia); + asseverazione.setTipologia(soggetto.getTipologiaSoggetto()); asseverazione.setEsito(DelegheUtil.STATO_ASSEGNATA); - asseverazione.setCodiceFiscale(codiceFiscale); - List soggetti = soggettoLocalService.findByIntPratica_CodiceFiscale(intPraticaId, codiceFiscale); - if (!soggetti.isEmpty()) { - asseverazione.setSoggettoId(soggetti.get(0).getUserId()); - } + asseverazione.setCodiceFiscale(soggetto.getCodiceFiscale()); + asseverazione.setSoggettoId(soggetto.getSoggettoId()); asseverazione = asseverazionePersistence.update(asseverazione); return asseverazione; } @@ -291,6 +286,7 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase DettPratica dettPratica = dettPraticaLocalService.getDettPratica(dettPraticaId); long intPraticaId = dettPratica.getIntPraticaId(); + long userId = serviceContext.getUserId(); IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaId); if (TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equalsIgnoreCase(dettPratica.getTipoIntegrazione()) || TipoIntegrazioneUtil.VARIANTE.equalsIgnoreCase(dettPratica.getTipoIntegrazione()) @@ -299,7 +295,7 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase soggettoLocalService.getValidTmpByDettPratica(dettPraticaId)); List cfNuoviSoggetti = soggettoLocalService.getCfValidTmpByDettPratica(dettPraticaId); List nuoviDelegati = new ArrayList( - DelegaLocalServiceUtil.findCfByDettPratica_Tipologia_InEsito(dettPraticaId, new String[] { + delegaLocalService.findCfByDettPratica_Tipologia_InEsito(dettPraticaId, new String[] { TipoSoggettoUtil.COMMITTENTE, TipoSoggettoUtil.DIRETTORE_LAVORI, TipoSoggettoUtil.GEOLOGO, TipoSoggettoUtil.DITTA, TipoSoggettoUtil.PROGETTISTA }, new String[] { AsseverazioniUtil.STATO_ESEGUITA })); @@ -310,14 +306,12 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase GenericUtils.addAllIfnotExist(nuoviSoggetti, delegato); } if (TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equalsIgnoreCase(dettPratica.getTipoIntegrazione())) { - User titolaredigitaleUser = UserLocalServiceUtil.getUser(intPratica.getUserId()); + User titolaredigitaleUser = userLocalService.getUser(intPratica.getUserId()); // il titolare digitale potrebbe avere più ruoli List titolareDigitali = soggettoLocalService.getValidTmpByIntPratica_CodiceFiscale( intPraticaId, titolaredigitaleUser.getScreenName(), 0l); for (Soggetto titolareDigitale : titolareDigitali) { - addAsseverazione(serviceContext.getUserId(), dettPratica.getIntPraticaId(), dettPraticaId, - titolareDigitale.getTipologiaSoggetto(), titolareDigitale.getCodiceFiscale(), - serviceContext); + addAsseverazione(userId, intPraticaId, dettPraticaId, titolareDigitale, serviceContext); } } else if (TipoIntegrazioneUtil.VARIANTE.equalsIgnoreCase(dettPratica.getTipoIntegrazione())) { String[] tipoSoggetti = new String[] { TipoSoggettoUtil.COMMITTENTE, TipoSoggettoUtil.DIRETTORE_LAVORI, @@ -332,12 +326,10 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase for (Soggetto soggetto : nuoviSoggetti) { if (TipoSoggettoUtil.COMMITTENTE.equalsIgnoreCase(soggetto.getTipologiaSoggetto())) { if (!ValidazionePraticaUtil.isA98Required(dettPratica)) { - addAsseverazione(serviceContext.getUserId(), dettPratica.getIntPraticaId(), dettPraticaId, - soggetto.getTipologiaSoggetto(), soggetto.getCodiceFiscale(), serviceContext); + addAsseverazione(userId, intPraticaId, dettPraticaId, soggetto, serviceContext); } } else { - addAsseverazione(serviceContext.getUserId(), dettPratica.getIntPraticaId(), dettPraticaId, - soggetto.getTipologiaSoggetto(), soggetto.getCodiceFiscale(), serviceContext); + addAsseverazione(userId, intPraticaId, dettPraticaId, soggetto, serviceContext); } } } else { @@ -347,8 +339,7 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase if (TipoSoggettoUtil.COLLAUDATORE.equalsIgnoreCase(soggetto.getTipologiaSoggetto()) && dettPratica.getCodiceFiscalePrincipaleCollaudatore().equalsIgnoreCase( soggetto.getCodiceFiscale())) { - addAsseverazione(serviceContext.getUserId(), dettPratica.getIntPraticaId(), dettPraticaId, - soggetto.getTipologiaSoggetto(), soggetto.getCodiceFiscale(), serviceContext); + addAsseverazione(userId, intPraticaId, dettPraticaId, soggetto, serviceContext); collaudatoreInserito = true; break; } @@ -361,8 +352,7 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase || TipoSoggettoUtil.DIRETTORE_LAVORI.equalsIgnoreCase(tipologia) || TipoSoggettoUtil.PROGETTISTA.equalsIgnoreCase(tipologia) || (TipoSoggettoUtil.COLLAUDATORE.equalsIgnoreCase(tipologia) && !collaudatoreInserito)) { - addAsseverazione(serviceContext.getUserId(), dettPratica.getIntPraticaId(), dettPraticaId, - tipologia, soggetto.getCodiceFiscale(), serviceContext); + addAsseverazione(userId, intPraticaId, dettPraticaId, soggetto, serviceContext); } } } @@ -371,7 +361,7 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase @Override public void resetAsseverazione(long asseverazioneId) throws PortalException, SystemException { - Asseverazione asseverazione = asseverazioneLocalService.getAsseverazione(asseverazioneId); + Asseverazione asseverazione = getAsseverazione(asseverazioneId); if (!asseverazione.getEsito().equalsIgnoreCase(AsseverazioniUtil.STATO_ESEGUITA) && !asseverazione.getEsito().equalsIgnoreCase(AsseverazioniUtil.STATO_ASSEGNATA)) { return; @@ -379,7 +369,7 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase asseverazione.setEsito(AsseverazioniUtil.STATO_ASSEGNATA); asseverazione.setDtEsito(null); if (asseverazione.getFileEntryId() != 0L) { - DLAppLocalServiceUtil.deleteFileEntry(asseverazione.getFileEntryId()); + dlAppLocalService.deleteFileEntry(asseverazione.getFileEntryId()); asseverazione.setFileEntryId(0); } asseverazionePersistence.update(asseverazione); @@ -395,7 +385,7 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase public void cambioStatoAsseverazione(long userId, long asseverazioneId, String stato) throws IOException, SystemException, PortalException { - Asseverazione asseverazione = asseverazioneLocalService.getAsseverazione(asseverazioneId); + Asseverazione asseverazione = getAsseverazione(asseverazioneId); Date now = new Date(); if (AsseverazioniUtil.STATO_ESEGUITA.equals(stato)) { asseverazione = generateReportAsseverazione(asseverazione, userId); @@ -445,8 +435,7 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase relazioni = StringPool.BLANK; } } - String testoAsseverazione = testoAsseverazione(asseverazione.getTipologia(), asseverazione.getCodiceFiscale(), - asseverazione.getDettPraticaId(), relazioni); + String testoAsseverazione = testoAsseverazione(asseverazione, relazioni, false); if (Validator.isNull(testoAsseverazione)) { testoAsseverazione = AsseverazioniUtil.retrieveAsseverazioneText(asseverazione, asseverazione.getCodiceFiscale()); @@ -479,7 +468,7 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase @Override public void concludiAsseverazioniExpired(long dettPraticaId) throws IOException, SystemException, PortalException { - List asseverazioni = asseverazioneLocalService.findByDettPratica_InEsito(dettPraticaId, + List asseverazioni = findByDettPratica_InEsito(dettPraticaId, new String[] { AsseverazioniUtil.STATO_ASSEGNATA }, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); for (Asseverazione asseverazione : asseverazioni) { cambioStatoAsseverazione(asseverazione.getUserId(), asseverazione.getAsseverazioneId(), @@ -490,10 +479,10 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase @Override public void rimuoviFileAsseverazione(long asseverazioneId) throws SystemException, PortalException { - Asseverazione asseverazione = asseverazioneLocalService.getAsseverazione(asseverazioneId); + Asseverazione asseverazione = getAsseverazione(asseverazioneId); if (asseverazione.getEsito().equalsIgnoreCase(AsseverazioniUtil.STATO_ESEGUITA) && asseverazione.getFileEntryId() != 0) { - DLAppLocalServiceUtil.deleteFileEntry(asseverazione.getFileEntryId()); + dlAppLocalService.deleteFileEntry(asseverazione.getFileEntryId()); asseverazione.setEsito(null); asseverazione.setDtEsito(null); asseverazione.setFileEntryId(0); @@ -516,14 +505,14 @@ public class AsseverazioneLocalServiceImpl extends AsseverazioneLocalServiceBase @Override public Asseverazione deleteAsseverazione(long asseverazioneId) throws PortalException, SystemException { - return deleteAsseverazione(asseverazioneLocalService.getAsseverazione(asseverazioneId)); + return deleteAsseverazione(getAsseverazione(asseverazioneId)); } @Override public FileEntry allegaFileAsseverazione(long asseverazioneId, byte[] content, String sourceFileName, ServiceContext serviceContext) throws SystemException, PortalException { - Asseverazione asseverazione = asseverazioneLocalService.getAsseverazione(asseverazioneId); + Asseverazione asseverazione = getAsseverazione(asseverazioneId); DettPratica dettPratica = dettPraticaLocalService.getLastEditableByIntPratica(asseverazione.getIntPraticaId()); // TODO forse dobbiamo mettere i permesssi ma non mi pare sicuro. FileEntry fileEntry = null; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java index 930cdd65..aa1f9ab1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoLocalServiceImpl.java @@ -16,8 +16,6 @@ import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.Sorteggio; -import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil; -import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.AvvisoLocalServiceBaseImpl; import it.tref.liferay.portos.bo.shared.util.Constants; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; @@ -66,7 +64,6 @@ import com.liferay.portal.model.User; import com.liferay.portal.security.permission.ActionKeys; import com.liferay.portal.service.ServiceContext; import com.liferay.portlet.documentlibrary.NoSuchFileEntryException; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import com.liferay.util.dao.orm.CustomSQLUtil; /** @@ -1091,16 +1088,16 @@ public class AvvisoLocalServiceImpl extends AvvisoLocalServiceBaseImpl { public Avviso addFileFirmato(long avvisoId, long classPk, String fileToSave, ServiceContext serviceContext) throws Exception { - Avviso avviso = AvvisoLocalServiceUtil.fetchAvviso(avvisoId); - long folderId = ConfigurazioneLocalServiceUtil.findByC_ChiaveLong(avviso.getCompanyId(), avvisoLocalService + Avviso avviso = avvisoLocalService.fetchAvviso(avvisoId); + long folderId = configurazioneLocalService.findByC_ChiaveLong(avviso.getCompanyId(), avvisoLocalService .getAllTipoDocumentoFolderProps().get(avviso.getTipoDocumento())); String fileName = getFileNameAvviso(classPk, avviso.getTipoDocumento(), avviso.getAvvisoId(), "F"); if (Validator.isNotNull(folderId)) { - Folder folder = DLAppLocalServiceUtil.getFolder(folderId); + Folder folder = dlAppLocalService.getFolder(folderId); if (Validator.isNotNull(folder)) { byte[] bytes = Base64.decode(fileToSave); serviceContext.setGroupPermissions(new String[] { ActionKeys.VIEW }); - FileEntry fileEntry = DLAppLocalServiceUtil.addFileEntry(avviso.getUserId(), folder.getRepositoryId(), + FileEntry fileEntry = dlAppLocalService.addFileEntry(avviso.getUserId(), folder.getRepositoryId(), folderId, fileName, MimeTypesUtil.getContentType(fileName + ".p7m"), fileName + ".p7m", StringPool.BLANK, StringPool.BLANK, bytes, serviceContext); avviso.setFileEntryIdInvio(fileEntry.getFileEntryId()); @@ -1152,7 +1149,7 @@ public class AvvisoLocalServiceImpl extends AvvisoLocalServiceBaseImpl { if (Validator.isNotNull(numeroProtocollo) || Validator.isNotNull(dataDa) || Validator.isNotNull(dataA)) { Order defaultOrder = OrderFactoryUtil.asc("dtProtocollo"); query.addOrder(defaultOrder); - lista = AvvisoLocalServiceUtil.dynamicQuery(query, start, end); + lista = avvisoLocalService.dynamicQuery(query, start, end); } return lista; } @@ -1267,7 +1264,7 @@ public class AvvisoLocalServiceImpl extends AvvisoLocalServiceBaseImpl { @Override public Avviso getAvvisoVidimazione(long intPraticaId, long dettPraticaID) throws SystemException { - DynamicQuery dynamicQuery = AvvisoLocalServiceUtil.dynamicQuery(); + DynamicQuery dynamicQuery = avvisoLocalService.dynamicQuery(); dynamicQuery.add(PropertyFactoryUtil.forName("tipoDocumento").in( new String[] { StatoPraticaConstants.VIDIMATA })); dynamicQuery.add(PropertyFactoryUtil.forName("fileEntryIdProtocollo").ne(0L)); @@ -1284,7 +1281,7 @@ public class AvvisoLocalServiceImpl extends AvvisoLocalServiceBaseImpl { @Override public Avviso getLastAvvisoIntegrazione(long intPraticaId) throws SystemException { - DynamicQuery dynamicQuery = AvvisoLocalServiceUtil.dynamicQuery(); + DynamicQuery dynamicQuery = avvisoLocalService.dynamicQuery(); dynamicQuery.add(PropertyFactoryUtil.forName("tipoDocumento").in( new String[] { StatoPraticaConstants.INTEGRAZIONE })); dynamicQuery.add(PropertyFactoryUtil.forName("fileEntryIdProtocollo").ne(0L)); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoLocalServiceImpl.java index e44906db..0951b806 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoLocalServiceImpl.java @@ -18,7 +18,6 @@ import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.DocPratica; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.Pagamento; -import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.CollaudoLocalServiceBaseImpl; import it.tref.liferay.portos.bo.shared.util.PagamentoConstants; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; @@ -97,7 +96,7 @@ public class CollaudoLocalServiceImpl extends CollaudoLocalServiceBaseImpl { public Collaudo addCollaudo(long intPraticaId, ServiceContext serviceContext) throws PortalException, SystemException { - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); + IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaId); Collaudo collaudo = initCollaudo(serviceContext); collaudo.setGroupId(intPratica.getGroupId()); collaudo.setIntPraticaId(intPraticaId); @@ -153,6 +152,7 @@ public class CollaudoLocalServiceImpl extends CollaudoLocalServiceBaseImpl { dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", false)); dynamicQuery.addOrder(OrderFactoryUtil.desc("collaudoId")); + @SuppressWarnings("unchecked") List collaudoList = dynamicQuery(dynamicQuery, 0, 1); if (!collaudoList.isEmpty()) return collaudoList.get(0); @@ -166,6 +166,7 @@ public class CollaudoLocalServiceImpl extends CollaudoLocalServiceBaseImpl { dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); dynamicQuery.addOrder(OrderFactoryUtil.desc("collaudoId")); + @SuppressWarnings("unchecked") List collaudoList = dynamicQuery(dynamicQuery, 0, 1); if (!collaudoList.isEmpty()) return collaudoList.get(0); @@ -273,11 +274,11 @@ public class CollaudoLocalServiceImpl extends CollaudoLocalServiceBaseImpl { public Collaudo updateCollaudoProtocollo(long collaudoId, String protocollo) throws PortalException, SystemException { - Collaudo collaudo = collaudoLocalService.fetchCollaudo(collaudoId); + Collaudo collaudo = fetchCollaudo(collaudoId); collaudo.setModifiedDate(new Date()); collaudo.setProtocollo(protocollo); collaudo.setDtProtocollo(new Date()); - collaudo = collaudoLocalService.updateCollaudo(collaudo); + collaudo = updateCollaudo(collaudo); return collaudo; } @@ -362,6 +363,7 @@ public class CollaudoLocalServiceImpl extends CollaudoLocalServiceBaseImpl { return collaudoPersistence.countByCodiceFiscale_Completata(codiceFiscaleDelegato, completata); } + @SuppressWarnings("unchecked") @Override public List findByIntPraticaId_Parziale_leCollaudoId(long collaudoId, long intPraticaId, boolean parziale, int start, int end, OrderByComparator orderByComparator) throws SystemException { @@ -381,10 +383,12 @@ public class CollaudoLocalServiceImpl extends CollaudoLocalServiceBaseImpl { dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); dynamicQuery.add(RestrictionsFactoryUtil.lt("collaudoId", collaudoId)); dynamicQuery.add(RestrictionsFactoryUtil.eq("parziale", parziale)); + @SuppressWarnings("unchecked") List results = dynamicQuery(dynamicQuery); return results.size(); } + @SuppressWarnings("unchecked") @Override public List findCollaudiCompletiNotProtocollo(int start, int end) throws SystemException { @@ -402,7 +406,7 @@ public class CollaudoLocalServiceImpl extends CollaudoLocalServiceBaseImpl { private DynamicQuery getDynamicQueryCollaudiCompletiNotProtocollo() { - DynamicQuery dynamicQuery = collaudoLocalService.dynamicQuery(); + DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); dynamicQuery.add(RestrictionsFactoryUtil.eq("gestita", false)); Disjunction or = RestrictionsFactoryUtil.disjunction(); @@ -412,6 +416,7 @@ public class CollaudoLocalServiceImpl extends CollaudoLocalServiceBaseImpl { return dynamicQuery; } + @SuppressWarnings("unchecked") @Override public List findCollaudiCompletiNotGestiti(int start, int end) throws SystemException { @@ -429,7 +434,7 @@ public class CollaudoLocalServiceImpl extends CollaudoLocalServiceBaseImpl { private DynamicQuery getDynamicQueryCollaudiCompletiNotGestiti() { - DynamicQuery dynamicQuery = collaudoLocalService.dynamicQuery(); + DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); dynamicQuery.add(RestrictionsFactoryUtil.eq("gestita", false)); dynamicQuery.add(RestrictionsFactoryUtil.ne("protocollo", StringPool.BLANK)); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComuneLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComuneLocalServiceImpl.java index e73c32cc..9250cf0c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComuneLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComuneLocalServiceImpl.java @@ -20,7 +20,6 @@ import it.tref.liferay.portos.bo.DenominazioneException; import it.tref.liferay.portos.bo.DuplicateComuneException; import it.tref.liferay.portos.bo.model.Comune; import it.tref.liferay.portos.bo.model.Territorio; -import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.ComuneLocalServiceBaseImpl; import java.util.ArrayList; @@ -47,13 +46,12 @@ import com.liferay.portal.service.ServiceContext; * The implementation of the comune local service. * *

- * All custom service methods should be put in this class. Whenever methods are added, rerun - * ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.ComuneLocalService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.ComuneLocalService} interface. * *

- * This is a local service. Methods of this service will not have security checks based on the - * propagated JAAS credentials because this service can only be accessed from within the same VM. + * This is a local service. Methods of this service will not have security checks based on the propagated JAAS + * credentials because this service can only be accessed from within the same VM. *

* * @author Davide Barbagallo, 3F Consulting @@ -63,8 +61,8 @@ import com.liferay.portal.service.ServiceContext; public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl { @Override public Comune addComune(long userId, String codiceProvincia, String codiceComune, String codiceIstat, - String codiceBelfiore, String denominazione, boolean provincia, boolean stato, String mailSuap, String mailSue, - ServiceContext serviceContext) throws PortalException, SystemException { + String codiceBelfiore, String denominazione, boolean provincia, boolean stato, String mailSuap, + String mailSue, ServiceContext serviceContext) throws PortalException, SystemException { User user = userPersistence.findByPrimaryKey(userId); @@ -216,6 +214,7 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl { return comunePersistence.findByC_CP(companyId, codiceProvincia); } + @Override public List findByCompanyIdCodiceProvincia(long companyId, String codiceProvincia, int start, int end, OrderByComparator orderByComparator) throws SystemException { @@ -239,8 +238,8 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl { @Override public Comune updateComune(long userId, long comuneId, String codiceProvincia, String codiceComune, - String codiceIstat, String denominazione, boolean provincia, boolean stato, String mailSuap, String mailSue, - ServiceContext serviceContext) throws PortalException, SystemException { + String codiceIstat, String denominazione, boolean provincia, boolean stato, String mailSuap, + String mailSue, ServiceContext serviceContext) throws PortalException, SystemException { User user = userPersistence.findByPrimaryKey(userId); @@ -304,6 +303,7 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl { return comune; } + @Override public List getComuniForOrganizationByUserId(long userId) throws SystemException { List comuni = new ArrayList(); @@ -312,13 +312,13 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl { if (Validator.isNotNull(organizationList)) { for (Organization org : organizationList) { - List territori = - TerritorioLocalServiceUtil.getTerritori(org.getCompanyId(), org.getGroupId(), -1, -1); + List territori = territorioLocalService.getTerritori(org.getCompanyId(), org.getGroupId(), + -1, -1); if (Validator.isNotNull(territori)) { for (Territorio terr : territori) { - Comune comune = comuneLocalService.fetchComune(terr.getComuneId()); + Comune comune = fetchComune(terr.getComuneId()); if (Validator.isNotNull(comune)) { - if(!checkIfContained(comune, comuni)){ + if (!checkIfContained(comune, comuni)) { comuni.add(comune); } } @@ -332,7 +332,8 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl { return comuni; } - //ADT BUG BO ID = 1 SEZIONE ATTIVITÀ + // ADT BUG BO ID = 1 SEZIONE ATTIVITÀ + @Override public List getComuniForOrganizationByUserIdUfficioId(long userId, long ufficioId) throws SystemException { List comuni = new ArrayList(); @@ -341,15 +342,15 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl { if (Validator.isNotNull(organizationList)) { for (Organization org : organizationList) { - if(org.getGroupId()== ufficioId){ + if (org.getGroupId() == ufficioId) { - List territori = - TerritorioLocalServiceUtil.getTerritori(org.getCompanyId(), org.getGroupId(), -1, -1); + List territori = territorioLocalService.getTerritori(org.getCompanyId(), + org.getGroupId(), -1, -1); if (Validator.isNotNull(territori)) { for (Territorio terr : territori) { - Comune comune = comuneLocalService.fetchComune(terr.getComuneId()); + Comune comune = fetchComune(terr.getComuneId()); if (Validator.isNotNull(comune)) { - if(!checkIfContained(comune, comuni)){ + if (!checkIfContained(comune, comuni)) { comuni.add(comune); } } @@ -369,26 +370,23 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl { DynamicQuery query = DynamicQueryFactoryUtil.forClass(Comune.class); query.add(PropertyFactoryUtil.forName("companyId").eq(companyId)); - Criterion criterion = - RestrictionsFactoryUtil.ilike("codiceProvincia", StringPool.PERCENT + keywords + StringPool.PERCENT); - criterion = - RestrictionsFactoryUtil.or(criterion, - RestrictionsFactoryUtil.ilike("codiceComune", StringPool.PERCENT + keywords + StringPool.PERCENT)); - criterion = - RestrictionsFactoryUtil.or(criterion, - RestrictionsFactoryUtil.ilike("codiceIstat", StringPool.PERCENT + keywords + StringPool.PERCENT)); - criterion = - RestrictionsFactoryUtil.or(criterion, - RestrictionsFactoryUtil.ilike("codiceBelfiore", StringPool.PERCENT + keywords + StringPool.PERCENT)); - criterion = - RestrictionsFactoryUtil.or(criterion, - RestrictionsFactoryUtil.ilike("denominazione", StringPool.PERCENT + keywords + StringPool.PERCENT)); + Criterion criterion = RestrictionsFactoryUtil.ilike("codiceProvincia", StringPool.PERCENT + keywords + + StringPool.PERCENT); + criterion = RestrictionsFactoryUtil.or(criterion, + RestrictionsFactoryUtil.ilike("codiceComune", StringPool.PERCENT + keywords + StringPool.PERCENT)); + criterion = RestrictionsFactoryUtil.or(criterion, + RestrictionsFactoryUtil.ilike("codiceIstat", StringPool.PERCENT + keywords + StringPool.PERCENT)); + criterion = RestrictionsFactoryUtil.or(criterion, + RestrictionsFactoryUtil.ilike("codiceBelfiore", StringPool.PERCENT + keywords + StringPool.PERCENT)); + criterion = RestrictionsFactoryUtil.or(criterion, + RestrictionsFactoryUtil.ilike("denominazione", StringPool.PERCENT + keywords + StringPool.PERCENT)); query.add(criterion); return query; } - private void validate(long companyId, long comuneId, String codiceProvincia, String codiceComune, String codiceIstat, - String codiceBelfiore, String denominazione, boolean provincia) throws PortalException, SystemException { + private void validate(long companyId, long comuneId, String codiceProvincia, String codiceComune, + String codiceIstat, String codiceBelfiore, String denominazione, boolean provincia) throws PortalException, + SystemException { if (codiceBelfiore != null && !codiceBelfiore.startsWith("Z")) { @@ -414,18 +412,18 @@ public class ComuneLocalServiceImpl extends ComuneLocalServiceBaseImpl { throw new DuplicateComuneException(); } } - - boolean checkIfContained(Comune comune, List comuni){ + + boolean checkIfContained(Comune comune, List comuni) { boolean result = false; - - for(Comune comuneEl: comuni){ - - if(comuneEl.getComuneId() == comune.getComuneId()){ + + for (Comune comuneEl : comuni) { + + if (comuneEl.getComuneId() == comune.getComuneId()) { result = true; break; } } - + return result; } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComuneServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComuneServiceImpl.java index b495fbf4..7be93013 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComuneServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComuneServiceImpl.java @@ -13,7 +13,6 @@ package it.tref.liferay.portos.bo.service.impl; import it.tref.liferay.portos.bo.model.Comune; -import it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.ComuneServiceBaseImpl; import java.util.List; @@ -25,13 +24,12 @@ import com.liferay.portal.kernel.exception.SystemException; * The implementation of the comune remote service. * *

- * All custom service methods should be put in this class. Whenever methods are added, rerun - * ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.ComuneService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.ComuneService} interface. * *

- * This is a remote service. Methods of this service are expected to have security checks based on - * the propagated JAAS credentials because this service can be accessed remotely. + * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS + * credentials because this service can be accessed remotely. *

* * @author Davide Barbagallo, 3F Consulting @@ -39,19 +37,18 @@ import com.liferay.portal.kernel.exception.SystemException; * @see it.tref.liferay.portos.bo.service.ComuneServiceUtil */ public class ComuneServiceImpl extends ComuneServiceBaseImpl { - /* - * NOTE FOR DEVELOPERS: - * - * Never reference this interface directly. Always use {@link - * it.tref.liferay.portos.bo.service.ComuneServiceUtil} to access the comune remote service. - */ - - public Comune getComune(long comuneId) throws PortalException, SystemException { - return ComuneLocalServiceUtil.getComune(comuneId); - } - - public List getComunes(int start, int end) throws SystemException { - return ComuneLocalServiceUtil.getComunes(start, end); - } - + /* + * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.bo.service.ComuneServiceUtil} to access the comune remote service. + */ + + @Override + public Comune getComune(long comuneId) throws PortalException, SystemException { + return comuneLocalService.getComune(comuneId); + } + + @Override + public List getComunes(int start, int end) throws SystemException { + return comuneLocalService.getComunes(start, end); + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneServiceImpl.java index f5ce2446..710b40ae 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneServiceImpl.java @@ -23,13 +23,12 @@ import com.liferay.portal.service.ServiceContext; * The implementation of the comunicazione remote service. * *

- * All custom service methods should be put in this class. Whenever methods are added, rerun - * ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.ComunicazioneService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.ComunicazioneService} interface. * *

- * This is a remote service. Methods of this service are expected to have security checks based on - * the propagated JAAS credentials because this service can be accessed remotely. + * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS + * credentials because this service can be accessed remotely. *

* * @author Davide Barbagallo, 3F Consulting @@ -37,21 +36,22 @@ import com.liferay.portal.service.ServiceContext; * @see it.tref.liferay.portos.bo.service.ComunicazioneServiceUtil */ public class ComunicazioneServiceImpl extends ComunicazioneServiceBaseImpl { - /* - * NOTE FOR DEVELOPERS: - * - * Never reference this interface directly. Always use {@link - * it.tref.liferay.portos.bo.service.ComunicazioneServiceUtil} to access the comunicazione remote - * service. - */ - - public Comunicazione addComunicazione(long userId, long intPraticaId, String domanda, ServiceContext serviceContext) - throws SystemException, PortalException { - return comunicazioneLocalService.addComunicazione(userId, intPraticaId, domanda, serviceContext); - } - - public Comunicazione updateComunicazione(long comunicazioneId, String risposta) throws SystemException, - PortalException { - return comunicazioneLocalService.updateComunicazione(comunicazioneId, risposta); - } + /* + * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.bo.service.ComunicazioneServiceUtil} to access the comunicazione remote service. + */ + + @Override + public Comunicazione addComunicazione(long userId, long intPraticaId, String domanda, ServiceContext serviceContext) + throws SystemException, PortalException { + + return comunicazioneLocalService.addComunicazione(userId, intPraticaId, domanda, serviceContext); + } + + @Override + public Comunicazione updateComunicazione(long comunicazioneId, String risposta) throws SystemException, + PortalException { + + return comunicazioneLocalService.updateComunicazione(comunicazioneId, risposta); + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneServiceImpl.java index 6621089e..ca2531dd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneServiceImpl.java @@ -14,7 +14,6 @@ package it.tref.liferay.portos.bo.service.impl; -import it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.ConfigurazioneServiceBaseImpl; import com.liferay.portal.kernel.exception.PortalException; @@ -25,13 +24,12 @@ import com.liferay.portal.service.ServiceContext; * The implementation of the configurazione remote service. * *

- * All custom service methods should be put in this class. Whenever methods are added, rerun - * ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.ConfigurazioneService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.ConfigurazioneService} interface. * *

- * This is a remote service. Methods of this service are expected to have security checks based on - * the propagated JAAS credentials because this service can be accessed remotely. + * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS + * credentials because this service can be accessed remotely. *

* * @author Davide Barbagallo, 3F Consulting @@ -39,22 +37,27 @@ import com.liferay.portal.service.ServiceContext; * @see it.tref.liferay.portos.bo.service.ConfigurazioneServiceUtil */ public class ConfigurazioneServiceImpl extends ConfigurazioneServiceBaseImpl { - /* - * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link - * it.tref.liferay.portos.bo.service.ConfigurazioneServiceUtil} to access the configurazione - * remote service. - */ - - public long findByC_ChiaveLong(long companyId, String chiave) throws SystemException { - return ConfigurazioneLocalServiceUtil.findByC_ChiaveLong(companyId, chiave); - } - - public String findByC_ChiaveString(long companyId, String chiave) throws SystemException { - return ConfigurazioneLocalServiceUtil.findByC_ChiaveString(companyId, chiave); - } - - public void storeConfig(String chiave, String valore, ServiceContext serviceContext) throws PortalException, - SystemException { - ConfigurazioneLocalServiceUtil.storeConfig(chiave, valore, serviceContext); - } + /* + * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.bo.service.ConfigurazioneServiceUtil} to access the configurazione remote service. + */ + + @Override + public long findByC_ChiaveLong(long companyId, String chiave) throws SystemException { + + return configurazioneLocalService.findByC_ChiaveLong(companyId, chiave); + } + + @Override + public String findByC_ChiaveString(long companyId, String chiave) throws SystemException { + + return configurazioneLocalService.findByC_ChiaveString(companyId, chiave); + } + + @Override + public void storeConfig(String chiave, String valore, ServiceContext serviceContext) throws PortalException, + SystemException { + + configurazioneLocalService.storeConfig(chiave, valore, serviceContext); + } } 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 412214dc..7c7b95d0 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 @@ -17,11 +17,6 @@ import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.model.ControlloPratica; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.IntPratica; -import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil; -import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.TempisticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.ControlloPraticaLocalServiceBaseImpl; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; @@ -74,7 +69,6 @@ import com.liferay.portal.model.UserGroupRole; 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.workflow.kaleo.model.KaleoInstance; import com.liferay.portal.workflow.kaleo.service.KaleoInstanceLocalServiceUtil; import com.liferay.portlet.asset.NoSuchEntryException; @@ -144,7 +138,7 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi serviceContext.getAssetLinkEntryIds(), now); // ADT: BUG BO GESTIONE WORKFLOW Map wfContextMap = new HashMap(); - DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId); + DettPratica dettPratica = dettPraticaLocalService.getDettPratica(dettPraticaId); if (dettPratica != null && dettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.VARIANTE)) { wfContextMap.put("wf_variante", "OK"); } @@ -157,8 +151,8 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi } else { dtInvio = entry.getCreateDate(); } - TempisticaLocalServiceUtil.addTempistica(intPraticaId, dettPraticaId, TempisticaConstants.TIPO_PRATICA, - dtInvio, serviceContext); + tempisticaLocalService.addTempistica(intPraticaId, dettPraticaId, TempisticaConstants.TIPO_PRATICA, dtInvio, + serviceContext); return entry; } @@ -279,13 +273,13 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi public boolean generazioneDocumento(long controlloPraticaId, String jsonParams, String tipoAvviso, long userIdFirma, Map workflowContext) throws PortalException, SystemException { - ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(controlloPraticaId); - DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(controlloPratica.getDettPraticaId()); + ControlloPratica controlloPratica = getControlloPratica(controlloPraticaId); + DettPratica dettPratica = dettPraticaLocalService.getDettPratica(controlloPratica.getDettPraticaId()); ServiceContext serviceContext = new ServiceContext(); serviceContext.setCompanyId(controlloPratica.getCompanyId()); serviceContext.setScopeGroupId(controlloPratica.getGroupId()); serviceContext.setUserId(controlloPratica.getUserId()); - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); + IntPratica intPratica = intPraticaLocalService.getIntPratica(dettPratica.getIntPraticaId()); String userCodiceFiscale = GestioneFirmeUtil.getCodiceFiscaleFirma(controlloPratica.getCompanyId(), controlloPratica.getGroupId(), intPratica.getStatoPratica()); if (Validator.isNull(intPratica.getDtSorteggio()) @@ -309,14 +303,14 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi public boolean generaDocumentoFinale(long controlloPraticaId, String jsonParams, long userIdFirma, Map workflowContext) throws PortalException, SystemException { - ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(controlloPraticaId); - DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(controlloPratica.getDettPraticaId()); + ControlloPratica controlloPratica = getControlloPratica(controlloPraticaId); + DettPratica dettPratica = dettPraticaLocalService.getDettPratica(controlloPratica.getDettPraticaId()); ServiceContext serviceContext = new ServiceContext(); serviceContext.setCompanyId(controlloPratica.getCompanyId()); serviceContext.setScopeGroupId(controlloPratica.getGroupId()); serviceContext.setUserId(controlloPratica.getUserId()); String statoPratica = getEsitoFinale(controlloPraticaId, workflowContext); - User user = UserLocalServiceUtil.fetchUser(userIdFirma); + User user = userLocalService.fetchUser(userIdFirma); String codiceFiscale = StringPool.BLANK; if (user != null) { codiceFiscale = user.getScreenName(); @@ -336,7 +330,7 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi public void updateIstruttore(long controlloPraticaId, Map workflowContext) throws PortalException, SystemException { - ControlloPratica controlloPratica = controlloPraticaLocalService.getControlloPratica(controlloPraticaId); + ControlloPratica controlloPratica = getControlloPratica(controlloPraticaId); @SuppressWarnings("unchecked") Map parametri = (Map) workflowContext.get("CONTEXT_TASK_FORM_PARAMETERS"); IntPratica intPratica = intPraticaLocalService.getIntPratica(controlloPratica.getIntPraticaId()); @@ -361,7 +355,7 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi String esito = getEsitoFinale(controlloPraticaId, workflowContext); String ramoWorkflow = StringPool.BLANK; - ControlloPratica controlloPratica = controlloPraticaLocalService.getControlloPratica(controlloPraticaId); + ControlloPratica controlloPratica = getControlloPratica(controlloPraticaId); Avviso avviso = avvisoLocalService .fetchLastAvvisoByIntPraticaPerStatoFinale(controlloPratica.getIntPraticaId()); if (avviso != null && avviso.getRifiutato()) { @@ -399,7 +393,7 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi private String getEsitoFinale(long controlloPraticaId, Map workflowContext) throws PortalException, SystemException { - ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(controlloPraticaId); + ControlloPratica controlloPratica = getControlloPratica(controlloPraticaId); Map parametri = WorkflowUtil.getFormParameters(controlloPratica); String esitoScelta = (String) parametri.get(WorkflowConstants.WORKFLOW_TASKNAME_ESITO); if (StatoPraticaConstants.CONFORME.equalsIgnoreCase(esitoScelta) @@ -416,7 +410,7 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi public void aggiornaStatoPerRichiestaIntegrazione(long controlloPraticaId, Map workflowContext) throws PortalException, SystemException { - ControlloPratica controlloPratica = controlloPraticaLocalService.getControlloPratica(controlloPraticaId); + ControlloPratica controlloPratica = getControlloPratica(controlloPraticaId); IntPratica intPratica = intPraticaLocalService.getIntPratica(controlloPratica.getIntPraticaId()); intPratica.setStatoPratica(StatoPraticaConstants.INTEGRAZIONE); intPraticaLocalService.updateIntPratica(intPratica); @@ -426,7 +420,7 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi public String getJsonListaIstruttori(long controlloPraticaId, Map workflowContext) throws PortalException, SystemException { - ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(controlloPraticaId); + ControlloPratica controlloPratica = getControlloPratica(controlloPraticaId); JSONObject jsonObject = JSONFactoryUtil.createJSONObject(); JSONArray jsonArray = JSONFactoryUtil.createJSONArray(); jsonObject.put("istruttore", jsonArray); @@ -447,7 +441,7 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi public String getJsonEsitoPratica(long controlloPraticaId, Map workflowContext) throws PortalException, SystemException { - ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(controlloPraticaId); + ControlloPratica controlloPratica = getControlloPratica(controlloPraticaId); JSONObject jsonObject = JSONFactoryUtil.createJSONObject(); JSONArray jsonArray = JSONFactoryUtil.createJSONArray(); jsonObject.put(WorkflowConstants.WORKFLOW_TASKNAME_ESITO, jsonArray); @@ -500,7 +494,7 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi @Override public ControlloPratica addPraticheAlControllo(long controlloPraticaId, long dettPraticaId) throws PortalException, SystemException { - ControlloPratica controlloPratica = controlloPraticaLocalService.getControlloPratica(controlloPraticaId); + ControlloPratica controlloPratica = getControlloPratica(controlloPraticaId); controlloPratica.setDettPraticaId(dettPraticaId); controlloPratica.setModifiedDate(new Date()); @@ -513,7 +507,7 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi ServiceContext serviceContext) throws PortalException, SystemException { _log.info("start addPraticheAlControlloVarianti per controlloPraticaId=" + controlloPraticaId); - ControlloPratica controlloPratica = controlloPraticaLocalService.getControlloPratica(controlloPraticaId); + ControlloPratica controlloPratica = getControlloPratica(controlloPraticaId); controlloPratica.setDettPraticaId(dettPraticaId); controlloPratica.setModifiedDate(new Date()); ControlloPratica result = controlloPraticaPersistence.update(controlloPratica); @@ -543,8 +537,8 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi @Override public String getReturnValueScriptIniziale(long controlloPraticaId) throws PortalException, SystemException { - ControlloPratica controlloPratica = controlloPraticaLocalService.getControlloPratica(controlloPraticaId); - DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(controlloPratica.getDettPraticaId()); + ControlloPratica controlloPratica = getControlloPratica(controlloPraticaId); + DettPratica dettPratica = dettPraticaLocalService.getDettPratica(controlloPratica.getDettPraticaId()); if (TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equalsIgnoreCase(dettPratica.getTipoIntegrazione())) { return "portos1_integrazioni"; } else { @@ -556,7 +550,7 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi public String getTipoEsito(long controlloPraticaId) throws SystemException, PortalException { String tipoEsito = StringPool.BLANK; - ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.fetchControlloPratica(controlloPraticaId); + ControlloPratica controlloPratica = fetchControlloPratica(controlloPraticaId); ClassLoader classLoaderKaleo = (ClassLoader) PortletBeanLocatorUtil.locate( com.liferay.portal.workflow.kaleo.service.ClpSerializer.getServletContextName(), "portletClassLoader"); DynamicQuery dqKaleo = DynamicQueryFactoryUtil.forClass(KaleoInstance.class, classLoaderKaleo); @@ -623,15 +617,15 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi @Override public Long calculateDateAvvioProcedimento(long controlloPraticaId) throws SystemException, PortalException { - ControlloPratica controllo = ControlloPraticaLocalServiceUtil.fetchControlloPratica(controlloPraticaId); - IntPratica pratica = IntPraticaLocalServiceUtil.fetchIntPratica(controllo.getIntPraticaId()); + ControlloPratica controllo = fetchControlloPratica(controlloPraticaId); + IntPratica pratica = intPraticaLocalService.fetchIntPratica(controllo.getIntPraticaId()); if (pratica.getStatoPratica().equalsIgnoreCase(StatoPraticaConstants.AUTORIZZATA)) { return 0L; } Date apertura = pratica.getDtPratica(); Date chiusura = null; long stop = 0L; - List avvisi = AvvisoLocalServiceUtil.findByIntPratica( + List avvisi = avvisoLocalService.findByIntPratica( pratica.getIntPraticaId(), QueryUtil.ALL_POS, QueryUtil.ALL_POS, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaLocalServiceImpl.java index f5d937a5..81359d7f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaLocalServiceImpl.java @@ -13,11 +13,9 @@ package it.tref.liferay.portos.bo.service.impl; import it.tref.liferay.portos.bo.model.Delega; -import it.tref.liferay.portos.bo.service.AsseverazioneLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.DelegaLocalServiceBaseImpl; import it.tref.liferay.portos.bo.shared.bean.FirmeBean; import it.tref.liferay.portos.bo.shared.util.FirmeUtil; -import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; import it.tref.liferay.portos.bo.util.AsseverazioniUtil; import it.tref.liferay.portos.bo.util.DelegheUtil; import it.tref.liferay.portos.report.shared.constants.ReportConstants; @@ -48,7 +46,6 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.model.User; import com.liferay.portal.service.ServiceContext; import com.liferay.portlet.documentlibrary.model.DLFolder; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; /** @@ -389,7 +386,7 @@ public class DelegaLocalServiceImpl extends DelegaLocalServiceBaseImpl { long userId = serviceContext.getUserId(); DLFolder folderTemplate = DLFolderLocalServiceUtil.getFolder(serviceContext.getThemeDisplay() .getCompanyGroupId(), 0L, "Template"); - FileEntry fileEntryIdTemplate = DLAppLocalServiceUtil.getFileEntry(serviceContext.getThemeDisplay() + FileEntry fileEntryIdTemplate = dlAppLocalService.getFileEntry(serviceContext.getThemeDisplay() .getCompanyGroupId(), folderTemplate.getFolderId(), "Modello Asseverazione"); DLFolder folderAllegati = DLFolderLocalServiceUtil.getFolder(serviceContext.getThemeDisplay() .getCompanyGroupId(), 0L, "Allegati"); @@ -418,7 +415,7 @@ public class DelegaLocalServiceImpl extends DelegaLocalServiceBaseImpl { relazioni = (String) dichiarazioniMap.get("relazioni"); } User user = userLocalService.getUser(userId); - parameters.put("html", AsseverazioneLocalServiceUtil.testoAsseverazione(TipoSoggettoUtil.GEOLOGO, user, + parameters.put("html", asseverazioneLocalService.testoAsseverazioneGeologo(user.getScreenName(), dettPraticaId, relazioni)); parameters.put("modello", "AS-GEO"); ReportResultDto result = ReportUtil.generateReport(delega.getCompanyId(), userId, reportDto, null); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java index 78cf086a..e9f469a0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java @@ -23,7 +23,6 @@ import it.tref.liferay.portos.bo.model.Pagamento; import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.model.Tempistica; import it.tref.liferay.portos.bo.model.impl.DettPraticaImpl; -import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.DettPraticaLocalServiceBaseImpl; import it.tref.liferay.portos.bo.shared.util.PagamentoConstants; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; @@ -110,8 +109,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl User user = userLocalService.getUser(serviceContext.getUserId()); Date now = new Date(); - DettPratica dettPratica = dettPraticaLocalService.createDettPratica(counterLocalService - .increment(DettPratica.class.getName())); + DettPratica dettPratica = createDettPratica(counterLocalService.increment(DettPratica.class.getName())); dettPratica.setCompanyId(serviceContext.getCompanyId()); dettPratica.setGroupId(serviceContext.getScopeGroupId()); dettPratica.setUserId(serviceContext.getUserId()); @@ -309,8 +307,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl @Indexable(type = IndexableType.REINDEX) public DettPratica addDettPraticaForImport(ServiceContext serviceContext) throws SystemException, PortalException { - DettPratica dettPratica = dettPraticaLocalService.createDettPratica(counterLocalService - .increment(DettPratica.class.getName())); + DettPratica dettPratica = createDettPratica(counterLocalService.increment(DettPratica.class.getName())); dettPratica.setCompanyId(serviceContext.getCompanyId()); dettPratica.setGroupId(serviceContext.getScopeGroupId()); dettPratica.setUserId(serviceContext.getUserId()); @@ -1234,7 +1231,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl } else if (TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equals(dettPratica.getTipoIntegrazione())) { sendMail = true; } - dettPratica = dettPraticaLocalService.updateDettPratica(dettPratica); + dettPratica = updateDettPratica(dettPratica); docPraticaLocalService.completeInvalidation(dettPratica.getIntPraticaId()); soggettoLocalService.completeInvalidation(dettPratica.getIntPraticaId()); // chiudo timer pratica se presente @@ -1351,7 +1348,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl } dettPratica = updateDettPratica(dettPratica); updateStatus(dettPraticaId, WorkflowConstants.STATUS_INCOMPLETE); - dettPratica = dettPraticaLocalService.getDettPratica(dettPraticaId); + dettPratica = getDettPratica(dettPraticaId); return dettPratica; } @@ -1405,11 +1402,11 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl public DettPratica updateDettPraticaProtocollo(long dettPraticaId, String protocollo) throws PortalException, SystemException { - DettPratica dettPratica = dettPraticaLocalService.fetchDettPratica(dettPraticaId); + DettPratica dettPratica = fetchDettPratica(dettPraticaId); dettPratica.setModifiedDate(new Date()); dettPratica.setProtocollo(protocollo); dettPratica.setDtProtocollo(new Date()); - dettPratica = dettPraticaLocalService.updateDettPratica(dettPratica); + dettPratica = updateDettPratica(dettPratica); IntPratica intPratica = intPraticaLocalService.getIntPratica(dettPratica.getIntPraticaId()); if (intPratica.getStatus() == WorkflowConstants.STATUS_ANY || intPratica.getStatus() == WorkflowConstants.STATUS_INCOMPLETE) { @@ -1448,7 +1445,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl @Override public List findByIntPraticaIdInviate(long intPraticaId, int start, int end) throws SystemException { - DynamicQuery dynamicQuery = dettPraticaLocalService.dynamicQuery(); + DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); dynamicQuery.add(RestrictionsFactoryUtil.ne("status", WorkflowConstants.STATUS_ANY)); dynamicQuery.add(RestrictionsFactoryUtil.ne("status", WorkflowConstants.STATUS_INCOMPLETE)); @@ -1474,7 +1471,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl private DynamicQuery getDynamicQueryPraticheCompleteNotProtocollo() { - DynamicQuery dynamicQuery = dettPraticaLocalService.dynamicQuery(); + DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("completa", true)); dynamicQuery.add(RestrictionsFactoryUtil.eq("gestita", false)); Disjunction or = RestrictionsFactoryUtil.disjunction(); @@ -1502,7 +1499,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl private DynamicQuery getDynamicQueryPraticheCompleteNotGestite() { - DynamicQuery dynamicQuery = dettPraticaLocalService.dynamicQuery(); + DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("completa", true)); dynamicQuery.add(RestrictionsFactoryUtil.eq("gestita", false)); dynamicQuery.add(RestrictionsFactoryUtil.ne("protocollo", StringPool.BLANK)); @@ -1544,7 +1541,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl private DynamicQuery getDynamicQueryPraticheCompletateNonVersionate() { - DynamicQuery dynamicQuery = dettPraticaLocalService.dynamicQuery(); + DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("completa", true)); dynamicQuery.add(RestrictionsFactoryUtil.eq("versionata", false)); dynamicQuery.add(RestrictionsFactoryUtil.ne("protocollo", StringPool.BLANK)); @@ -1555,11 +1552,11 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl @Override public DettPratica updateDettPraticaGestita(long dettPraticaId, boolean gestita) throws SystemException { - DettPratica dettPratica = dettPraticaLocalService.fetchDettPratica(dettPraticaId); + DettPratica dettPratica = fetchDettPratica(dettPraticaId); dettPratica.setModifiedDate(new Date()); dettPratica.setGestita(gestita); - return dettPraticaLocalService.updateDettPratica(dettPratica); + return updateDettPratica(dettPratica); } @Override @@ -1570,7 +1567,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl @Override public void updateStatus(long dettPraticaId, int status) throws PortalException, SystemException { - DettPratica dettPratica = dettPraticaLocalService.getDettPratica(dettPraticaId); + DettPratica dettPratica = getDettPratica(dettPraticaId); dettPratica.setStatus(status); updateDettPratica(dettPratica); } @@ -1580,7 +1577,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl DettPratica dettPratica = dettPraticaPersistence.fetchByPrimaryKey(dettPraticaId); dettPratica.setDtInvioSignal(dtInvioSignal); - return dettPraticaLocalService.updateDettPratica(dettPratica); + return updateDettPratica(dettPratica); } @Override @@ -1611,7 +1608,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl @Override public DynamicQuery dynamicQueryInvioSignal(Long dettPraticaId) throws SystemException { - DynamicQuery dynamicQuery = dettPraticaLocalService.dynamicQuery(); + DynamicQuery dynamicQuery = dynamicQuery(); if (Validator.isNotNull(dettPraticaId)) { dynamicQuery.add(PropertyFactoryUtil.forName("avvisoId").eq(dettPraticaId)); } @@ -1626,7 +1623,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl @Override public List findByPagamentoId(long pagamentoId) throws SystemException { - DynamicQuery dynamicQuery = dettPraticaLocalService.dynamicQuery(); + DynamicQuery dynamicQuery = dynamicQuery(); Disjunction disjunction = RestrictionsFactoryUtil.disjunction(); disjunction.add(RestrictionsFactoryUtil.eq("pagamentoIdOneri", pagamentoId)); disjunction.add(RestrictionsFactoryUtil.eq("pagamentoIdBolli", pagamentoId)); @@ -1639,7 +1636,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl public DettPratica updatePrincipale(long dettPraticaId, String codiceFiscale, String tipologiaSoggetto) throws PortalException, SystemException { - DettPratica dettPratica = dettPraticaLocalService.getDettPratica(dettPraticaId); + DettPratica dettPratica = getDettPratica(dettPraticaId); switch (tipologiaSoggetto) { case TipoSoggettoUtil.COMMITTENTE: dettPratica.setCodiceFiscalePrincipaleCommittente(codiceFiscale); @@ -1660,7 +1657,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl dettPratica.setCodiceFiscalePrincipaleDitta(codiceFiscale); break; } - dettPratica = DettPraticaLocalServiceUtil.updateDettPratica(dettPratica); + dettPratica = updateDettPratica(dettPratica); return dettPratica; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java index 03165da1..ce024bc1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java @@ -14,8 +14,6 @@ package it.tref.liferay.portos.bo.service.impl; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.Territorio; -import it.tref.liferay.portos.bo.service.DettPraticaServiceUtil; -import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.DettPraticaServiceBaseImpl; import it.tref.liferay.portos.bo.service.permission.DettPraticaEntryPermission; import it.tref.liferay.portos.bo.service.permission.DettPraticaPermission; @@ -65,7 +63,7 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { public DettPratica addDettPratica(long territorioId, String tipoProcedura, ServiceContext serviceContext) throws PortalException, SystemException { - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(territorioId); + Territorio territorio = territorioLocalService.getTerritorio(territorioId); DettPraticaPermission.check(getPermissionChecker(), territorio.getGroupId(), ActionKeys.ADD_ENTRY); return dettPraticaLocalService.addDettPratica(territorioId, tipoProcedura, serviceContext); } @@ -73,12 +71,14 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { @Override public DettPratica addDettPraticaToIntPratica(long intPraticaId, ServiceContext serviceContext) throws PortalException, SystemException { + return dettPraticaLocalService.addDettPraticaToIntPratica(intPraticaId, serviceContext); } @Override public DettPratica addDettPraticaClonedToIntPratica(long intPraticaId, long dettPraticaToCloneId, String tipoIntegrazione, ServiceContext serviceContext) throws PortalException, SystemException { + return dettPraticaLocalService.addDettPraticaClonedToIntPratica(intPraticaId, dettPraticaToCloneId, tipoIntegrazione, serviceContext); } @@ -257,39 +257,24 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { @Override public DettPratica getLastEditabledByIntPraticaAndTipoPratica(long intPraticaId, List tipoPratiche) throws SystemException { + return dettPraticaLocalService.getLastEditabledByIntPraticaAndTipoPratica(intPraticaId, tipoPratiche); } @Override public List findCompletedByIntPraticaAndTipoPratica(long intPraticaId, List tipoPratiche) throws SystemException { + return dettPraticaLocalService.findCompletedByIntPraticaAndTipoPratica(intPraticaId, tipoPratiche); } @Override public int countCompletedByIntPraticaAndTipoPratica(long intPraticaId, List tipoPratiche) throws SystemException { + return dettPraticaLocalService.countCompletedByIntPraticaAndTipoPratica(intPraticaId, tipoPratiche); } - // public void updatePagamentoManuale(long pagamentoId, long dettPraticaId, - // byte[] content, String - // sourceFileName, - // ServiceContext serviceContext) throws PortalException, SystemException { - // - // DettPratica dettPratica = - // dettPraticaLocalService.getDettPratica(dettPraticaId); - // if (getUserId() == dettPratica.getUserId()) { - // dettPraticaLocalService.updatePagamentoManuale(pagamentoId, - // dettPraticaId, content, - // sourceFileName, - // serviceContext); - // } else { - // throw new - // SystemException("pagamento manuale aggiornabile solo da titolare del dettPratica"); - // } - // } - @Override public DettPratica pagaInvia(long dettPraticaId, int pagAdeguamentoSismico, int pagAltro, int pagMiglioramentoSismico, int pagNuovaCostruzione, boolean pagNuoveCostruzioni, @@ -314,12 +299,14 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { @Override public DettPratica updateCheckPagamenti(long dettPraticaId, boolean normEsenteSpese, boolean normEsenteBollo) throws SystemException, PortalException { + return dettPraticaLocalService.updateCheckPagamenti(dettPraticaId, normEsenteSpese, normEsenteBollo); } @Override public DettPratica updateEsito(long dettPraticaId, int stato) throws IOException, SystemException, PortalException { - DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); + + DettPratica dettPratica = getDettPratica(dettPraticaId); DettPraticaPermission.check(getPermissionChecker(), dettPratica.getGroupId(), ActionKeys.ADD_ENTRY); return dettPraticaLocalService.updateEsito(dettPraticaId, stato); } @@ -327,7 +314,8 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { @Override public DettPratica updateEsitoIntegrazione(long dettPraticaId, int stato) throws IOException, SystemException, PortalException { - DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); + + DettPratica dettPratica = getDettPratica(dettPraticaId); DettPraticaPermission.check(getPermissionChecker(), dettPratica.getGroupId(), ActionKeys.ADD_ENTRY); return dettPraticaLocalService.updateEsitoIntegrazione(dettPraticaId, stato); } @@ -335,6 +323,7 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { @Override public DettPratica updatePrincipale(long dettPraticaId, String codiceFiscale, String tipologiaSoggetto) throws PortalException, SystemException { + return dettPraticaLocalService.updatePrincipale(dettPraticaId, codiceFiscale, tipologiaSoggetto); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaLocalServiceImpl.java index 51abb9f5..40c07bc8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaLocalServiceImpl.java @@ -233,7 +233,7 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { long companyId = territorio.getCompanyId(); long groupId = territorio.getGroupId(); // TODO forse è meglio ragionare con un'altra logica per i permessi - User user = UserLocalServiceUtil.getRoleUsers( + User user = userLocalService.getRoleUsers( RoleLocalServiceUtil.getRole(intPratica.getCompanyId(), RoleConstants.ADMINISTRATOR).getRoleId()) .get(0); try { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java index 44bad525..c889c0bb 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java @@ -18,7 +18,6 @@ import it.tref.liferay.portos.bo.model.DocPratica; import it.tref.liferay.portos.bo.model.FineLavori; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.Pagamento; -import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.FineLavoriLocalServiceBaseImpl; import it.tref.liferay.portos.bo.shared.util.PagamentoConstants; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; @@ -104,7 +103,7 @@ public class FineLavoriLocalServiceImpl extends FineLavoriLocalServiceBaseImpl { public FineLavori addFineLavori(long intPraticaId, ServiceContext serviceContext) throws PortalException, SystemException { - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); + IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaId); FineLavori fineLavori = initFineLavori(serviceContext); fineLavori.setGroupId(intPratica.getGroupId()); fineLavori.setIntPraticaId(intPraticaId); @@ -300,11 +299,11 @@ public class FineLavoriLocalServiceImpl extends FineLavoriLocalServiceBaseImpl { public FineLavori updateFineLavoriProtocollo(long fineLavoriId, String protocollo) throws PortalException, SystemException { - FineLavori fineLavori = fineLavoriLocalService.fetchFineLavori(fineLavoriId); + FineLavori fineLavori = fetchFineLavori(fineLavoriId); fineLavori.setModifiedDate(new Date()); fineLavori.setProtocollo(protocollo); fineLavori.setDtProtocollo(new Date()); - fineLavori = fineLavoriLocalService.updateFineLavori(fineLavori); + fineLavori = updateFineLavori(fineLavori); return fineLavori; } @@ -452,7 +451,7 @@ public class FineLavoriLocalServiceImpl extends FineLavoriLocalServiceBaseImpl { private DynamicQuery getDynamicQueryFineLavoriCompleteNotProtocollo() { - DynamicQuery dynamicQuery = fineLavoriLocalService.dynamicQuery(); + DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); dynamicQuery.add(RestrictionsFactoryUtil.eq("gestita", false)); Disjunction or = RestrictionsFactoryUtil.disjunction(); @@ -479,7 +478,7 @@ public class FineLavoriLocalServiceImpl extends FineLavoriLocalServiceBaseImpl { private DynamicQuery getDynamicQueryFineLavoriCompleteNotGestite() { - DynamicQuery dynamicQuery = fineLavoriLocalService.dynamicQuery(); + DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); dynamicQuery.add(RestrictionsFactoryUtil.eq("gestita", false)); dynamicQuery.add(RestrictionsFactoryUtil.ne("protocollo", StringPool.BLANK)); @@ -490,7 +489,7 @@ public class FineLavoriLocalServiceImpl extends FineLavoriLocalServiceBaseImpl { @Override public List findIntPraticaByFineLavori() throws PortalException, SystemException { - DynamicQuery dynamicQuery = fineLavoriLocalService.dynamicQuery(); + DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); dynamicQuery.setProjection(ProjectionFactoryUtil.distinct(ProjectionFactoryUtil.property("intPraticaId"))); List ids = fineLavoriPersistence.findWithDynamicQuery(dynamicQuery); @@ -501,7 +500,7 @@ public class FineLavoriLocalServiceImpl extends FineLavoriLocalServiceBaseImpl { public List findIntPraticaByFineLavori(String codiceFiscaleDelegatoCollaudo) throws PortalException, SystemException { - DynamicQuery dynamicQuery = fineLavoriLocalService.dynamicQuery(); + DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); dynamicQuery.add(RestrictionsFactoryUtil.ilike("codiceFiscaleDelegatoCollaudo", codiceFiscaleDelegatoCollaudo)); dynamicQuery.setProjection(ProjectionFactoryUtil.distinct(ProjectionFactoryUtil.property("intPraticaId"))); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/HistoryWorkflowActionLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/HistoryWorkflowActionLocalServiceImpl.java index a4afd22d..8d689449 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/HistoryWorkflowActionLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/HistoryWorkflowActionLocalServiceImpl.java @@ -13,7 +13,6 @@ package it.tref.liferay.portos.bo.service.impl; import it.tref.liferay.portos.bo.model.HistoryWorkflowAction; -import it.tref.liferay.portos.bo.service.HistoryWorkflowActionLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.HistoryWorkflowActionLocalServiceBaseImpl; import java.util.List; @@ -58,12 +57,11 @@ public class HistoryWorkflowActionLocalServiceImpl extends HistoryWorkflowAction } else { query.addOrder(OrderFactoryUtil.desc("createDate")); } - return HistoryWorkflowActionLocalServiceUtil.dynamicQuery(query); + return dynamicQuery(query); } @Override public List findByIntPratica(long intPraticaId) throws SystemException { - return historyWorkflowActionPersistence.findByIntPratica(intPraticaId); } } 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 d97e38f4..1e1807ad 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 @@ -32,13 +32,6 @@ import it.tref.liferay.portos.bo.model.Sorteggio; import it.tref.liferay.portos.bo.model.StoricoSoggettoPratica; import it.tref.liferay.portos.bo.model.Tempistica; import it.tref.liferay.portos.bo.model.Territorio; -import it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil; -import it.tref.liferay.portos.bo.service.ConfigurazioneServiceUtil; -import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.IntPraticaLocalServiceBaseImpl; import it.tref.liferay.portos.bo.service.persistence.IntPraticaFinderUtil; import it.tref.liferay.portos.bo.shared.bean.FirmeBean; @@ -109,7 +102,6 @@ import com.liferay.portal.model.User; import com.liferay.portal.security.permission.ActionKeys; import com.liferay.portal.security.permission.PermissionThreadLocal; import com.liferay.portal.service.ServiceContext; -import com.liferay.portal.service.UserLocalServiceUtil; import com.liferay.portal.service.WorkflowInstanceLinkLocalServiceUtil; import com.liferay.portlet.documentlibrary.NoSuchFolderException; @@ -136,7 +128,7 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { */ private static Log _log = LogFactoryUtil.getLog(IntPraticaLocalServiceImpl.class); - + private static final Map tipiProcedure = new LinkedHashMap<>(); static { putTipoProcedura(Constants.PROCEDURA_A); @@ -152,7 +144,6 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { public Map getTipiProcedure() { return tipiProcedure; } - /** * Restituisce la lista di pratiche da sottoporre a sorteggio suddivisa per codice provincia. Modificata secondo il @@ -167,7 +158,7 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { HashMap> ret = new HashMap<>(); List lista = new ArrayList(); - int dow = Integer.parseInt(ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, + int dow = Integer.parseInt(configurazioneService.findByC_ChiaveString(companyId, ConfigurazioneConstants.DAY_OF_WEEK_SORTEGGIO)); Date[] date = SismicaUtil.getWeekInterval(dow, dtSorteggio); DynamicQuery dq = intPraticaLocalService.dynamicQuery(); @@ -189,8 +180,8 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { for (IntPratica pratica : lista) { long territorioId = pratica.getTerritorioId(); if (!territoriProvince.containsKey(territorioId)) { - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(territorioId); - Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId()); + Territorio territorio = territorioLocalService.getTerritorio(territorioId); + Comune comune = comuneLocalService.getComune(territorio.getComuneId()); territoriProvince.put(territorioId, comune.getCodiceProvincia()); } String codiceProvincia = territoriProvince.get(territorioId); @@ -213,7 +204,7 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { HashMap> ret = new HashMap<>(); List lista = new ArrayList(); - int dow = Integer.parseInt(ConfigurazioneServiceUtil.findByC_ChiaveString(companyId, + int dow = Integer.parseInt(configurazioneService.findByC_ChiaveString(companyId, ConfigurazioneConstants.DAY_OF_WEEK_SORTEGGIO)); Date[] date = SismicaUtil.getWeekInterval(dow, dtSorteggio); @@ -233,8 +224,8 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { for (IntPratica pratica : lista) { long territorioId = pratica.getTerritorioId(); if (!territoriProvince.containsKey(territorioId)) { - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(territorioId); - Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId()); + Territorio territorio = territorioLocalService.getTerritorio(territorioId); + Comune comune = comuneLocalService.getComune(territorio.getComuneId()); territoriProvince.put(territorioId, comune.getCodiceProvincia()); } String codiceProvincia = territoriProvince.get(territorioId); @@ -252,7 +243,7 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { throws SystemException, PortalException { User user = userLocalService.getUser(serviceContext.getUserId()); - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(territorioId); + Territorio territorio = territorioLocalService.getTerritorio(territorioId); Date now = new Date(); IntPratica intPratica = intPraticaLocalService.createIntPratica(counterLocalService.increment(IntPratica.class .getName())); @@ -280,7 +271,7 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { int esitoControllo, Date dtPratica, ServiceContext serviceContext) throws PortalException, SystemException { Date now = new Date(); - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(territorioId); + Territorio territorio = territorioLocalService.getTerritorio(territorioId); IntPratica intPratica = intPraticaPersistence.create(counterLocalService.increment(IntPratica.class.getName())); intPratica.setCompanyId(serviceContext.getCompanyId()); intPratica.setUserId(userId); @@ -493,8 +484,8 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { private void inviaMailNotifica(IntPratica intPratica) throws SystemException, PortalException { - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); - Comune comune = ComuneLocalServiceUtil.getComune(territorio.getComuneId()); + Territorio territorio = territorioLocalService.getTerritorio(intPratica.getTerritorioId()); + Comune comune = comuneLocalService.getComune(territorio.getComuneId()); DettPratica dettPratica = dettPraticaLocalService.getLastCompletedByIntPratica(intPratica.getIntPraticaId()); String eMail = StringPool.BLANK; if (dettPratica.getSuap()) { @@ -541,8 +532,8 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaId); intPratica.setModifiedDate(new Date()); - User oldUser = UserLocalServiceUtil.getUser(intPratica.getUserId()); - User newUser = UserLocalServiceUtil.getUser(soggettoId); + User oldUser = userLocalService.getUser(intPratica.getUserId()); + User newUser = userLocalService.getUser(soggettoId); // sostituisci int pratica intPratica.setUserId(soggettoId); intPratica.setUserName(newUser.getFullName()); @@ -550,11 +541,11 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { * TODO: verificare che sia veramente come implementato sotto oppure bisogna cambiare il titolare anche di tutti * i dettPratica */ - DettPratica dettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPraticaId); + DettPratica dettPratica = dettPraticaLocalService.getLastCompletedByIntPratica(intPraticaId); dettPratica.setCodiceFiscaleDelegatoCommittente(newUser.getScreenName()); - DettPraticaLocalServiceUtil.updateDettPratica(dettPratica); + dettPraticaLocalService.updateDettPratica(dettPratica); // registra storico - StoricoSoggettoPraticaLocalServiceUtil.addStoricoSoggettoPratica(intPraticaId, oldUser.getFirstName(), + storicoSoggettoPraticaLocalService.addStoricoSoggettoPratica(intPraticaId, oldUser.getFirstName(), oldUser.getLastName(), oldUser.getScreenName(), serviceContext); Indexer indexer = IndexerRegistryUtil.getIndexer(IntPratica.class); intPratica = updateIntPratica(intPratica); @@ -980,7 +971,7 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { queryCP.add(RestrictionsFactoryUtil.eq("intPraticaId", intPratica.getIntPraticaId())); queryCP.addOrder(OrderFactoryUtil.desc("controlloPraticaId")); @SuppressWarnings("unchecked") - List appList = ControlloPraticaLocalServiceUtil.dynamicQuery(queryCP, QueryUtil.ALL_POS, + List appList = controlloPraticaLocalService.dynamicQuery(queryCP, QueryUtil.ALL_POS, QueryUtil.ALL_POS); if (appList != null && !appList.isEmpty()) { for (ControlloPratica controlloPratica : appList) { @@ -1355,7 +1346,7 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { if (intPratica != null) { intIndexer.delete(companyId, intPratica.getUuid()); intIndexer.reindex(IntPratica.class.getName(), intPratica.getIntPraticaId()); - List appList = ControlloPraticaLocalServiceUtil.findByIntPratica(intPratica + List appList = controlloPraticaLocalService.findByIntPratica(intPratica .getIntPraticaId()); if (appList != null) { for (ControlloPratica controlloPratica : appList) { @@ -1373,14 +1364,14 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { @Override public void reIndexFasciolo(String numeroProgetto, long companyId) throws SystemException { - IntPratica intPratica = IntPraticaLocalServiceUtil.findByNumeroProgetto(numeroProgetto); + IntPratica intPratica = intPraticaLocalService.findByNumeroProgetto(numeroProgetto); reIndexFascicolo(intPratica, companyId); } @Override public void reIndexFasciolo(long intPraticaId, long companyId) throws PortalException, SystemException { - reIndexFascicolo(IntPraticaLocalServiceUtil.getIntPratica(intPraticaId), companyId); + reIndexFascicolo(intPraticaLocalService.getIntPratica(intPraticaId), companyId); } @Override 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 fddfa35b..0072496c 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 @@ -14,8 +14,6 @@ package it.tref.liferay.portos.bo.service.impl; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.Territorio; -import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.IntPraticaServiceBaseImpl; import it.tref.liferay.portos.bo.service.permission.IntPraticaPermission; import it.tref.liferay.portos.bo.shared.util.ActionKeys; @@ -65,7 +63,7 @@ public class IntPraticaServiceImpl extends IntPraticaServiceBaseImpl { @Override public void deleteIntPratica(long intPraticaId, long userId) throws PortalException, SystemException { - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); + IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaId); if (ValidazionePraticaUtil.canDeletePratica(intPraticaId, userId)) { intPraticaLocalService.deleteIntPratica(intPratica); } else { @@ -92,8 +90,8 @@ public class IntPraticaServiceImpl extends IntPraticaServiceBaseImpl { @Override public void sospendiPratica(long intPraticaId, boolean sospesa) throws PortalException, SystemException { - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); + IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaId); + Territorio territorio = territorioLocalService.getTerritorio(intPratica.getTerritorioId()); IntPraticaPermission.check(getPermissionChecker(), territorio.getGroupId(), ActionKeys.SOSPENDI_FASCICOLO); intPraticaLocalService.sospendiPratica(intPraticaId, sospesa); @@ -104,8 +102,8 @@ public class IntPraticaServiceImpl extends IntPraticaServiceBaseImpl { public void cambiaTitolare(long intPraticaId, long soggettoId, ServiceContext serviceContext) throws PortalException, SystemException { - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); + IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaId); + Territorio territorio = territorioLocalService.getTerritorio(intPratica.getTerritorioId()); IntPraticaPermission.check(getPermissionChecker(), territorio.getGroupId(), ActionKeys.CAMBIO_TITOLARE); intPraticaLocalService.cambiaTitolare(intPraticaId, soggettoId, serviceContext); @@ -114,8 +112,8 @@ public class IntPraticaServiceImpl extends IntPraticaServiceBaseImpl { @Override public void updateStatoPratica(long intPraticaId, String statoPratica) throws PortalException, SystemException { - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); + IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaId); + Territorio territorio = territorioLocalService.getTerritorio(intPratica.getTerritorioId()); IntPraticaPermission.check(getPermissionChecker(), territorio.getGroupId(), ActionKeys.CAMBIO_STATO); intPraticaLocalService.updateStatoPratica(intPraticaId, statoPratica); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java index ab392bdc..4e415f0f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java @@ -44,7 +44,6 @@ import com.liferay.portal.model.User; import com.liferay.portal.security.permission.ActionKeys; import com.liferay.portal.service.ServiceContext; import com.liferay.portlet.documentlibrary.NoSuchFolderException; -import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; /** * The implementation of the pagamento local service. @@ -333,7 +332,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { } private DynamicQuery createPendingQuery(Date date) { - DynamicQuery dynamicQuery = pagamentoLocalService.dynamicQuery(); + DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.in("utilizzata", new String[] { PagamentoConstants.UTILIZZATA_IN_CORSO, PagamentoConstants.UTILIZZATA_ANNULLATO })); dynamicQuery.add(RestrictionsFactoryUtil.le("createDate", date)); @@ -348,7 +347,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { @Override public Pagamento deletePagamento(long pagamentoId) throws PortalException, SystemException { - return deletePagamento(pagamentoLocalService.getPagamento(pagamentoId)); + return deletePagamento(getPagamento(pagamentoId)); } @Override @@ -356,7 +355,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { if (Validator.isNotNull(pagamento.getFileEntryId())) { try { - DLAppLocalServiceUtil.deleteFileEntry(pagamento.getFileEntryId()); + dlAppLocalService.deleteFileEntry(pagamento.getFileEntryId()); } catch (PortalException e) { } } @@ -370,10 +369,10 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { public Pagamento updateEmailPendingPagamento(long pagamentoId, boolean emailPending) throws PortalException, SystemException { - Pagamento pagamento = pagamentoLocalService.getPagamento(pagamentoId); + Pagamento pagamento = getPagamento(pagamentoId); pagamento.setModifiedDate(new Date()); pagamento.setEmailPending(emailPending); - return pagamentoLocalService.updatePagamento(pagamento); + return updatePagamento(pagamento); } private void deleteDettPraticaPagamento(Pagamento pagamento) throws SystemException { @@ -392,7 +391,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { private DynamicQuery dynamicQueryFindByCommittente_Mezzo_Utilizzata(String codiceFiscaleCommittente, String mezzo, String utilizzata) { - DynamicQuery dynamicQuery = pagamentoLocalService.dynamicQuery(); + DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.ilike("codiceFiscaleCommittente", codiceFiscaleCommittente)); dynamicQuery.add(RestrictionsFactoryUtil.eq("mezzo", mezzo)); if (Validator.isNotNull(utilizzata)) { @@ -441,7 +440,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { private DynamicQuery createPagamentiVisibleByIntPratica(long intPraticaId) { - DynamicQuery dynamicQuery = pagamentoLocalService.dynamicQuery(); + DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); dynamicQuery.add(RestrictionsFactoryUtil.ne("utilizzata", PagamentoConstants.UTILIZZATA_IN_CORSO)); return dynamicQuery; @@ -451,7 +450,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { public void sostituisciPagamento(long pagamentoId, String codiceFiscaleCommittente, String mezzo, String url, ServiceContext serviceContext) throws PortalException, SystemException { - Pagamento pagamento = pagamentoLocalService.getPagamento(pagamentoId); + Pagamento pagamento = getPagamento(pagamentoId); long intPraticaId = pagamento.getIntPraticaId(); String currentUtilizzata = pagamento.getUtilizzata(); String currentMezzo = pagamento.getMezzo(); @@ -485,7 +484,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { } pagamento.setUtilizzata(PagamentoConstants.UTILIZZATA_SOSTITUITA); pagamento.setUtilizzataSostituita(currentUtilizzata); - pagamentoLocalService.updatePagamento(pagamento); + updatePagamento(pagamento); PagamentiUtil.nuovoPagamento(url, pagamento.getClassPk(), pagamento.getClassName(), tipoPagamento, pagamento.getImporto(), codiceFiscaleCommittente, serviceContext); } else { @@ -520,7 +519,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { } pagamento.setUtilizzata(PagamentoConstants.UTILIZZATA_SOSTITUITA); pagamento.setUtilizzataSostituita(currentUtilizzata); - pagamentoLocalService.updatePagamento(pagamento); + updatePagamento(pagamento); PagamentiUtil.nuovoPagamento(url, pagamento.getClassPk(), pagamento.getClassName(), pagamento.getTipoPagamento(), pagamento.getImporto(), codiceFiscaleCommittente, serviceContext); } else { @@ -535,7 +534,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { public void updatePagamentoManuale(long pagamentoId, byte[] content, String sourceFileName, ServiceContext serviceContext) throws IOException, PortalException, SystemException { - Pagamento pagamento = pagamentoLocalService.getPagamento(pagamentoId); + Pagamento pagamento = getPagamento(pagamentoId); if (pagamento.getMezzo().equalsIgnoreCase(PagamentoConstants.MEZZO_MANUALE) && pagamento.getUtilizzata().equalsIgnoreCase(PagamentoConstants.UTILIZZATA_IN_CORSO)) { long fileEntryId = 0L; @@ -564,7 +563,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { description, changeLog, content, serviceContext); fileEntryId = fileEntry.getFileEntryId(); pagamento.setFileEntryId(fileEntryId); - pagamento = pagamentoLocalService.updatePagamento(pagamento); + pagamento = updatePagamento(pagamento); if (DettPratica.class.getName().equals(pagamento.getClassName())) { dettPraticaLocalService.updateEsitoPagamento(pagamentoId, pagamento.getClassPk(), fileEntryId, PagamentoConstants.UTILIZZATA_PAGATA); @@ -587,7 +586,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { public void updatePagamentoManualeFromImport(long pagamentoId, byte[] content, String sourceFileName, ServiceContext serviceContext) throws PortalException, SystemException { - Pagamento pagamento = pagamentoLocalService.getPagamento(pagamentoId); + Pagamento pagamento = getPagamento(pagamentoId); if (pagamento.getMezzo().equalsIgnoreCase(PagamentoConstants.MEZZO_MANUALE)) { long fileEntryId = 0L; long defaultFolderId = configurazioneLocalService.findByC_ChiaveLong(serviceContext.getCompanyId(), @@ -615,7 +614,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { description, changeLog, content, serviceContext); fileEntryId = fileEntry.getFileEntryId(); pagamento.setFileEntryId(fileEntryId); - pagamento = pagamentoLocalService.updatePagamento(pagamento); + pagamento = updatePagamento(pagamento); } else { throw new SystemException("pagamento manuale non aggiornabile"); } @@ -630,13 +629,13 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { @Override public Pagamento updateOtf(long pagamentoId, boolean otf) throws PortalException, SystemException { - Pagamento pagamento = pagamentoLocalService.getPagamento(pagamentoId); + Pagamento pagamento = getPagamento(pagamentoId); pagamento.setOtf(otf); if (otf) { pagamento.setOtfCreateDate(new Date()); } else { pagamento.setOtfCreateDate(null); } - return pagamentoLocalService.updatePagamento(pagamento); + return updatePagamento(pagamento); } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoServiceImpl.java index 79af8076..157b6ec1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoServiceImpl.java @@ -12,18 +12,17 @@ package it.tref.liferay.portos.bo.service.impl; -import java.io.IOException; - import it.tref.liferay.portos.bo.model.Collaudo; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.FineLavori; import it.tref.liferay.portos.bo.model.Pagamento; -import it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.PagamentoServiceBaseImpl; import it.tref.liferay.portos.bo.service.permission.PendingPagamentiPermission; import it.tref.liferay.portos.bo.shared.util.ActionKeys; import it.tref.liferay.portos.bo.util.DelegheUtil; +import java.io.IOException; + import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.service.ServiceContext; @@ -32,14 +31,12 @@ import com.liferay.portal.service.ServiceContext; * The implementation of the pagamento remote service. * *

- * All custom service methods should be put in this class. Whenever methods are - * added, rerun ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.PagamentoService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.PagamentoService} interface. * *

- * This is a remote service. Methods of this service are expected to have - * security checks based on the propagated JAAS credentials because this service - * can be accessed remotely. + * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS + * credentials because this service can be accessed remotely. *

* * @author Davide Barbagallo, 3F Consulting @@ -48,17 +45,16 @@ import com.liferay.portal.service.ServiceContext; */ public class PagamentoServiceImpl extends PagamentoServiceBaseImpl { /* - * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use - * {@link it.tref.liferay.portos.bo.service.PagamentoServiceUtil} to access - * the pagamento remote service. + * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.bo.service.PagamentoServiceUtil} to access the pagamento remote service. */ - public void sostituisciPagamento(long pagamentoId, String codiceFiscaleCommittente, String mezzo, - String url, ServiceContext serviceContext) throws PortalException, SystemException { + @Override + public void sostituisciPagamento(long pagamentoId, String codiceFiscaleCommittente, String mezzo, String url, + ServiceContext serviceContext) throws PortalException, SystemException { - Pagamento pagamento = PagamentoLocalServiceUtil.getPagamento(pagamentoId); + Pagamento pagamento = pagamentoLocalService.getPagamento(pagamentoId); long userId = findTitolare(pagamentoId); - if (getUserId() == userId || DelegheUtil.hasDelegaPagamento(userId, pagamento.getClassPk())) { pagamentoLocalService.sostituisciPagamento(pagamentoId, codiceFiscaleCommittente, mezzo, url, serviceContext); @@ -68,20 +64,12 @@ public class PagamentoServiceImpl extends PagamentoServiceBaseImpl { } } - public void rigeneraPagamento(long pagamentoId, String codiceFiscaleCommittente, String mezzo, - String url, ServiceContext serviceContext) throws PortalException, SystemException { + @Override + public void rigeneraPagamento(long pagamentoId, String codiceFiscaleCommittente, String mezzo, String url, + ServiceContext serviceContext) throws PortalException, SystemException { if (PendingPagamentiPermission.contains(getPermissionChecker(), serviceContext.getScopeGroupId(), ActionKeys.PAGAMENTI_PENDING)) { - // long userId = serviceContext.getUserId(); - // List roles = RoleLocalServiceUtil.getUserRoles(userId); - // boolean isAllowed = false; - // for (Role role : roles) { - // if (role.getTitle().equals("portos_admin")) { - // isAllowed = true; - // } - // } - // if (isAllowed) { pagamentoLocalService.sostituisciPagamento(pagamentoId, codiceFiscaleCommittente, mezzo, url, serviceContext); } else { @@ -89,6 +77,7 @@ public class PagamentoServiceImpl extends PagamentoServiceBaseImpl { } } + @Override public void annullaPagamento(long pagamentoId, ServiceContext serviceContext) throws PortalException, SystemException { @@ -100,15 +89,15 @@ public class PagamentoServiceImpl extends PagamentoServiceBaseImpl { } } + @Override public void updatePagamentoManuale(long pagamentoId, byte[] content, String sourceFileName, ServiceContext serviceContext) throws IOException, PortalException, SystemException { - Pagamento pagamento = PagamentoLocalServiceUtil.getPagamento(pagamentoId); + Pagamento pagamento = pagamentoLocalService.getPagamento(pagamentoId); long userId = findTitolare(pagamentoId); if (getUserId() == userId || DelegheUtil.hasDelegaPagamento(userId, pagamento.getClassPk())) { - pagamentoLocalService - .updatePagamentoManuale(pagamentoId, content, sourceFileName, serviceContext); + pagamentoLocalService.updatePagamentoManuale(pagamentoId, content, sourceFileName, serviceContext); } else { throw new SystemException("pagamento manuale aggiornabile solo da titolare digitale del " + pagamento.getClassName()); @@ -118,7 +107,7 @@ public class PagamentoServiceImpl extends PagamentoServiceBaseImpl { private long findTitolare(long pagamentoId) throws PortalException, SystemException { - Pagamento pagamento = PagamentoLocalServiceUtil.getPagamento(pagamentoId); + Pagamento pagamento = pagamentoLocalService.getPagamento(pagamentoId); long userId = 0l; if (DettPratica.class.getName().equals(pagamento.getClassName())) { DettPratica dettPratica = dettPraticaLocalService.getDettPratica(pagamento.getClassPk()); @@ -130,8 +119,8 @@ public class PagamentoServiceImpl extends PagamentoServiceBaseImpl { Collaudo collaudo = collaudoLocalService.getCollaudo(pagamento.getClassPk()); userId = collaudo.getUserId(); } else { - throw new RuntimeException("unable to replace pagamento for entity type " - + pagamento.getClassName() + " with id " + pagamento.getClassPk()); + throw new RuntimeException("unable to replace pagamento for entity type " + pagamento.getClassName() + + " with id " + pagamento.getClassPk()); } return userId; } 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 8be80f14..06887667 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 @@ -33,7 +33,6 @@ import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.model.User; import com.liferay.portal.security.permission.ActionKeys; import com.liferay.portal.service.ServiceContext; -import com.liferay.portal.service.UserLocalServiceUtil; import com.liferay.portlet.documentlibrary.NoSuchFileEntryException; import com.liferay.portlet.documentlibrary.NoSuchFolderException; @@ -41,15 +40,12 @@ import com.liferay.portlet.documentlibrary.NoSuchFolderException; * The implementation of the parere geologo local service. * *

- * All custom service methods should be put in this class. Whenever methods are - * added, rerun ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.ParereGeologoLocalService} - * interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.ParereGeologoLocalService} interface. * *

- * This is a local service. Methods of this service will not have security - * checks based on the propagated JAAS credentials because this service can only - * be accessed from within the same VM. + * This is a local service. Methods of this service will not have security checks based on the propagated JAAS + * credentials because this service can only be accessed from within the same VM. *

* * @author Davide Barbagallo, 3F Consulting @@ -58,104 +54,83 @@ import com.liferay.portlet.documentlibrary.NoSuchFolderException; */ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBaseImpl { /* - * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use - * {@link it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil} - * to access the parere geologo local service. + * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil} to access the parere geologo local service. */ + @Override public ParereGeologo addParereGeologo(long geologoUserId, long intPraticaId, long dettPraticaId, ServiceContext serviceContext) throws SystemException, PortalException { validateParereGeologo(geologoUserId, intPraticaId, dettPraticaId); - long parereGeologoId = counterLocalService.increment(ParereGeologo.class.getName()); ParereGeologo parereGeologo = parereGeologoPersistence.create(parereGeologoId); - parereGeologo.setCompanyId(serviceContext.getCompanyId()); - - User user = UserLocalServiceUtil.getUser(serviceContext.getUserId()); + User user = userLocalService.getUser(serviceContext.getUserId()); parereGeologo.setUserId(user.getUserId()); parereGeologo.setUserName(user.getScreenName()); parereGeologo.setCreateDate(serviceContext.getCreateDate()); parereGeologo.setModifiedDate(serviceContext.getModifiedDate()); parereGeologo.setGroupId(serviceContext.getScopeGroupId()); - parereGeologo.setIntPraticaId(intPraticaId); parereGeologo.setDettPraticaId(dettPraticaId); parereGeologo.setGeologoUserId(geologoUserId); parereGeologo.setDtRichista(new Date()); - return parereGeologoPersistence.update(parereGeologo); } private void validateParereGeologo(long geologoUserId, long intPraticaId, long dettPraticaId) { - // TODO - } - public ParereGeologo updateParereGeologo(long parereGeologoId, String parere, byte[] content, - String fileName, ServiceContext serviceContext) throws PortalException, SystemException { + @Override + public ParereGeologo updateParereGeologo(long parereGeologoId, String parere, byte[] content, String fileName, + ServiceContext serviceContext) throws PortalException, SystemException { ParereGeologo parereGeologo = getParereGeologo(parereGeologoId); - User geologo = UserLocalServiceUtil.getUser(serviceContext.getUserId()); + User geologo = userLocalService.getUser(serviceContext.getUserId()); if (Validator.isNotNull(geologo) && serviceContext.getUserId() == geologo.getUserId()) { - Date now = new Date(); - parereGeologo.setModifiedDate(serviceContext.getModifiedDate()); parereGeologo.setDtCompilazione(now); parereGeologo.setParere(parere); - if (Validator.isNotNull(content) && Validator.isNotNull(fileName)) { - - long fileEntryId = 0l; - - long defaultFolderId = configurazioneLocalService.findByC_ChiaveLong( - serviceContext.getCompanyId(), ConfigurazioneConstants.ATTACHMENT_FOLDER_ID); - + long fileEntryId = 0L; + long defaultFolderId = configurazioneLocalService.findByC_ChiaveLong(serviceContext.getCompanyId(), + ConfigurazioneConstants.ATTACHMENT_FOLDER_ID); Folder defaultFolder = dlAppLocalService.getFolder(defaultFolderId); String folderName = PraticaUtil.getFolderName(parereGeologo.getDettPraticaId()); - serviceContext.setGroupPermissions(new String[] { ActionKeys.VIEW }); Folder folder = null; try { - folder = dlAppLocalService.getFolder(defaultFolder.getRepositoryId(), - defaultFolder.getFolderId(), folderName); + folder = dlAppLocalService.getFolder(defaultFolder.getRepositoryId(), defaultFolder.getFolderId(), + folderName); } catch (NoSuchFolderException e) { // cartella non presente -> creo cartella - folder = dlAppLocalService.addFolder(serviceContext.getUserId(), - defaultFolder.getRepositoryId(), defaultFolder.getFolderId(), folderName, - StringPool.BLANK, serviceContext); + folder = dlAppLocalService.addFolder(serviceContext.getUserId(), defaultFolder.getRepositoryId(), + defaultFolder.getFolderId(), folderName, StringPool.BLANK, serviceContext); } - String title = now.getTime() + StringPool.UNDERLINE + "parere_geologo" + StringPool.UNDERLINE + parereGeologoId + StringPool.UNDERLINE + fileName; String description = ""; String mimeType = MimeTypesUtil.getContentType(fileName); - String changeLog = StringPool.BLANK; FileEntry fileEntry = dlAppLocalService.addFileEntry(serviceContext.getUserId(), - folder.getRepositoryId(), folder.getFolderId(), now.getTime() + "_" + fileName, - mimeType, title, description, changeLog, content, serviceContext); + folder.getRepositoryId(), folder.getFolderId(), now.getTime() + "_" + fileName, mimeType, + title, description, changeLog, content, serviceContext); fileEntryId = fileEntry.getFileEntryId(); - parereGeologo.setFileEntryId(fileEntryId); } - return updateParereGeologo(parereGeologo); - } else { - // TODO error chi sta compilando non è il geologo designato o il - // geologo non esiste. + // TODO error chi sta compilando non è il geologo designato o il geologo non esiste. return parereGeologo; } - } @Override public ParereGeologo deleteParereGeologo(long parereGeologoId) throws PortalException, SystemException { - return deleteParereGeologo(parereGeologoLocalService.getParereGeologo(parereGeologoId)); + return deleteParereGeologo(getParereGeologo(parereGeologoId)); } @Override @@ -170,106 +145,103 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase } catch (PortalException e) { throw new SystemException(e); } - return super.deleteParereGeologo(parereGeologo); } + @Override public ParereGeologo updateParereGeologo(ParereGeologo parereGeologo) throws SystemException { - return parereGeologoPersistence.update(parereGeologo); } + @Override public ParereGeologo remove(ParereGeologo parereGeologoId) throws SystemException { - return parereGeologoPersistence.remove(parereGeologoId); } - public List findByIntPraticaId(long intPraticaId, int start, int end) - throws SystemException { - + @Override + public List findByIntPraticaId(long intPraticaId, int start, int end) throws SystemException { return parereGeologoPersistence.findByIntPraticaId(intPraticaId, start, end); } + @Override public int countByIntPraticaId(long intPraticaId) throws SystemException { - return parereGeologoPersistence.countByIntPraticaId(intPraticaId); } + @Override public List findByIntPraticaIdParereVuoto(long intPraticaId, int start, int end) throws SystemException { return parereGeologoPersistence.findByIntPraticaId_Parere(intPraticaId, StringPool.BLANK, start, end); } + @Override public int countByIntPraticaIdParereVuoto(long intPraticaId) throws SystemException { - return parereGeologoPersistence.countByIntPraticaId_Parere(intPraticaId, StringPool.BLANK); } - public List findByIntPraticaId_GeologoId(long intPraticaId, long geologoUserId, int start, - int end) throws SystemException { + @Override + public List findByIntPraticaId_GeologoId(long intPraticaId, long geologoUserId, int start, int end) + throws SystemException { return parereGeologoPersistence.findByIntPraticaId_GeologoId(intPraticaId, geologoUserId, start, end); } + @Override public int countByIntPraticaId_GeologoId(long intPraticaId, long geologoUserId) throws SystemException { - return parereGeologoPersistence.countByIntPraticaId_GeologoId(intPraticaId, geologoUserId); } + @Override public List findByGeologoId(long geologoUserId, int start, int end) throws SystemException { - return parereGeologoPersistence.findByGeologoId(geologoUserId, start, end); } + @Override public List findByCompanyIdGroupId(long companyId, long groupId) throws SystemException { return parereGeologoPersistence.findByC_GroupId(companyId, groupId); } + @Override public int countByGeologoId(long geologoUserId) throws SystemException { - return parereGeologoPersistence.countByGeologoId(geologoUserId); } - public List findNotParereByGeologoId(long geologoUserId, int start, int end) - throws SystemException { + @SuppressWarnings("unchecked") + @Override + public List findNotParereByGeologoId(long geologoUserId, int start, int end) throws SystemException { - DynamicQuery dynamicQuery = parereGeologoLocalService.dynamicQuery(); + DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("geologoUserId", geologoUserId)); dynamicQuery.add(RestrictionsFactoryUtil.eq("parere", "")); - - return parereGeologoLocalService.dynamicQuery(dynamicQuery, start, end); - + return dynamicQuery(dynamicQuery, start, end); } - public List findWithParereByGeologoId(long geologoUserId, int start, int end) - throws SystemException { + @SuppressWarnings("unchecked") + @Override + public List findWithParereByGeologoId(long geologoUserId, int start, int end) throws SystemException { - DynamicQuery dynamicQuery = parereGeologoLocalService.dynamicQuery(); + DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("geologoUserId", geologoUserId)); dynamicQuery.add(RestrictionsFactoryUtil.ne("parere", "")); - - return parereGeologoLocalService.dynamicQuery(dynamicQuery, start, end); - + return dynamicQuery(dynamicQuery, start, end); } + @Override public int countFindNotParereByGeologoId(long geologoUserId) throws SystemException { - DynamicQuery dynamicQuery = parereGeologoLocalService.dynamicQuery(); + DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("geologoUserId", geologoUserId)); dynamicQuery.add(RestrictionsFactoryUtil.eq("parere", "")); - return (int) parereGeologoPersistence.countWithDynamicQuery(dynamicQuery); - } + @Override public int countFindWithParereByGeologoId(long geologoUserId) throws SystemException { - DynamicQuery dynamicQuery = parereGeologoLocalService.dynamicQuery(); + DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("geologoUserId", geologoUserId)); dynamicQuery.add(RestrictionsFactoryUtil.ne("parere", "")); - return (int) parereGeologoPersistence.countWithDynamicQuery(dynamicQuery); - } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoServiceImpl.java index ec07d4c2..d8e62a67 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoServiceImpl.java @@ -15,8 +15,6 @@ package it.tref.liferay.portos.bo.service.impl; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.ParereGeologo; import it.tref.liferay.portos.bo.model.Territorio; -import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.ParereGeologoServiceBaseImpl; import it.tref.liferay.portos.bo.service.permission.IntPraticaPermission; import it.tref.liferay.portos.bo.shared.util.ActionKeys; @@ -52,40 +50,46 @@ public class ParereGeologoServiceImpl extends ParereGeologoServiceBaseImpl { */ - public ParereGeologo addParereGeologo(long geologoUserId, long intPraticaId, long dettPraticaId, + @Override +public ParereGeologo addParereGeologo(long geologoUserId, long intPraticaId, long dettPraticaId, ServiceContext serviceContext) throws SystemException, PortalException { - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); + IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaId); + Territorio territorio = territorioLocalService.getTerritorio(intPratica.getTerritorioId()); IntPraticaPermission.check(getPermissionChecker(), territorio.getGroupId(), ActionKeys.RICHIEDI_PARERE_GEOLOGO); return parereGeologoLocalService.addParereGeologo(geologoUserId, intPraticaId, dettPraticaId, serviceContext); } - public ParereGeologo updateParereGeologo(long parereGeologoId, String parere, byte[] content, String fileName, + @Override +public ParereGeologo updateParereGeologo(long parereGeologoId, String parere, byte[] content, String fileName, ServiceContext serviceContext) throws PortalException, SystemException { return parereGeologoLocalService.updateParereGeologo(parereGeologoId, parere, content, fileName, serviceContext); } - public ParereGeologo deleteParereGeologo(long parereGeologoId) throws SystemException, PortalException { + @Override +public ParereGeologo deleteParereGeologo(long parereGeologoId) throws SystemException, PortalException { return parereGeologoLocalService.deleteParereGeologo(parereGeologoId); } - public ParereGeologo updateParereGeologo(ParereGeologo parereGeologo) throws SystemException { + @Override +public ParereGeologo updateParereGeologo(ParereGeologo parereGeologo) throws SystemException { return parereGeologoLocalService.deleteParereGeologo(parereGeologo); } - public List findByIntPraticaId(long intPraticaId, int start, int end) throws SystemException { + @Override +public List findByIntPraticaId(long intPraticaId, int start, int end) throws SystemException { // TODO permessi return parereGeologoLocalService.findByIntPraticaId(intPraticaId, start, end); } - public List findByIntPraticaId_GeologoId(long intPraticaId, long geologoUserId, int start, int end) + @Override +public List findByIntPraticaId_GeologoId(long intPraticaId, long geologoUserId, int start, int end) throws SystemException { // TODO permessi @@ -93,21 +97,24 @@ public class ParereGeologoServiceImpl extends ParereGeologoServiceBaseImpl { return parereGeologoLocalService.findByIntPraticaId_GeologoId(intPraticaId, geologoUserId, start, end); } - public int countByIntPraticaId_GeologoId(long intPraticaId, long geologoUserId) throws SystemException { + @Override +public int countByIntPraticaId_GeologoId(long intPraticaId, long geologoUserId) throws SystemException { // TODO permessi return parereGeologoLocalService.countByIntPraticaId_GeologoId(intPraticaId, geologoUserId); } - public List findByGeologoId(long geologoUserId, int start, int end) throws SystemException { + @Override +public List findByGeologoId(long geologoUserId, int start, int end) throws SystemException { // TODO permessi return parereGeologoLocalService.findByGeologoId(geologoUserId, start, end); } - public int countByGeologoId(long geologoUserId) throws SystemException { + @Override +public int countByGeologoId(long geologoUserId) throws SystemException { // TODO permessi diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java index 6a2fb4a7..88f27142 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoLocalServiceImpl.java @@ -364,11 +364,11 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { docPraticaLocalService.deleteDocPratica(soggetto.getFileVariazioneId()); } } catch (PortalException e) { - + } - + Soggetto ret = super.deleteSoggetto(soggetto); - + long intPraticaId = soggetto.getIntPraticaId(); long idSoggetto = soggetto.getSoggettoId(); List soggettiIntPratica = soggettoLocalService.findByIntPratica(intPraticaId); @@ -382,7 +382,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { } return ret; - + } @Override @@ -662,6 +662,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { tipologiaSoggetto, dettPraticaIdRimozione); } + @SuppressWarnings("unchecked") @Override public List getValidByIntPratica(long intPraticaId) throws SystemException { @@ -670,6 +671,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { return soggettoPersistence.findWithDynamicQuery(dynamicQuery); } + @SuppressWarnings("unchecked") @Override public List getValidByDettPratica(long dettPraticaId) throws SystemException { @@ -696,6 +698,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { return dynamicQuery; } + @SuppressWarnings("unchecked") @Override public List getValidTmpByIntPratica(long intPraticaId) throws SystemException { DynamicQuery dynamicQuery = createValidTmpQueryByIntPratica(intPraticaId); @@ -720,6 +723,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { return dynamicQuery; } + @SuppressWarnings("unchecked") @Override public List getTmpNotCompletedByDettPratica(long dettPraticaId) throws SystemException { @@ -746,6 +750,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { return dynamicQuery; } + @SuppressWarnings("unchecked") @Override public List getSoggettiPrincipaliValidTmpByDettPratica(long dettPraticaId) throws SystemException, PortalException { @@ -755,6 +760,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { return soggettoPersistence.findWithDynamicQuery(dynamicQuery); } + @SuppressWarnings("unchecked") @Override public List getSoggettiPrincipaliValidTmpByDettPratica_TipologiaSoggetto(long dettPraticaId, String[] tipologieSoggetto) throws SystemException, PortalException { @@ -774,6 +780,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { return (int) soggettoPersistence.countWithDynamicQuery(dynamicQuery); } + @SuppressWarnings("unchecked") @Override public List getCfSoggettiPrincipaliValidTmpByDettPratica_TipologiaSoggetto(long dettPraticaId, String[] tipologieSoggetto) throws SystemException, PortalException { @@ -802,6 +809,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { return dynamicQuery; } + @SuppressWarnings("unchecked") @Override public List getValidTmpByDettPratica(long dettPraticaId) throws SystemException { @@ -810,6 +818,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { return soggettoPersistence.findWithDynamicQuery(dynamicQuery); } + @SuppressWarnings("unchecked") @Override public List getCfValidTmpByDettPratica(long dettPraticaId) throws SystemException { @@ -818,6 +827,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { return soggettoPersistence.findWithDynamicQuery(dynamicQuery); } + @SuppressWarnings("unchecked") @Override public List getCfValidTmpByIntPratica_TipologiaSoggetto(long intPraticaId, String tipologiaSoggetto) throws SystemException { @@ -831,6 +841,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { return soggettoPersistence.findWithDynamicQuery(dynamicQuery); } + @SuppressWarnings("unchecked") @Override public List getCfValidTmpByDettPratica_TipologiaSoggetto(long dettPraticaId, String tipologiaSoggetto) throws SystemException { @@ -858,6 +869,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { return dynamicQuery; } + @SuppressWarnings("unchecked") @Override public List getValidTmpByIntPratica_CodiceFiscale(long intPraticaId, String codiceFiscale, long docDettPraticaId) throws SystemException { @@ -884,6 +896,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { DynamicQuery dynamicQuery = createValidTmpQueryByIntPratica_CodiceFiscale(intPraticaId, codiceFiscale, 0l); dynamicQuery.add(RestrictionsFactoryUtil.eq("tipologiaSoggetto", tipologiaSoggetto)); dynamicQuery.addOrder(OrderFactoryUtil.asc("soggettoId")); + @SuppressWarnings("unchecked") List soggetti = soggettoPersistence.findWithDynamicQuery(dynamicQuery); if (soggetti.isEmpty()) { return null; @@ -900,6 +913,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { docDettPraticaId); dynamicQuery.add(RestrictionsFactoryUtil.eq("tipologiaSoggetto", tipologiaSoggetto)); dynamicQuery.addOrder(OrderFactoryUtil.asc("soggettoId")); + @SuppressWarnings("unchecked") List soggetti = soggettoPersistence.findWithDynamicQuery(dynamicQuery); if (soggetti.isEmpty()) { return null; @@ -933,6 +947,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { DynamicQuery dynamicQuery = createValidQueryByIntPratica_CodiceFiscale(intPraticaId, codiceFiscale); dynamicQuery.add(RestrictionsFactoryUtil.eq("tipologiaSoggetto", tipologiaSoggetto)); dynamicQuery.addOrder(OrderFactoryUtil.asc("soggettoId")); + @SuppressWarnings("unchecked") List soggetti = soggettoPersistence.findWithDynamicQuery(dynamicQuery); if (soggetti.isEmpty()) { return null; @@ -941,6 +956,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { } } + @SuppressWarnings("unchecked") @Override public List getValidByIntPratica_CodiceFiscale(long intPraticaId, String codiceFiscale) throws SystemException { @@ -950,6 +966,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { return soggettoPersistence.findWithDynamicQuery(dynamicQuery); } + @SuppressWarnings("unchecked") @Override public List getValidByIntPratica_NoCodiceFiscale(long intPraticaId, String codiceFiscale) throws SystemException { @@ -990,6 +1007,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { dynamicQuery.add(RestrictionsFactoryUtil.isNull("dtDataRimozione")); dynamicQuery.add(RestrictionsFactoryUtil.eq("tmp", false)); dynamicQuery.addOrder(OrderFactoryUtil.asc("soggettoId")); + @SuppressWarnings("unchecked") List soggetti = soggettoPersistence.findWithDynamicQuery(dynamicQuery); return soggetti; } @@ -1004,6 +1022,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { dynamicQuery.add(RestrictionsFactoryUtil.eq("dettPraticaIdRimozione", 0l)); dynamicQuery.add(RestrictionsFactoryUtil.eq("tmp", false)); dynamicQuery.addOrder(OrderFactoryUtil.asc("soggettoId")); + @SuppressWarnings("unchecked") List soggetti = soggettoPersistence.findWithDynamicQuery(dynamicQuery); return soggetti; } @@ -1018,10 +1037,12 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { dynamicQuery.add(RestrictionsFactoryUtil.eq("dettPraticaIdRimozione", 0l)); dynamicQuery.add(RestrictionsFactoryUtil.eq("tmp", false)); dynamicQuery.addOrder(OrderFactoryUtil.asc("soggettoId")); + @SuppressWarnings("unchecked") List soggetti = soggettoPersistence.findWithDynamicQuery(dynamicQuery); return soggetti; } + @SuppressWarnings("unchecked") @Override public List getCfValidByIntPratica(long intPraticaId) throws SystemException { @@ -1040,6 +1061,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { return dynamicQuery; } + @SuppressWarnings("unchecked") @Override public List getValidByIntPratica_CodiciFiscali(long intPraticaId, List codiciFiscali) throws SystemException { @@ -1049,6 +1071,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { return soggettoPersistence.findWithDynamicQuery(dynamicQuery); } + @SuppressWarnings("unchecked") @Override public List getInvalidByIntPratica(long intPraticaId) throws SystemException { @@ -1059,6 +1082,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { return soggettoPersistence.findWithDynamicQuery(dynamicQuery); } + @SuppressWarnings("unchecked") @Override public List getInvalidTmpByIntPratica(long intPraticaId) throws SystemException { @@ -1234,6 +1258,7 @@ public class SoggettoLocalServiceImpl extends SoggettoLocalServiceBaseImpl { dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); dynamicQuery.setProjection(ProjectionFactoryUtil.distinct(ProjectionFactoryUtil .property("soggettoSostituitoId"))); + @SuppressWarnings("unchecked") List ids = soggettoPersistence.findWithDynamicQuery(dynamicQuery); return ids; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TempisticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TempisticaLocalServiceImpl.java index 2f7c3afb..bff3ba8d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TempisticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TempisticaLocalServiceImpl.java @@ -16,8 +16,6 @@ import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.Tempistica; import it.tref.liferay.portos.bo.model.impl.TempisticaImpl; -import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil; -import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.TempisticaLocalServiceBaseImpl; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; @@ -71,8 +69,7 @@ public class TempisticaLocalServiceImpl extends TempisticaLocalServiceBaseImpl { User user = userLocalService.fetchUser(serviceContext.getUserId()); Date now = new Date(); - Tempistica tempistica = tempisticaLocalService.createTempistica(counterLocalService.increment(Tempistica.class - .getName())); + Tempistica tempistica = createTempistica(counterLocalService.increment(Tempistica.class.getName())); tempistica.setCompanyId(serviceContext.getCompanyId()); tempistica.setGroupId(serviceContext.getScopeGroupId()); tempistica.setUserId(serviceContext.getUserId()); @@ -83,34 +80,34 @@ public class TempisticaLocalServiceImpl extends TempisticaLocalServiceBaseImpl { tempistica.setDettPraticaId(dettPraticaId); tempistica.setTipo(tipo); tempistica.setStart(DateUtils.truncate(start, Calendar.DATE).getTime()); - return tempisticaLocalService.addTempistica(tempistica); + return addTempistica(tempistica); } @Override public Tempistica stopTempistica(long tempisticaId, Date stop) throws SystemException { - Tempistica tempistica = tempisticaLocalService.fetchTempistica(tempisticaId); + Tempistica tempistica = fetchTempistica(tempisticaId); tempistica.setStop(DateUtils.truncate(stop, Calendar.DATE).getTime()); - return tempisticaLocalService.updateTempistica(tempistica); + return updateTempistica(tempistica); } @Override public Tempistica ravvioTempistica(long tempisticaId, Date date) throws SystemException { - Tempistica tempistica = tempisticaLocalService.fetchTempistica(tempisticaId); + Tempistica tempistica = fetchTempistica(tempisticaId); tempistica.setWait(tempistica.getWait() + (DateUtils.truncate(date, Calendar.DATE).getTime()) - tempistica.getStop()); tempistica.setStop(0L); - return tempisticaLocalService.updateTempistica(tempistica); + return updateTempistica(tempistica); } @Override public Tempistica concludiTempistica(long tempisticaId, Date stop) throws SystemException { - Tempistica tempistica = tempisticaLocalService.fetchTempistica(tempisticaId); + Tempistica tempistica = fetchTempistica(tempisticaId); tempistica.setStop(DateUtils.truncate(stop, Calendar.DATE).getTime()); tempistica.setCompleto(true); - return tempisticaLocalService.updateTempistica(tempistica); + return updateTempistica(tempistica); } @Override @@ -252,7 +249,7 @@ public class TempisticaLocalServiceImpl extends TempisticaLocalServiceBaseImpl { public String getDtSottopostaAParere(long intPraticaId) throws SystemException { // //////////////////ADT: BUG SCADENZARIO - DettPratica dettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPraticaId); + DettPratica dettPratica = dettPraticaLocalService.getLastCompletedByIntPratica(intPraticaId); if (dettPratica != null && dettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.VARIANTE)) { Date d = dettPratica.getDtProtocollo(); if (d != null) { @@ -267,7 +264,7 @@ public class TempisticaLocalServiceImpl extends TempisticaLocalServiceBaseImpl { Order defaultOrder = OrderFactoryUtil.desc("createDate"); queryAvv.addOrder(defaultOrder); @SuppressWarnings("unchecked") - List listaAvv = AvvisoLocalServiceUtil.dynamicQuery(queryAvv); + List listaAvv = avvisoLocalService.dynamicQuery(queryAvv); return listaAvv.isEmpty() ? StringPool.BLANK : sdf.format(listaAvv.get(0).getDtInvio()); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TerritorioServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TerritorioServiceImpl.java index 141c78e5..34ca0a1e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TerritorioServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TerritorioServiceImpl.java @@ -13,7 +13,6 @@ package it.tref.liferay.portos.bo.service.impl; import it.tref.liferay.portos.bo.model.Territorio; -import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.TerritorioServiceBaseImpl; import java.util.Date; @@ -50,7 +49,7 @@ public class TerritorioServiceImpl extends TerritorioServiceBaseImpl { boolean articolo61, Date dtIni, Date dtFin, String agMax, String agMin, long oldId, ServiceContext serviceContext) throws PortalException, SystemException { - return TerritorioLocalServiceUtil.addTerritorio(comuneId, groupId, codiceProvincia, zona, fascia, articolo61, + return territorioLocalService.addTerritorio(comuneId, groupId, codiceProvincia, zona, fascia, articolo61, dtIni, dtFin, agMax, agMin, oldId, serviceContext); } @@ -59,31 +58,31 @@ public class TerritorioServiceImpl extends TerritorioServiceBaseImpl { String zona, String fascia, boolean articolo61, Date dtIni, Date dtFin, String agMax, String agMin, ServiceContext serviceContext) throws PortalException, SystemException { - return TerritorioLocalServiceUtil.updateTerritorio(territorioId, groupId, comuneId, codiceProvincia, zona, - fascia, articolo61, dtIni, dtFin, agMax, agMin, serviceContext); + return territorioLocalService.updateTerritorio(territorioId, groupId, comuneId, codiceProvincia, zona, fascia, + articolo61, dtIni, dtFin, agMax, agMin, serviceContext); } @Override public Territorio fetchTerritorio(long territorioId) throws SystemException { - return TerritorioLocalServiceUtil.fetchTerritorio(territorioId); + return territorioLocalService.fetchTerritorio(territorioId); } @Override public Territorio createTerritorio(long territorioId) { - return TerritorioLocalServiceUtil.createTerritorio(territorioId); + return territorioLocalService.createTerritorio(territorioId); } @Override public List getTerritori(long companyId, long groupId, int start, int end) throws SystemException { - return TerritorioLocalServiceUtil.getTerritori(companyId, groupId, start, end); + return territorioLocalService.getTerritori(companyId, groupId, start, end); } @Override public int countTerritori(long companyId, long groupId) throws SystemException { - return TerritorioLocalServiceUtil.countTerritori(companyId, groupId); + return territorioLocalService.countTerritori(companyId, groupId); } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java index b040f227..5c96356f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AllegatoManualePersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchAllegatoManualeException; import it.tref.liferay.portos.bo.model.AllegatoManuale; import it.tref.liferay.portos.bo.model.impl.AllegatoManualeImpl; import it.tref.liferay.portos.bo.model.impl.AllegatoManualeModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AllegatoManualePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java index 63caa01d..15633d6f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AsseverazionePersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchAsseverazioneException; import it.tref.liferay.portos.bo.model.Asseverazione; import it.tref.liferay.portos.bo.model.impl.AsseverazioneImpl; import it.tref.liferay.portos.bo.model.impl.AsseverazioneModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AsseverazionePersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java index b95c271d..38e33edc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/AvvisoPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchAvvisoException; import it.tref.liferay.portos.bo.model.Avviso; import it.tref.liferay.portos.bo.model.impl.AvvisoImpl; import it.tref.liferay.portos.bo.model.impl.AvvisoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.AvvisoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java index 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 bf34f897..f35bff1b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchDettPraticaException; import it.tref.liferay.portos.bo.model.DettPratica; import it.tref.liferay.portos.bo.model.impl.DettPraticaImpl; import it.tref.liferay.portos.bo.model.impl.DettPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DettPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java index 649a5476..c25ae1dc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocAggiuntivaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchDocAggiuntivaException; import it.tref.liferay.portos.bo.model.DocAggiuntiva; import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaImpl; import it.tref.liferay.portos.bo.model.impl.DocAggiuntivaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DocAggiuntivaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java index 42630357..255330f7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchDocPraticaException; import it.tref.liferay.portos.bo.model.DocPratica; import it.tref.liferay.portos.bo.model.impl.DocPraticaImpl; import it.tref.liferay.portos.bo.model.impl.DocPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.DocPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java index 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 0105606e..80bc6adf 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java @@ -48,6 +48,7 @@ import it.tref.liferay.portos.bo.NoSuchIntPraticaException; import it.tref.liferay.portos.bo.model.IntPratica; import it.tref.liferay.portos.bo.model.impl.IntPraticaImpl; import it.tref.liferay.portos.bo.model.impl.IntPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.IntPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java index 8dbf29df..ee3b3b9b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java @@ -46,6 +46,7 @@ import it.tref.liferay.portos.bo.NoSuchPagamentoException; import it.tref.liferay.portos.bo.model.Pagamento; import it.tref.liferay.portos.bo.model.impl.PagamentoImpl; import it.tref.liferay.portos.bo.model.impl.PagamentoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.PagamentoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java index c6ce3907..e4133c60 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ParereGeologoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchParereGeologoException; import it.tref.liferay.portos.bo.model.ParereGeologo; import it.tref.liferay.portos.bo.model.impl.ParereGeologoImpl; import it.tref.liferay.portos.bo.model.impl.ParereGeologoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ParereGeologoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java index daa33e1b..2c7a846f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/ProvinciaPersistenceImpl.java @@ -43,6 +43,7 @@ import it.tref.liferay.portos.bo.NoSuchProvinciaException; import it.tref.liferay.portos.bo.model.Provincia; import it.tref.liferay.portos.bo.model.impl.ProvinciaImpl; import it.tref.liferay.portos.bo.model.impl.ProvinciaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.ProvinciaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java index 29c4a390..ef2db5f2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SoggettoPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchSoggettoException; import it.tref.liferay.portos.bo.model.Soggetto; import it.tref.liferay.portos.bo.model.impl.SoggettoImpl; import it.tref.liferay.portos.bo.model.impl.SoggettoModelImpl; +import it.tref.liferay.portos.bo.service.persistence.SoggettoPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java index ec8a983f..fc566b28 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchSorteggioException; import it.tref.liferay.portos.bo.model.Sorteggio; import it.tref.liferay.portos.bo.model.impl.SorteggioImpl; import it.tref.liferay.portos.bo.model.impl.SorteggioModelImpl; +import it.tref.liferay.portos.bo.service.persistence.SorteggioPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java index 78333501..0c095d3d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java @@ -42,6 +42,7 @@ import it.tref.liferay.portos.bo.NoSuchStoricoSoggettoPraticaException; import it.tref.liferay.portos.bo.model.StoricoSoggettoPratica; import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaImpl; import it.tref.liferay.portos.bo.model.impl.StoricoSoggettoPraticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.StoricoSoggettoPraticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java index 720078c4..252fc452 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistenceImpl.java @@ -45,6 +45,7 @@ import it.tref.liferay.portos.bo.NoSuchTempisticaException; import it.tref.liferay.portos.bo.model.Tempistica; import it.tref.liferay.portos.bo.model.impl.TempisticaImpl; import it.tref.liferay.portos.bo.model.impl.TempisticaModelImpl; +import it.tref.liferay.portos.bo.service.persistence.TempisticaPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java index a9c7f7d5..c8e0dee9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/TerritorioPersistenceImpl.java @@ -44,6 +44,7 @@ import it.tref.liferay.portos.bo.NoSuchTerritorioException; import it.tref.liferay.portos.bo.model.Territorio; import it.tref.liferay.portos.bo.model.impl.TerritorioImpl; import it.tref.liferay.portos.bo.model.impl.TerritorioModelImpl; +import it.tref.liferay.portos.bo.service.persistence.TerritorioPersistence; import java.io.Serializable; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/portlet.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/portlet.properties index de10f85c..99a495a2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/portlet.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/portlet.properties @@ -42,7 +42,7 @@ geniocivile.iris.error.iuv.url = IUV service url not set geniocivile.iris.email.destinatario = support.iris@tasgroup.it geniocivile.iris.email.mittente = noreply-FE-PORTOS@regione.toscana.it geniocivile.iris.email.oggetto = Notifica pendenza in corso -geniocivile.iris.email.corpo = La pendenza [$CODICE_PENDENZA$] con causale [$DESCRIZIONE_CAUSALE$] creata in data [$DATA_CREAZIONE_PENDENZA$] e associata a [$CODICE_FISCALE_PAGAMENTO$] \uFFFD in pending. +geniocivile.iris.email.corpo = La pendenza [$CODICE_PENDENZA$] con causale [$DESCRIZIONE_CAUSALE$] creata in data [$DATA_CREAZIONE_PENDENZA$] e associata a [$CODICE_FISCALE_PAGAMENTO$] è in pending. #protocollo.cvs.url=http://localhost:9090/portos-protocollazione-service/v1/api-rest/export-protocolli protocollo.cvs.url=http://localhost:9080/portos-protocollazione-service/v1/api-rest/export-protocolli 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 d5d649eb..2ec0560a 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=2675 - build.date=1629722017169 + build.number=2694 + build.date=1629898346801 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/save_actions.jspf b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/save_actions.jspf index 7d36a88c..c7953334 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/save_actions.jspf +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/save_actions.jspf @@ -27,8 +27,7 @@ <%@page import="it.tref.liferay.portos.bo.service.DelegaLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.util.AsseverazioniUtil"%> <%@page import="it.tref.liferay.portos.bo.util.DelegheUtil"%> -
- <% +<% String randomId = StringUtil.randomId(); String formName = "fmDomande"; String buttonId = "fmbuttonsalvaconferma_" + randomId; @@ -36,293 +35,249 @@ String buttonAsseverazioneId = "fmbuttonasseverazione_" + randomId; String script = "var el_relazioni = $('textarea[name=_" + PortletKeys.FASCICOLOFE + "_{{prefix}}Relazioni]');" + "if (el_relazioni.length) {" - + " var el_coniugio = $('input[name=_" + PortletKeys.FASCICOLOFE + "_{{prefix}}Coniugio]');" - + " var el_coniugiochk = $('input[name=_" + PortletKeys.FASCICOLOFE + "_{{prefix}}Coniugio]:checked');" - + " console.log('length: ' + el_relazioni.length);" - + " var err_coniugio = (el_coniugiochk.length == 0);" - + " var err_relazioni = ((el_relazioni.val().replace(/\\s*/g, '').length < 10) && (el_coniugiochk.val() == 1));" - + " el_coniugio.parent().css({color:(err_coniugio ? '#a94442' : '#333')});" - + " el_relazioni.css({'border-color':(err_relazioni ?'#a94442' : '#ccc')});" - + " if (err_coniugio || err_relazioni) {" - + " $('#" + renderResponse.getNamespace() + "{{prefix}}SaveAndCloseDiv_" + randomId + "').parent().scrollTop(0);" - + " return false;" - + " }" + + "var el_coniugio = $('input[name=_" + PortletKeys.FASCICOLOFE + "_{{prefix}}Coniugio]');" + + "var el_coniugiochk = $('input[name=_" + PortletKeys.FASCICOLOFE + "_{{prefix}}Coniugio]:checked');" + + "console.log('length: ' + el_relazioni.length);" + + "var err_coniugio = (el_coniugiochk.length == 0);" + + "var err_relazioni = ((el_relazioni.val().replace(/\\s*/g, '').length < 10) && (el_coniugiochk.val() == 1));" + + "el_coniugio.parent().css({color:(err_coniugio ? '#a94442' : '#333')});" + + "el_relazioni.css({'border-color':(err_relazioni ?'#a94442' : '#ccc')});" + + "if (err_coniugio || err_relazioni) {" + + "$('#" + renderResponse.getNamespace() + "{{prefix}}SaveAndCloseDiv_" + randomId + "').parent().scrollTop(0);" + + "return false;" + + "}" + "}" + "saveDettPratica(false, '{{type}}');"; - boolean hasDelegaAttiva = DelegheUtil.hasDelegaAttiva(user.getUserId(), dettPraticaId); boolean hasAsseverazioneAttiva = AsseverazioniUtil.hasAsseverazioneAttiva(user.getUserId(), intPraticaId); %> +
- - - - - - + + + + - + + url="javascript:saveDettPratica(false, 'domanda', 'verifyFascicolo')" + linkCssClass="btn btn-primary" /> - - + + linkCssClass='<%=ValidazionePraticaUtil.delegheCompilazioneIsEnable(dettPraticaId) ? "btn" + : "btn disabled"%>' message="gestione-deleghe" + url="javascript:saveDettPratica(false, 'domanda', 'verifyDeleghe')" /> - - - + <% - boolean isEsente = dettPratica.getNormEsenteBollo() - && dettPratica.getNormEsenteSpese(); - boolean isIntegrazione = dettPratica.getTipoIntegrazione().equals( - TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE); - - Map dataMap = new HashMap(); - dataMap.put("id", renderResponse.getNamespace() + "openVerificaFascicolo"); + boolean isEsente = dettPratica.getNormEsenteBollo() && dettPratica.getNormEsenteSpese(); + boolean isIntegrazione = dettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil + .RICHIESTA_INTEGRAZIONE); + Map dataMap = new HashMap(); + dataMap.put("id", renderResponse.getNamespace() + "openVerificaFascicolo"); %> - + - - + + - + + windowState="<%= LiferayWindowState.POP_UP.toString() %>"> - - + + - + - - + + + windowState="<%=LiferayWindowState.POP_UP.toString()%>"> - - + + + linkCssClass='<%=ValidazionePraticaUtil.canCompleteDettPraticaEsente(dettPraticaId) ? + "btn btn-primary" : "btn btn-primary disabled"%>' + iconCssClass="fa fa-check" useDialog="<%=true%>" message="Concludi Domanda" + url="<%= completeDomandaEsenteURL %>" data="<%= dataMap %>" /> - - ' + message='<%= PagamentoLocalServiceUtil.countByClassPk(dettPraticaId) > 0 ? LanguageUtil .get(pageContext, "dati-pagamento") : LanguageUtil.get(pageContext, - "calcola-importo")%>' - url="javascript:saveDettPratica(false, 'domanda', 'verifyPagamenti');" data="<%=dataMap%>" /> + "calcola-importo")%>' + url="javascript:saveDettPratica(false, 'domanda', 'verifyPagamenti');" + data="<%=dataMap%>" /> - - - + linkCssClass="btn" /> <% - long delegaId = ParamUtil.getLong(request, "delegaId"); - Delega delega = DelegaLocalServiceUtil.getDelega(delegaId); - boolean validated = true; - StringBuilder tooltipSection = new StringBuilder(); - if (delega.getTipologia().equalsIgnoreCase(DelegheUtil.TIPO_GEOLOGO)) { - //List notCompleted = ValidazionePraticaUtil.notCompletedSection(SezioniUtil.SEZIONE_GEOLOGICA, dettPraticaId); - List notCompleted = ValidazionePraticaUtil - .hasDelegaGeologoCompleted(dettPraticaId); - if (!notCompleted.isEmpty()) { - validated = false; - tooltipSection.append("
    "); - for (String incomplete : notCompleted) { - tooltipSection.append("
  • " - + LanguageUtil.get(pageContext, incomplete) + "
    • "); - } - tooltipSection.append("
"); - } - } + long delegaId = ParamUtil.getLong(request, "delegaId"); + Delega delega = DelegaLocalServiceUtil.getDelega(delegaId); + boolean validated = true; + StringBuilder tooltipSection = new StringBuilder(); + if (delega.getTipologia().equalsIgnoreCase(DelegheUtil.TIPO_GEOLOGO)) { + List notCompleted = ValidazionePraticaUtil.hasDelegaGeologoCompleted(dettPraticaId); + if (!notCompleted.isEmpty()) { + validated = false; + tooltipSection.append("
    "); + for (String incomplete : notCompleted) { + tooltipSection.append("
  • ") + .append(LanguageUtil.get(pageContext, incomplete)).append("
    • "); + } + tooltipSection.append("
"); + } + } %> - - + <% - String buttonIdVerifica = "fmbuttonverifica_" + randomId; + String buttonIdVerifica = "fmbuttonverifica_" + randomId; %> - - - + message="verifica-delega" url="javascript:saveDettPratica(true,'saveAndVerify');" + linkCssClass="btn" />