From 170881b2af7bbc4da9870620c3a02840870a6fa5 Mon Sep 17 00:00:00 2001 From: leonardo Date: Mon, 14 Jul 2014 14:25:57 +0000 Subject: [PATCH] =?UTF-8?q?OCD=20-=20Relat=C3=B3rio=20de=20perfil=20restri?= =?UTF-8?q?to=20com=20as=20OCD's=20n=C3=A3o=20resgatadas=20(por=20empresa)?= =?UTF-8?q?=20(fixed=20bug=20#5432)?= 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@36534 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioOCDNaoResgatadaEmpresa.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOCDNaoResgatadaEmpresa.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOCDNaoResgatadaEmpresa.java index 5a45fbd66..c85900d59 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOCDNaoResgatadaEmpresa.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOCDNaoResgatadaEmpresa.java @@ -39,8 +39,8 @@ public class RelatorioOCDNaoResgatadaEmpresa extends Relatorio { ResultSet rset = null; SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss"); - stmt.setDate("fecInicio", new java.sql.Date(sdf.parse(fecInicio).getTime())); - stmt.setDate("fecFinal", new java.sql.Date(sdf.parse(fecFinal).getTime())); + stmt.setTimestamp("fecInicio", new java.sql.Timestamp(sdf.parse(fecInicio).getTime())); + stmt.setTimestamp("fecFinal", new java.sql.Timestamp(sdf.parse(fecFinal).getTime())); if (empresaId != null){ stmt.setInt("empresaId", empresaId); } @@ -101,6 +101,7 @@ public class RelatorioOCDNaoResgatadaEmpresa extends Relatorio { sql.append("join punto_venta p on p.puntoventa_id = o.puntoventa_id "); sql.append("left join punto_venta pp on pp.puntoventa_id = o.puntoventapago_id "); sql.append("where o.fecpago is null and o.fecpagar between :fecInicio and :fecFinal "); + sql.append("and o.activo = 1 and o.indpago = 0 "); if (empresaId != null){ sql.append("and e.empresa_id = :empresaId "); }