From 7ef534ce22c574ebadca557f93bfeffb6723d527 Mon Sep 17 00:00:00 2001 From: valdir Date: Thu, 20 Dec 2018 18:13:36 +0000 Subject: [PATCH] =?UTF-8?q?0013057:=20GLPI=2011506=20-=20Relat=C3=B3rio=20?= =?UTF-8?q?de=20Demanda=20bug#13057=20dev:gleimar=20qua:?= 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@88208 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioDemandasDetalhado.java | 2 +- .../relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhado.java index 8f80644d1..70262973a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhado.java @@ -230,7 +230,7 @@ public class RelatorioDemandasDetalhado extends RelatorioDemandas { if (parametros.get("TIPO_SERVICO") != null) { sql.append(" AND c.TIPOSERVICIO_ID = :TIPO_SERVICO "); } - sql.append(" and (c.corrida_id) not in (select (ve.SERVICO) from vendidos ve) "); + sql.append(" and (c.corrida_id, c.feccorrida) not in (select SERVICO, data from vendidos ) "); sql.append(" ) "); sql.append(" select * from ( "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java index 8eb3c5567..2556afbe6 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java @@ -172,7 +172,7 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { sql.append((parametros.get("PARADA_ID") != null) ? " and ori.parada_id =:PARADA_ID " : ""); sql.append((parametros.get("TIPO_SERVICO") != null) ? " and ts.tiposervicio_id = :TIPO_SERVICO " : ""); - sql.append(" and co.CORRIDA_ID not in (select servico from vendidos ) "); + sql.append(" and (co.CORRIDA_ID, co.feccorrida) not in (select servico, data_corrida from vendidos ) "); sql.append(" and co.activo = 1 and ct.activo = 1 and r.activo = 1 and e.activo = 1 and ori.activo = 1 and des.activo = 1 and "); sql.append(" cs.activo = 1 and ro.activo = 1 and da.activo = 1 and ts.activo = 1 ");