From d498ef6cdb4ad379cc27f13b716b6226da3927d1 Mon Sep 17 00:00:00 2001 From: fabio Date: Tue, 7 Dec 2021 20:30:00 +0000 Subject: [PATCH] fixes bug#23201 dev: Wallace qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@109933 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../templates/RelatorioGratuidadeAGR.jasper | Bin 42079 -> 42445 bytes .../templates/RelatorioGratuidadeAGR.jrxml | 10 +++++++--- .../RelatorioGratuidadeAGRController.java | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeAGR.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeAGR.jasper index a279c1de8aaa8dbca4efe63e08deabf8a3aa6a93..753bf45754c7d2bbd35d667e7f30ab95ee1a879e 100644 GIT binary patch delta 7407 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 a?4)6Tcr1>No8b1X$)UuEzsj{9=>KmN*xTd) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeAGR.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeAGR.jrxml index f851121ff..e352c381c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeAGR.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeAGR.jrxml @@ -112,7 +112,11 @@ - + @@ -279,7 +283,7 @@ - + @@ -319,7 +323,7 @@ - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeAGRController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeAGRController.java index c6f2cc733..f2ac97ba9 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeAGRController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeAGRController.java @@ -250,8 +250,9 @@ public class RelatorioGratuidadeAGRController extends MyGenericForwardComposer { if(txtCliente.getValue() != null && !txtCliente.getValue().equals("") ){ Filter filterNome = new Filter("nombcliente", txtCliente.getValue() + "%", Filter.OP_ILIKE); Filter filterCpf = new Filter("numIdentificaUno", txtCliente.getValue() + "%", Filter.OP_ILIKE); + Filter filterCpf2 = new Filter("numIdentificaDos", txtCliente.getValue() + "%", Filter.OP_ILIKE); - clienteBusqueda.addFilterOr( filterNome, filterCpf ); + clienteBusqueda.addFilterOr( filterNome, filterCpf, filterCpf2 ); clienteBusqueda.addFilterEqual("activo", Boolean.TRUE); clienteBusqueda.addSortAsc("nombcliente");