From 98af2d919789c63469ad24426e193c792a957adb Mon Sep 17 00:00:00 2001
From: emerson <emerson@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 12 Nov 2018 13:37:48 +0000
Subject: [PATCH] =?UTF-8?q?fixes=20bug#0012653=20dev:=20valdevir=20qua:=20?=
 =?UTF-8?q?jos=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Correção no filtro de empresa.

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@86973 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/RelatorioIntegracaoAntiFraude.java   |   3 ++-
 .../RelatorioIntegracaoAntiFraude.jasper      | Bin 36448 -> 36737 bytes
 .../RelatorioIntegracaoAntiFraude.jrxml       |   7 +++++++
 ...ExecutarRelatorioIntegracaoAntiFraude.java |   6 +++---
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIntegracaoAntiFraude.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIntegracaoAntiFraude.java
index 379ed0fd8..2b408e8fd 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIntegracaoAntiFraude.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIntegracaoAntiFraude.java
@@ -52,6 +52,7 @@ public class RelatorioIntegracaoAntiFraude extends Relatorio {
 			instrucaoSql.append("B.NOMBPASAJERO PASSAGEIRO ");
 			instrucaoSql.append("FROM BOLETO B ");
 			instrucaoSql.append("INNER JOIN TRANSACAO_KONDUTO TK ON B.BOLETO_ID = TK.BOLETO_ID ");
+			instrucaoSql.append("INNER JOIN MARCA M ON B.MARCA_ID = M.MARCA_ID ");
 			instrucaoSql.append("LEFT JOIN CLIENTE CLI ON B.CLIENTECOMPRADOR_ID = CLI.CLIENTE_ID ");
 			instrucaoSql.append("LEFT JOIN CAJA C ON B.BOLETO_ID = C.TRANSACAO_ID ");
 			instrucaoSql.append("LEFT JOIN CAJA_DET_PAGO CDP ON C.CAJA_ID = CDP.CAJA_ID ");
@@ -60,7 +61,7 @@ public class RelatorioIntegracaoAntiFraude extends Relatorio {
 			instrucaoSql.append("LEFT JOIN PARADA PD ON B.DESTINO_ID = PD.PARADA_ID ");
 			instrucaoSql.append("WHERE B.FECHORVENTA BETWEEN :dtInicial AND :dtFinal ");
 			instrucaoSql.append("AND TK.STATUSTRANSACAO IN("+parametros.get("statusKondutoId").toString()+") ");
-			instrucaoSql.append("AND B.MARCA_ID = :empresaId ");
+			instrucaoSql.append("AND M.EMPRESA_ID = :empresaId ");
 		}
 
 		@Override
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioIntegracaoAntiFraude.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioIntegracaoAntiFraude.jasper
index 08e8ec93cf1c45b012d177c3b52718337b11a908..71451e44a1ebc0b9a905e8a9ef0e03b00febf3a8 100644
GIT binary patch
delta 6328
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

delta 6111
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

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioIntegracaoAntiFraude.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioIntegracaoAntiFraude.jrxml
index 59fd9893d..8f2fc4361 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioIntegracaoAntiFraude.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioIntegracaoAntiFraude.jrxml
@@ -326,6 +326,13 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{somaValorTotal}]]></textFieldExpression>
 			</textField>
+			<staticText>
+				<reportElement uuid="f5133a4b-5e4a-4fbd-a009-f9c4e19455cf" x="330" y="0" width="50" height="20"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<text><![CDATA[Total Geral:]]></text>
+			</staticText>
 		</band>
 	</summary>
 	<noData>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/integracaoantifraude/EventListenerExecutarRelatorioIntegracaoAntiFraude.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/integracaoantifraude/EventListenerExecutarRelatorioIntegracaoAntiFraude.java
index 0f8e07d11..05eea4363 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/integracaoantifraude/EventListenerExecutarRelatorioIntegracaoAntiFraude.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/integracaoantifraude/EventListenerExecutarRelatorioIntegracaoAntiFraude.java
@@ -18,7 +18,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.EventListenerExecutarRelator
 
 public class EventListenerExecutarRelatorioIntegracaoAntiFraude extends EventListenerExecutarRelatorio<RelatorioIntegracaoAntiFraudeController> implements EventListener {
 	
-	private static final String MASCARA_DATA_COMPLETA = "dd/MM/yyyy hh:mm:ss";
+	private static final String MASCARA_DATA = "dd/MM/yyyy";
 
 	public EventListenerExecutarRelatorioIntegracaoAntiFraude(RelatorioIntegracaoAntiFraudeController controller) {
 		super(controller);
@@ -80,8 +80,8 @@ public class EventListenerExecutarRelatorioIntegracaoAntiFraude extends EventLis
 	}
 
 	private String obtemPeriodo() {
-		return FormataUtil.formataDataToString((Date)getController().getDtInicial().getValue(), "", MASCARA_DATA_COMPLETA)
-				+" até "+FormataUtil.formataDataToString((Date)getController().getDtFinal().getValue(), "", MASCARA_DATA_COMPLETA);
+		return FormataUtil.formataDataToString((Date)getController().getDtInicial().getValue(), "", MASCARA_DATA)
+				+" até "+FormataUtil.formataDataToString((Date)getController().getDtFinal().getValue(), "", MASCARA_DATA);
 	}
 
 }