From 01fc0fc64eeea0f3749071d9af5af47a41a731cf Mon Sep 17 00:00:00 2001
From: claudio <claudio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 21 May 2018 14:55:14 +0000
Subject: [PATCH] =?UTF-8?q?Foi=20Adcionado=20uma=20valida=C3=A7=C3=A3o=20q?=
 =?UTF-8?q?uando=20o=20usuario=20seleciona=20todas=20agencias,=20e=20troca?=
 =?UTF-8?q?do=20=3D=3D=20por=20equals=20por=20seguran=C3=A7a=20nessas=20va?=
 =?UTF-8?q?lida=C3=A7=C3=B5es.=20fixes=20bug#11036=20dev:fabio=20qua:renat?=
 =?UTF-8?q?o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@81982 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../relatorios/impl/RelatorioMovimentosAtraso.java | 14 +++++++-------
 .../RelatorioMovimentosAtrasoController.java       |  6 +++++-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java
index 2aa936493..2424fbf98 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java
@@ -153,7 +153,7 @@ public class RelatorioMovimentosAtraso extends Relatorio {
 				sQuery.append("AND CO.EMPRESA_ID = :empresaId ");
 			}
 
-			if(puntoventaId != null) {
+			if(puntoventaId != null && !puntoventaId.equals(-1)) {
 				sQuery.append("AND CO.PUNTOVENTA_ID = :puntoventaId ");
 			}
 
@@ -166,7 +166,7 @@ public class RelatorioMovimentosAtraso extends Relatorio {
 				stmt.setInt("empresaId", empresaId);
 			}
 			
-			if(puntoventaId != null) {
+			if(puntoventaId != null && !puntoventaId.equals(-1)) {
 				stmt.setInt("puntoventaId", puntoventaId);
 			}
 			stmt.setDate("dataInicial", new java.sql.Date(dataInicial.getTime()));
@@ -221,7 +221,7 @@ public class RelatorioMovimentosAtraso extends Relatorio {
 				sQuery.append("AND M.EMPRESA_ID = :empresaId ");
 			}
 
-			if(puntoventaId != null && puntoventaId != -1) {
+			if(puntoventaId != null && !puntoventaId.equals(-1)) {
 				sQuery.append("AND C.PUNTOVENTA_ID = :puntoventaId ");
 			}
 			
@@ -234,7 +234,7 @@ public class RelatorioMovimentosAtraso extends Relatorio {
 				stmt.setInt("empresaId", empresaId);
 			}
 			
-			if(puntoventaId != null && puntoventaId != -1) {
+			if(puntoventaId != null && !puntoventaId.equals(-1)) {
 				stmt.setInt("puntoventaId", puntoventaId);
 			}
 			stmt.setDate("dataInicial", new java.sql.Date(dataInicial.getTime()));
@@ -288,7 +288,7 @@ public class RelatorioMovimentosAtraso extends Relatorio {
 				sQuery.append("AND PTE.EMPRESA_ID = :empresaId ");
 			}
 
-			if(puntoventaId != null && puntoventaId != -1) {
+			if(puntoventaId != null && !puntoventaId.equals(-1)) {
 				sQuery.append("AND PV.PUNTOVENTA_ID = :puntoventaId ");
 			}
 
@@ -301,7 +301,7 @@ public class RelatorioMovimentosAtraso extends Relatorio {
 				stmt.setInt("empresaId", empresaId);
 			}
 
-			if(puntoventaId != null && puntoventaId != -1) {
+			if(puntoventaId != null && !puntoventaId.equals(-1)) {
 				stmt.setInt("puntoventaId", puntoventaId);
 			}
 
@@ -383,7 +383,7 @@ public class RelatorioMovimentosAtraso extends Relatorio {
 		if(empresaId != null) {
 			this.empresaId = empresaId;
 		}
-		if(puntoventaId != null) {
+		if(puntoventaId != null && !puntoventaId.equals(-1)) {
 			this.puntoventaId = puntoventaId;
 		}
 		
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMovimentosAtrasoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMovimentosAtrasoController.java
index 17a2515f3..863f1fc82 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMovimentosAtrasoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMovimentosAtrasoController.java
@@ -70,6 +70,8 @@ public class RelatorioMovimentosAtrasoController extends MyGenericForwardCompose
     public void onClick$btnRelatorio(Event ev) {
     	try {
     		Map<String, Object> parametros = new HashMap<String, Object>();
+    		
+    		
         	parametros.put("competencia", txtCompetencia.getValue());
         	parametros.put("empresaId", empresa.getEmpresaId());
         	parametros.put("empresa", empresa.getNombempresa());
@@ -89,7 +91,9 @@ public class RelatorioMovimentosAtrasoController extends MyGenericForwardCompose
         	
         	Map<String, Object> args = new HashMap<String, Object>();
     		args.put("relatorio", relatorio);
-
+    		
+    		puntoVenta = new PuntoVenta();
+    		
     		openWindow("/component/reportView.zul",
     				   Labels.getLabel("relatorioMovimentosAtrasoController.window.title"), args, MODAL);			
 		} catch (Exception e) {