use sorted map for codes P and Q and states

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<java.lang.Object[]> 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<java.lang.Object[]> filtraPraticheIntegrazioni(
 		java.util.Date dataInizioLavori, java.util.Date dataFineLavori)
 		throws com.liferay.portal.kernel.exception.SystemException;
 

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<java.lang.Object[]> 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<java.lang.Object[]>)ClpSerializer.translateOutput(returnObj);
 	}
 
 	@Override
-	public java.util.List filtraPraticheIntegrazioni(
+	public java.util.List<java.lang.Object[]> 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<java.lang.Object[]>)ClpSerializer.translateOutput(returnObj);
 	}
 
 	@Override

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<java.lang.Object[]> 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<java.lang.Object[]> filtraPraticheIntegrazioni(
 		java.util.Date dataInizioLavori, java.util.Date dataFineLavori)
 		throws com.liferay.portal.kernel.exception.SystemException {
 		return getService()

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<java.lang.Object[]> 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<java.lang.Object[]> filtraPraticheIntegrazioni(
 		java.util.Date dataInizioLavori, java.util.Date dataFineLavori)
 		throws com.liferay.portal.kernel.exception.SystemException {
 		return _intPraticaLocalService.filtraPraticheIntegrazioni(dataInizioLavori,

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<java.lang.Object[]> 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<java.lang.Object[]> filtraPraticheIntegrazioni(
 		java.util.Date dataInizioLavori, java.util.Date dataFineLavori)
 		throws com.liferay.portal.kernel.exception.SystemException;
 }

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<java.lang.Object[]> 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<java.lang.Object[]> filtraPraticheIntegrazioni(
 		java.util.Date dataInizioLavori, java.util.Date dataFineLavori)
 		throws com.liferay.portal.kernel.exception.SystemException {
 		return getFinder()

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;
 		]]>
 	</sql>
 	<sql id="IntPratica.reportPraticaIntegrazioni">

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<String, String> vecchieProcedure = null;
 
 	private static final Log _log = LogFactoryUtil.getLog(IntPraticaLocalServiceImpl.class);
-	public List filtraPraticheStato(Date dataInizioLavori, Date dataFineLavori) throws SystemException {
+	public List<Object[]> filtraPraticheStato(Date dataInizioLavori, Date dataFineLavori) throws SystemException {
 		return IntPraticaFinderUtil.filtraPraticheStato(dataInizioLavori, dataFineLavori);
 	}
-	public List filtraPraticheIntegrazioni(Date dataInizioLavori, Date dataFineLavori) throws SystemException {
+	public List<Object[]> filtraPraticheIntegrazioni(Date dataInizioLavori, Date dataFineLavori) throws SystemException {
 		return IntPraticaFinderUtil.filtraPraticheIntegrazioni(dataInizioLavori, dataFineLavori);
 	}
 

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<IntPratica> 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<Object[]> filtraPraticheStato(Date dataInizioLavori, Date dataFineLavori)
 			throws SystemException {
 		Session session = null;
 		try {
@@ -88,8 +88,8 @@ public class IntPraticaFinderImpl extends BasePersistenceImpl<IntPratica> implem
 			QueryPos qPos = QueryPos.getInstance(query);
 			qPos.add(dataInizioLavori);
 			qPos.add(dataFineLavori);
-			List l = query.list();
-			_log.debug(l.getClass().getSimpleName());
+			@SuppressWarnings("unchecked")
+			List<Object[]> l = query.list();
 			return l;
 		} catch (ORMException e) {
 			_log.error("Errore", e);
@@ -101,7 +101,7 @@ public class IntPraticaFinderImpl extends BasePersistenceImpl<IntPratica> implem
 		}
 	}
 	
-	public List filtraPraticheIntegrazioni(Date dataInizioLavori, Date dataFineLavori)
+	public List<Object[]> filtraPraticheIntegrazioni(Date dataInizioLavori, Date dataFineLavori)
 			throws SystemException {
 		Session session = null;
 		try {
@@ -112,8 +112,8 @@ public class IntPraticaFinderImpl extends BasePersistenceImpl<IntPratica> implem
 			QueryPos qPos = QueryPos.getInstance(query);
 			qPos.add(dataInizioLavori);
 			qPos.add(dataFineLavori);
-			List l = query.list();
-			_log.debug(l.getClass().getSimpleName());
+			@SuppressWarnings("unchecked")
+			List<Object[]> l = query.list();
 			return l;
 		} catch (ORMException e) {
 			_log.error("Errore", e);

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
 
 ##

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<Object[]> j = IntPraticaLocalServiceUtil.filtraPraticheIntegrazioni(dataInizioLavori, dataFineLavori);
 	Map<String, BigInteger> stati;
 	Map<String, BigInteger> integrazioni;
-	stati = new HashMap<String, BigInteger>();
-	integrazioni = new HashMap<String, BigInteger>();
+	stati = new TreeMap<String, BigInteger>();
+	integrazioni = new TreeMap<String, BigInteger>();
 	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));
 	}
 	%>