fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
julio 2019-07-24 23:03:00 +00:00
parent 952f807919
commit a0a0fc57d5
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/bpe/BusquedaBpeExportacaoController.java
View File

@ -19,6 +19,7 @@ import org.zkoss.util.resource.Labels;
import org.zkoss.zhtml.Messagebox; import org.zkoss.zhtml.Messagebox;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zul.Checkbox;
import org.zkoss.zul.Comboitem; import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Datebox; import org.zkoss.zul.Datebox;
import org.zkoss.zul.Filedownload; import org.zkoss.zul.Filedownload;
@ -56,6 +57,8 @@ public class BusquedaBpeExportacaoController extends MyGenericForwardComposer {
private MyComboboxEstandar cmbEmpresa; private MyComboboxEstandar cmbEmpresa;
private MyComboboxEstandar cmbEstado; private MyComboboxEstandar cmbEstado;
private Checkbox consultaOtimizada;
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
@ -82,7 +85,7 @@ public class BusquedaBpeExportacaoController extends MyGenericForwardComposer {
if (empresa != null && estado != null) { if (empresa != null && estado != null) {
String nomeArquivo = getNomeArquivoExportacaoECF(datInicial.getValue(), estado, "BPE"); 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); File arquivo = criarArquivo(writerExp, nomeArquivo);

4
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/bpe/BusquedaBpeRdiController.java
View File

@ -15,6 +15,7 @@ import org.zkoss.util.resource.Labels;
import org.zkoss.zhtml.Messagebox; import org.zkoss.zhtml.Messagebox;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zul.Checkbox;
import org.zkoss.zul.Datebox; import org.zkoss.zul.Datebox;
import org.zkoss.zul.Radio; import org.zkoss.zul.Radio;
@ -61,6 +62,7 @@ public class BusquedaBpeRdiController extends MyGenericForwardComposer {
private MyListbox estadoList; private MyListbox estadoList;
private Radio radSim; private Radio radSim;
private Checkbox consultaOtimizada;
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
@ -90,7 +92,7 @@ public class BusquedaBpeRdiController extends MyGenericForwardComposer {
return; 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>(); Map<String, Object> parametros = new HashMap<String, Object>();
parametros.put("list", list); parametros.put("list", list);

4
web/gui/bpe/busquedaBpeExportacao.zul
View File

@ -49,6 +49,10 @@
model="@{winBusquedaBpeExportacao$composer.lsEmpresa}" model="@{winBusquedaBpeExportacao$composer.lsEmpresa}"
constraint="no empty" /> constraint="no empty" />
</row> </row>
<row spans="3">
<checkbox id="consultaOtimizada" checked="false" label="Consulta Otimizada" />
</row>
</rows> </rows>
</grid> </grid>

4
web/gui/bpe/busquedaBpeRdi.zul
View File

@ -60,6 +60,10 @@
label="${c:l('busquedaRelatorioRDIController.labelRadio.radNao')}" /> label="${c:l('busquedaRelatorioRDIController.labelRadio.radNao')}" />
</radiogroup> </radiogroup>
</row> </row>
<row spans="3">
<checkbox id="consultaOtimizada" checked="false" label="Consulta Otimizada" />
</row>
</rows> </rows>
</grid> </grid>