From 87fdd29391d71513a4a37c289baf5bf6ef008892 Mon Sep 17 00:00:00 2001
From: "thiago.penido" <thiago.penido@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 25 Sep 2015 14:06:25 +0000
Subject: [PATCH] fixes bug 6615

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@48267 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../relatorios/impl/RelatorioDescontos.java          | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDescontos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDescontos.java
index 4390082f6..c347c53df 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDescontos.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDescontos.java
@@ -1,10 +1,11 @@
 package com.rjconsultores.ventaboletos.relatorios.impl;
 
 import java.sql.Connection;
-import java.sql.Date;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -13,6 +14,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
+import com.rjconsultores.ventaboletos.utilerias.DateUtil;
 import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
 
 public class RelatorioDescontos extends Relatorio {
@@ -29,16 +31,16 @@ public class RelatorioDescontos extends Relatorio {
 				Map<String, Object> parametros = relatorio.getParametros();
 				
 				Integer idPuntoVenta = (Integer) parametros.get("idPuntoVenta");
-				Date fecVentaInicial = new Date(((java.util.Date) parametros.get("fecVentaInicial")).getTime());
-				Date fecVentaFinal = new Date(((java.util.Date) parametros.get("fecVentaFinal")).getTime());
+				Timestamp fecVentaInicial = new Timestamp((DateUtil.inicioFecha((Date) parametros.get("fecVentaInicial"))).getTime());
+				Timestamp fecVentaFinal = new Timestamp((DateUtil.fimFecha((Date) parametros.get("fecVentaFinal"))).getTime());
 				String codconvenio = (String) parametros.get("codconvenio");
 				
 				String query = getQuery(idPuntoVenta, codconvenio);
 				System.out.println(query);
 				
 				NamedParameterStatement statement = new NamedParameterStatement(coneConnection, query);
-				statement.setDate("fecVentaInicial", fecVentaInicial);
-				statement.setDate("fecVentaFinal", fecVentaFinal);
+				statement.setTimestamp("fecVentaInicial", fecVentaInicial);
+				statement.setTimestamp("fecVentaFinal", fecVentaFinal);
 				if(idPuntoVenta != null) {
 					statement.setInt("idPuntoVenta", idPuntoVenta);
 				}