diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar index f02cbc8f..e9e5ff0e 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java index bad81c31..f0a402be 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalService.java @@ -317,11 +317,11 @@ public interface IntPraticaLocalService extends BaseLocalService, java.lang.String[] parameterTypes, java.lang.Object[] arguments) throws java.lang.Throwable; - public java.util.List filtraPraticheStato(java.util.Date dataInizioLavori, - java.util.Date dataFineLavori) + public java.util.List filtraPraticheStato( + java.util.Date dataInizioLavori, java.util.Date dataFineLavori) throws com.liferay.portal.kernel.exception.SystemException; - public java.util.List filtraPraticheIntegrazioni( + public java.util.List filtraPraticheIntegrazioni( java.util.Date dataInizioLavori, java.util.Date dataFineLavori) throws com.liferay.portal.kernel.exception.SystemException; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java index adc39139..7000e609 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceClp.java @@ -1110,8 +1110,8 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { } @Override - public java.util.List filtraPraticheStato(java.util.Date dataInizioLavori, - java.util.Date dataFineLavori) + public java.util.List filtraPraticheStato( + java.util.Date dataInizioLavori, java.util.Date dataFineLavori) throws com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; @@ -1140,11 +1140,11 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { } } - return (java.util.List)ClpSerializer.translateOutput(returnObj); + return (java.util.List)ClpSerializer.translateOutput(returnObj); } @Override - public java.util.List filtraPraticheIntegrazioni( + public java.util.List filtraPraticheIntegrazioni( java.util.Date dataInizioLavori, java.util.Date dataFineLavori) throws com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; @@ -1174,7 +1174,7 @@ public class IntPraticaLocalServiceClp implements IntPraticaLocalService { } } - return (java.util.List)ClpSerializer.translateOutput(returnObj); + return (java.util.List)ClpSerializer.translateOutput(returnObj); } @Override diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java index b377a134..8b26bb98 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceUtil.java @@ -342,13 +342,13 @@ public class IntPraticaLocalServiceUtil { return getService().invokeMethod(name, parameterTypes, arguments); } - public static java.util.List filtraPraticheStato( + public static java.util.List filtraPraticheStato( java.util.Date dataInizioLavori, java.util.Date dataFineLavori) throws com.liferay.portal.kernel.exception.SystemException { return getService().filtraPraticheStato(dataInizioLavori, dataFineLavori); } - public static java.util.List filtraPraticheIntegrazioni( + public static java.util.List filtraPraticheIntegrazioni( java.util.Date dataInizioLavori, java.util.Date dataFineLavori) throws com.liferay.portal.kernel.exception.SystemException { return getService() diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java index 6b137d08..7f51f9ac 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/IntPraticaLocalServiceWrapper.java @@ -363,15 +363,15 @@ public class IntPraticaLocalServiceWrapper implements IntPraticaLocalService, } @Override - public java.util.List filtraPraticheStato(java.util.Date dataInizioLavori, - java.util.Date dataFineLavori) + public java.util.List filtraPraticheStato( + java.util.Date dataInizioLavori, java.util.Date dataFineLavori) throws com.liferay.portal.kernel.exception.SystemException { return _intPraticaLocalService.filtraPraticheStato(dataInizioLavori, dataFineLavori); } @Override - public java.util.List filtraPraticheIntegrazioni( + public java.util.List filtraPraticheIntegrazioni( java.util.Date dataInizioLavori, java.util.Date dataFineLavori) throws com.liferay.portal.kernel.exception.SystemException { return _intPraticaLocalService.filtraPraticheIntegrazioni(dataInizioLavori, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinder.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinder.java index 098d23ec..81035e80 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinder.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinder.java @@ -26,11 +26,11 @@ public interface IntPraticaFinder { java.lang.String codiceFiscaleDelegatoCollaudo) throws com.liferay.portal.kernel.exception.SystemException; - public java.util.List filtraPraticheStato(java.util.Date dataInizioLavori, - java.util.Date dataFineLavori) + public java.util.List filtraPraticheStato( + java.util.Date dataInizioLavori, java.util.Date dataFineLavori) throws com.liferay.portal.kernel.exception.SystemException; - public java.util.List filtraPraticheIntegrazioni( + public java.util.List filtraPraticheIntegrazioni( java.util.Date dataInizioLavori, java.util.Date dataFineLavori) throws com.liferay.portal.kernel.exception.SystemException; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinderUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinderUtil.java index 8b0d1e90..912c7da2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinderUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinderUtil.java @@ -34,13 +34,13 @@ public class IntPraticaFinderUtil { return getFinder().canAddCollaudoCount(codiceFiscaleDelegatoCollaudo); } - public static java.util.List filtraPraticheStato( + public static java.util.List filtraPraticheStato( java.util.Date dataInizioLavori, java.util.Date dataFineLavori) throws com.liferay.portal.kernel.exception.SystemException { return getFinder().filtraPraticheStato(dataInizioLavori, dataFineLavori); } - public static java.util.List filtraPraticheIntegrazioni( + public static java.util.List filtraPraticheIntegrazioni( java.util.Date dataInizioLavori, java.util.Date dataFineLavori) throws com.liferay.portal.kernel.exception.SystemException { return getFinder() diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/custom-sql/intpratica.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/custom-sql/intpratica.xml index 82993c7d..a139ce96 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/custom-sql/intpratica.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/custom-sql/intpratica.xml @@ -23,7 +23,7 @@ where pbi.dtpratica > ? and pbi.dtpratica < ? group by tipoprocedura, statopratica - order by tipoprocedura; + order by tipoprocedura, statopratica; ]]> 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 d7cf0ca9..0c2ef852 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 @@ -133,10 +133,10 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { private static Map vecchieProcedure = null; private static final Log _log = LogFactoryUtil.getLog(IntPraticaLocalServiceImpl.class); - public List filtraPraticheStato(Date dataInizioLavori, Date dataFineLavori) throws SystemException { + public List filtraPraticheStato(Date dataInizioLavori, Date dataFineLavori) throws SystemException { return IntPraticaFinderUtil.filtraPraticheStato(dataInizioLavori, dataFineLavori); } - public List filtraPraticheIntegrazioni(Date dataInizioLavori, Date dataFineLavori) throws SystemException { + public List filtraPraticheIntegrazioni(Date dataInizioLavori, Date dataFineLavori) throws SystemException { return IntPraticaFinderUtil.filtraPraticheIntegrazioni(dataInizioLavori, dataFineLavori); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinderImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinderImpl.java index df52d0fe..98fccfeb 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinderImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaFinderImpl.java @@ -77,7 +77,7 @@ public class IntPraticaFinderImpl extends BasePersistenceImpl implem } private final String FILTRA_PRATICHE_STATO = "IntPratica.reportPraticaStato"; private final String FILTRA_PRATICHE_INTEGRAZIONI = "IntPratica.reportPraticaIntegrazioni"; - public List filtraPraticheStato(Date dataInizioLavori, Date dataFineLavori) + public List filtraPraticheStato(Date dataInizioLavori, Date dataFineLavori) throws SystemException { Session session = null; try { @@ -88,8 +88,8 @@ public class IntPraticaFinderImpl extends BasePersistenceImpl implem QueryPos qPos = QueryPos.getInstance(query); qPos.add(dataInizioLavori); qPos.add(dataFineLavori); - List l = query.list(); - _log.debug(l.getClass().getSimpleName()); + @SuppressWarnings("unchecked") + List l = query.list(); return l; } catch (ORMException e) { _log.error("Errore", e); @@ -101,7 +101,7 @@ public class IntPraticaFinderImpl extends BasePersistenceImpl implem } } - public List filtraPraticheIntegrazioni(Date dataInizioLavori, Date dataFineLavori) + public List filtraPraticheIntegrazioni(Date dataInizioLavori, Date dataFineLavori) throws SystemException { Session session = null; try { @@ -112,8 +112,8 @@ public class IntPraticaFinderImpl extends BasePersistenceImpl implem QueryPos qPos = QueryPos.getInstance(query); qPos.add(dataInizioLavori); qPos.add(dataFineLavori); - List l = query.list(); - _log.debug(l.getClass().getSimpleName()); + @SuppressWarnings("unchecked") + List l = query.list(); return l; } catch (ORMException e) { _log.error("Errore", e); 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 e869c1ad..40febeac 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=3632 - build.date=1679901564833 + build.number=3637 + build.date=1679904806088 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar index f02cbc8f..e9e5ff0e 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/html/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/html/view.jsp index 59ca464f..a81a355b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/html/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-reportistica-portlet/docroot/html/view.jsp @@ -1,4 +1,5 @@ -<%@page import="java.util.HashMap"%> +<%@page import="java.util.TreeMap"%> +<%@page import="java.util.SortedMap"%> <%@page import="java.util.Map"%> <%@page import="java.math.BigInteger"%> <%@page import="java.util.ArrayList"%> @@ -25,8 +26,8 @@ List j = IntPraticaLocalServiceUtil.filtraPraticheIntegrazioni(dataInizioLavori, dataFineLavori); Map stati; Map integrazioni; - stati = new HashMap(); - integrazioni = new HashMap(); + stati = new TreeMap(); + integrazioni = new TreeMap(); for(int p=1;p<=10;p++){ stati.put("P"+p, BigInteger.valueOf(0)); stati.put("Q"+p, BigInteger.valueOf(0)); @@ -77,7 +78,7 @@ for(int p=1;p<=10;p++){ stati.put("P"+p, BigInteger.valueOf(0)); stati.put("Q"+p, BigInteger.valueOf(0)); - integrazioni.put("Q"+p, BigInteger.valueOf(0)); + integrazioni.put("P"+p, BigInteger.valueOf(0)); integrazioni.put("Q"+p, BigInteger.valueOf(0)); } %>