From 2cffcc6ebf2670b06ef27b2b8ec9b94d6f2b147a Mon Sep 17 00:00:00 2001
From: celio <celio.souza@totvs.com.br>
Date: Fri, 23 Aug 2024 22:29:23 -0300
Subject: [PATCH] fixes bug#AL-4681

---
 pom.xml                                       |  2 +-
 .../RelatorioW2ITaxaEmbarqueAnalitico.java    | 26 ++++++++++++-------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 250ad67e9..d87f22459 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.129.0</version>
+	<version>1.129.1</version>
 	<packaging>war</packaging> 
     
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2ITaxaEmbarqueAnalitico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2ITaxaEmbarqueAnalitico.java
index 2967c06a2..e431a8227 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2ITaxaEmbarqueAnalitico.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2ITaxaEmbarqueAnalitico.java
@@ -32,7 +32,13 @@ public class RelatorioW2ITaxaEmbarqueAnalitico extends Relatorio {
 				Map<String, Object> parametros = this.relatorio.getParametros();
 				String puntosVentaIds = (String) parametros.get("NUMPUNTOVENTA");
 				List<Integer> puntosVentaIdsList = new ArrayList<>();
+				boolean isTodasAgencias = false;
 				for (String id : puntosVentaIds.split(",")) {
+					if("-1".equals(id)) {
+						isTodasAgencias = true; 
+						break;
+					}
+						
 					puntosVentaIdsList.add(Integer.parseInt(id));
 				}
 				lsDadosRelatorio = new ArrayList<RelatorioW2IBean>();
@@ -40,7 +46,7 @@ public class RelatorioW2ITaxaEmbarqueAnalitico extends Relatorio {
 				Integer origemID =  (Integer)  parametros.get("ORIGEN_ID");
 				Integer destinoID = (Integer)  parametros.get("DESTINO_ID");
 				
-				String sql = getSql(puntosVentaIdsList.size(), empresaID, origemID, destinoID);
+				String sql = getSql(isTodasAgencias ? 0 : puntosVentaIdsList.size(), empresaID, origemID, destinoID);
 
 				NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
 
@@ -60,13 +66,14 @@ public class RelatorioW2ITaxaEmbarqueAnalitico extends Relatorio {
 	                stmt.setInt("ORIGEN_ID", destinoID);
 	            
 	            int paramIndex = 0;
-	            for (Integer id : puntosVentaIdsList) {
-	                stmt.setInt("PUNTO_VENTA_"+paramIndex, id);
-	                paramIndex++;
+	            if(!isTodasAgencias) {
+		            for (Integer id : puntosVentaIdsList) {
+		                stmt.setInt("PUNTO_VENTA_"+paramIndex, id);
+		                paramIndex++;
+		            }
 	            }
 
-
-				rset = stmt.executeQuery();
+	            rset = stmt.executeQuery();
 
 				RelatorioW2IBean relatorioW2IBean = null;
 				while (rset.next()) {
@@ -136,8 +143,8 @@ public class RelatorioW2ITaxaEmbarqueAnalitico extends Relatorio {
 			sql.append("AND po.parada_id = :ORIGEN_ID ");
 		if(destinoID != null)
 			sql.append("AND pd.parada_id = :DESTINO_ID  ");
-
-		gerarBindPuntoVenta(numPuntosVentaIds, sql);
+		if(numPuntosVentaIds > 0)
+			gerarBindPuntoVenta(numPuntosVentaIds, sql);
 
 		sql.append(" UNION ");
 
@@ -171,7 +178,8 @@ public class RelatorioW2ITaxaEmbarqueAnalitico extends Relatorio {
 		if(destinoID != null)
 			sql.append("AND pd.parada_id = :DESTINO_ID  ");
 
-		gerarBindPuntoVenta(numPuntosVentaIds, sql);
+		if(numPuntosVentaIds > 0)
+			gerarBindPuntoVenta(numPuntosVentaIds, sql);
 
 		sql.append("ORDER BY dataVenda ASC ");