diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java index e5841969a..2d0579871 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java @@ -5,14 +5,12 @@ package com.rjconsultores.ventaboletos.relatorios.impl; import java.sql.Connection; import java.sql.ResultSet; -import java.sql.Timestamp; -import java.util.Date; +import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; -import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; /** @@ -30,11 +28,13 @@ public class RelatorioEstornoCartao extends Relatorio { Connection conexao = this.relatorio.getConexao(); Map parametros = this.relatorio.getParametros(); String sql = getSql(); - + SimpleDateFormat sdfDiaMesAno = new SimpleDateFormat("dd/MM/yyyy"); + SimpleDateFormat sdfDiaMesAnoHora = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss"); + NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); - stmt.setTimestamp("data_inicial", new Timestamp(DateUtil.inicioFecha((Date) parametros.get("DATA_INICIAL")).getTime())); - stmt.setTimestamp("data_final", new Timestamp(DateUtil.fimFecha((Date) parametros.get("DATA_FINAL")).getTime())); + stmt.setTimestamp("data_inicial", new java.sql.Timestamp(sdfDiaMesAnoHora.parse(sdfDiaMesAno.format(parametros.get("DATA_INICIAL")) + " 00:00:00").getTime())); + stmt.setTimestamp("data_final", new java.sql.Timestamp(sdfDiaMesAnoHora.parse(sdfDiaMesAno.format(parametros.get("DATA_FINAL")) + " 23:59:59").getTime())); stmt.setInt("empresaId", Integer.valueOf(parametros.get("EMPRESA_ID") + "")); if (parametros.get("DOCUMENTO_CPF") != null && parametros.get("DOCUMENTO_CPF") != "") { stmt.setString("documentoCPF", parametros.get("DOCUMENTO_CPF").toString());