From 9a354651676ca16b4c2014bdcc70a77cf1e568e7 Mon Sep 17 00:00:00 2001 From: frederico Date: Fri, 28 Oct 2016 16:56:23 +0000 Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#7906=20-=20corre=C3=A7=C3=A3o=20?= =?UTF-8?q?filtros=20RelatorioObservacaoConferenciaMovimento?= 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@62122 d1611594-4594-4d17-8e1d-87c2c4800839 --- ...latorioObservacaoConferenciaMovimento.java | 20 ++++++++++++------ ...torioObservacaoConferenciaMovimento.jasper | Bin 39462 -> 39456 bytes ...atorioObservacaoConferenciaMovimento.jrxml | 6 +++--- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoConferenciaMovimento.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoConferenciaMovimento.java index 1a922c5b4..d808cc82b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoConferenciaMovimento.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoConferenciaMovimento.java @@ -61,11 +61,20 @@ public class RelatorioObservacaoConferenciaMovimento extends Relatorio { .append("LEFT JOIN EVENTO_EXTRA EE ON EE.EVENTOEXTRA_ID = LOG.EVENTOEXTRA_ID ") .append("LEFT JOIN TIPO_EVENTO_EXTRA TEE ON TEE.TIPOEVENTOEXTRA_ID = EE.TIPOEVENTOEXTRA_ID ") .append("WHERE LOG.ACTIVO = 1 ") - .append("AND C.DATAMOVIMENTO BETWEEN :dataInicial AND :dataFinal ") - .append("AND LOG.STATUS = :pendencia ") - .append("AND B.IMPORTETAXAEMBARQUE = :taxaEmbarque ") - .append("AND B.IMPORTEOUTROS = :outros "); + .append("AND C.DATAMOVIMENTO BETWEEN :dataInicial AND :dataFinal "); + if(pendencia){ + sQuery.append("AND LOG.STATUS = 1 "); + } + + if (taxaEmbarque) { + sQuery.append("AND B.IMPORTETAXAEMBARQUE > 0 "); + } + + if (outros) { + sQuery.append("AND B.IMPORTEOUTROS > 0 "); + } + if (credito != null){ sQuery.append("AND LOG.INDCREDITO = :credito "); } @@ -92,9 +101,6 @@ public class RelatorioObservacaoConferenciaMovimento extends Relatorio { } stmt.setDate("dataInicial", new java.sql.Date(dataInicial.getTime())); stmt.setDate("dataFinal", new java.sql.Date(dataFinal.getTime())); - stmt.setBoolean("pendencia", pendencia); - stmt.setBoolean("taxaEmbarque", taxaEmbarque); - stmt.setBoolean("outros", outros); if (credito != null){ stmt.setBoolean("credito", credito); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioObservacaoConferenciaMovimento.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioObservacaoConferenciaMovimento.jasper index 9c0766e860ee7090791e64539bcaa9d5a2f65079..8ad39ae65dd4c5e61fd66295474d3551a9a951ec 100644 GIT binary patch delta 136 zcmZ3sg=xVSrVZZ8lk+s#HwP)NHI^1I)H5|e0;Yuwbxe~=7#IyICNDJB-s~A3AjM~Q z>ff$?3=9lB%#F=W42_Ho<1LL13@q6h7#SIKCKr||Z{{gF OuP!QrP0{3!Gfe?c#3d*I delta 137 zcmZ3mg=yIqrVZZ8j0~H7ls6m83mWN}7@C@!nHoTVg<&B>9n+)|1{On01IvoZ3yrlm zyM_ly@!6mHw`(5*1A`u8IwOP4WGg>)(Rf1>b3+SD6QEu*Lz8%80|R4I!_D^!f2d1h Rmn&f~nrz4}Gns3a7ywQMB - - + +