From a0a0fc57d5144faf605a07be3e2bceb02747ae95 Mon Sep 17 00:00:00 2001
From: julio <julio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 24 Jul 2019 23:03:00 +0000
Subject: [PATCH] fixes bug#14453 bug#14829 bug#15005 dev: julio qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@96092 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../controladores/bpe/BusquedaBpeExportacaoController.java   | 5 ++++-
 .../web/gui/controladores/bpe/BusquedaBpeRdiController.java  | 4 +++-
 web/gui/bpe/busquedaBpeExportacao.zul                        | 4 ++++
 web/gui/bpe/busquedaBpeRdi.zul                               | 4 ++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/bpe/BusquedaBpeExportacaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/bpe/BusquedaBpeExportacaoController.java
index 03704b7d5..4fec77a54 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/bpe/BusquedaBpeExportacaoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/bpe/BusquedaBpeExportacaoController.java
@@ -19,6 +19,7 @@ import org.zkoss.util.resource.Labels;
 import org.zkoss.zhtml.Messagebox;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Comboitem;
 import org.zkoss.zul.Datebox;
 import org.zkoss.zul.Filedownload;
@@ -56,6 +57,8 @@ public class BusquedaBpeExportacaoController extends MyGenericForwardComposer {
 
 	private MyComboboxEstandar cmbEmpresa;
 	private MyComboboxEstandar cmbEstado;
+	
+	private Checkbox consultaOtimizada;
 
 	@Override
 	public void doAfterCompose(Component comp) throws Exception {
@@ -82,7 +85,7 @@ public class BusquedaBpeExportacaoController extends MyGenericForwardComposer {
 
 		if (empresa != null && estado != null) {
 			String nomeArquivo = getNomeArquivoExportacaoECF(datInicial.getValue(), estado, "BPE");
-			String writerExp = bpeService.buscarArquivoExportacaoBPE(datInicial.getValue(), datFinal.getValue(), empresa, estado, nomeArquivo);
+			String writerExp = bpeService.buscarArquivoExportacaoBPE(datInicial.getValue(), datFinal.getValue(), empresa, estado, nomeArquivo, consultaOtimizada.isChecked());
 
 			File arquivo = criarArquivo(writerExp, nomeArquivo);
 
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/bpe/BusquedaBpeRdiController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/bpe/BusquedaBpeRdiController.java
index c2fbc5cd3..edb880fd8 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/bpe/BusquedaBpeRdiController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/bpe/BusquedaBpeRdiController.java
@@ -15,6 +15,7 @@ import org.zkoss.util.resource.Labels;
 import org.zkoss.zhtml.Messagebox;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Datebox;
 import org.zkoss.zul.Radio;
 
@@ -61,6 +62,7 @@ public class BusquedaBpeRdiController extends MyGenericForwardComposer {
 	private MyListbox estadoList;
 
 	private Radio radSim;
+	private Checkbox consultaOtimizada;
 
 	@Override
 	public void doAfterCompose(Component comp) throws Exception {
@@ -90,7 +92,7 @@ public class BusquedaBpeRdiController extends MyGenericForwardComposer {
 				return;
 			}
 
-			List<FiscalRdi> list = bpeService.buscarBpeRDI(datInicial.getValue(), datFinal.getValue(), empresa, estados, radSim.isChecked());
+			List<FiscalRdi> list = bpeService.buscarBpeRDI(datInicial.getValue(), datFinal.getValue(), empresa, estados, radSim.isChecked(), consultaOtimizada.isChecked());
 
 			Map<String, Object> parametros = new HashMap<String, Object>();
 			parametros.put("list", list);
diff --git a/web/gui/bpe/busquedaBpeExportacao.zul b/web/gui/bpe/busquedaBpeExportacao.zul
index b230595fc..68e8f078a 100644
--- a/web/gui/bpe/busquedaBpeExportacao.zul
+++ b/web/gui/bpe/busquedaBpeExportacao.zul
@@ -49,6 +49,10 @@
 						model="@{winBusquedaBpeExportacao$composer.lsEmpresa}"
 						constraint="no empty" />
 				</row>
+				
+				<row spans="3">
+					<checkbox id="consultaOtimizada" checked="false" label="Consulta Otimizada" />
+				</row>
 			</rows>
 		</grid>
 
diff --git a/web/gui/bpe/busquedaBpeRdi.zul b/web/gui/bpe/busquedaBpeRdi.zul
index fc249b564..1792aeaac 100644
--- a/web/gui/bpe/busquedaBpeRdi.zul
+++ b/web/gui/bpe/busquedaBpeRdi.zul
@@ -60,6 +60,10 @@
 							label="${c:l('busquedaRelatorioRDIController.labelRadio.radNao')}" />
 					</radiogroup>
 				</row>
+				
+				<row spans="3">
+					<checkbox id="consultaOtimizada" checked="false" label="Consulta Otimizada" />
+				</row>
 
 			</rows>
 		</grid>