From 921e5af78a403ff1ee8ffb34d9c962652f5c2ac5 Mon Sep 17 00:00:00 2001 From: frederico Date: Fri, 27 May 2016 20:16:30 +0000 Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#7394=20-=20corre=C3=A7=C3=A3o=20?= =?UTF-8?q?data=20de=20checkin,=20Relat=C3=B3rio=20de=20Checkin?= 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@56438 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/relatorios/impl/RelatorioCheckin.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckin.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckin.java index dcd8c4824..7588f8606 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckin.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckin.java @@ -14,6 +14,7 @@ import org.apache.commons.lang.StringUtils; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Checkin; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; public class RelatorioCheckin extends Relatorio { @@ -31,6 +32,8 @@ public class RelatorioCheckin extends Relatorio { String idsBilheteiros = (String) getParametros().get("IDS_BILHETEIROS"); Date fecInicio = (Date) getParametros().get("DATA_INICIAL"); Date fecFinal = (Date) getParametros().get("DATA_FINAL"); + fecInicio = DateUtil.inicioFecha(fecInicio); + fecFinal = DateUtil.fimFecha(fecFinal); if (StringUtils.isNotBlank(idsBilheteiros)) { String []ls = idsBilheteiros.split(","); @@ -101,7 +104,7 @@ public class RelatorioCheckin extends Relatorio { sql.append("inner join parada o on b.origen_id = o.parada_id "); sql.append("inner join usuario u on b.usuario_id = u.usuario_id "); sql.append(" where b.activo = 1 "); - sql.append("and b.feccorrida between ? and ? "); + sql.append("and bc.FECMODIF between ? and ? "); sql.append(corridaId == null ? "" : " and b.corrida_id = ? "); sql.append(origenId == null ? "" : " and b.origen_id = ? "); sql.append((lsInt == null || lsInt.size() == 0) ? "" : " and u.USUARIO_ID in ( "+ createIn(lsInt.size()) + ") ");