From 8f994e077a2982b21458098a6d46d3f2e378987a Mon Sep 17 00:00:00 2001 From: gleimar Date: Thu, 20 Apr 2017 17:54:23 +0000 Subject: [PATCH] fixes bug#8885 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@68185 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioVendasComissao.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java index bed21efb5..1ef4dd953 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java @@ -239,8 +239,8 @@ public class RelatorioVendasComissao extends Relatorio { + "WHERE ((C.INDSTATUSBOLETO = 'V' AND C.INDREIMPRESION = 0) " + "OR (C.INDSTATUSBOLETO = 'T' AND C.INDREIMPRESION = 0) " + "OR (C.INDCANCELACION = 1 AND C.INDSTATUSBOLETO = 'C')) " - + "AND C.MOTIVOCANCELACION_ID != 99 " - + "AND C.FECHORVENTA BETWEEN :fecInicio AND :fecFinal "; + + "AND (C.MOTIVOCANCELACION_ID IS NULL OR C.MOTIVOCANCELACION_ID <> 99) " + + "AND C.FECHORVENTA BETWEEN CAST (:fecInicio AS DATE) AND CAST(:fecFinal AS DATE) "; if (StringUtils.isNotBlank(stringLsPuntoVentaId)) { query += "AND C.PUNTOVENTA_ID IN(" + stringLsPuntoVentaId + ") "; @@ -270,7 +270,7 @@ public class RelatorioVendasComissao extends Relatorio { .append("WHERE C.INDSTATUSBOLETO = 'C' ") .append("AND (C.MOTIVOCANCELACION_ID IN(32, 10) AND C.INDREIMPRESION = 0) "); - sQuery.append("AND C.FECHORVENTA BETWEEN :fecInicio AND :fecFinal "); + sQuery.append("AND C.FECHORVENTA BETWEEN CAST(:fecInicio AS DATE) AND CAST(:fecFinal AS DATE) "); if(parametros.get("EMPRESA_ID")!= null) { sQuery.append("AND M.EMPRESA_ID =:EMPRESA_ID "); }