From 5501d42e2729287036c0b772c0cc5c80fa5f7169 Mon Sep 17 00:00:00 2001 From: thiago Date: Thu, 5 Oct 2017 20:25:49 +0000 Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#9922=20-=20Corre=C3=A7=C3=A3o=20?= =?UTF-8?q?de=20problema=20em=20relat=C3=B3rio=20de=20demanda=20consolidad?= =?UTF-8?q?o.?= 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@74534 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/RelatorioDemandasConsolidado.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDemandasConsolidado.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDemandasConsolidado.java index 8127d8569..914202776 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDemandasConsolidado.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDemandasConsolidado.java @@ -1,5 +1,5 @@ /** - * + * */ package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; @@ -98,7 +98,7 @@ public class RelatorioDemandasConsolidado extends RelatorioDemandas { if (parametros.get("TIPO_SERVICO").toString().equals("1")) { //NORMAL sql.append(" AND ts_normal.TIPOSERVICIO_ID = :TIPO_SERVICO "); } else { //EXTRA - sql.append(" AND ts_extra.TIPOSERVICIO_ID = :TIPO_SERVICO "); + sql.append(" AND ts_extra.TIPOSERVICIO_ID = :TIPO_SERVICO "); } } sql.append(" GROUP BY "); @@ -106,7 +106,7 @@ public class RelatorioDemandasConsolidado extends RelatorioDemandas { sql.append(" r.DESCRUTA, "); sql.append(" cs.DESCCLASE, "); sql.append(" r.NUMRUTA "); - + sql.append(" ORDER BY "); sql.append(" e.NOMBEMPRESA, "); @@ -126,10 +126,10 @@ public class RelatorioDemandasConsolidado extends RelatorioDemandas { if (parametros.get("TIPO_SERVICO") != null) { stmt.setInt("TIPO_SERVICO", Integer.valueOf(parametros.get("TIPO_SERVICO").toString())); } - - - stmt.setDate("DATA_INICIAL", new java.sql.Date(((java.util.Date) parametros.get("DATA_INICIAL")).getTime())); - stmt.setDate("DATA_FINAL", new java.sql.Date(((java.util.Date) parametros.get("DATA_FINAL")).getTime())); + + + stmt.setTimestamp("DATA_INICIAL", new Timestamp(DateUtil.inicioFecha(dataInicial.getTime()).getTime())); + stmt.setTimestamp("DATA_FINAL", new Timestamp(DateUtil.fimFecha(dataFinal.getTime()).getTime())); ResultSet rset = stmt.executeQuery();