diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java
index eebc39855..78f6780c6 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java
@@ -47,13 +47,13 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas {
sql.append("select ");
sql.append(" trunc(co.feccorrida) as data_corrida, ");
- sql.append(" trunc(bo.fechorviaje) as data, ");
+ sql.append(" trunc(co.fechorsalida) as data, ");
sql.append(" r.descruta as linha, ");
sql.append(" r.numruta as codlinha, ");
sql.append(" co.corrida_id as servico, ");
sql.append(" case when ((ori.indvisibleinternet is null or ori.indvisibleinternet = 1) ");
sql.append(" and (des.indvisibleinternet is null or des.indvisibleinternet = 1)) then 'SIM' else 'NÃO' end as internet, ");
- sql.append(" bo.fechorviaje as horario, ");
+ sql.append(" co.fechorsalida as horario, ");
sql.append(" ori.descparada as origem, ");
sql.append(" des.descparada as destino, ");
sql.append(" cs.descclase as classe, ");
@@ -68,8 +68,8 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas {
sql.append(" join corrida_tramo ct on ct.corrida_id = bo.corrida_id and bo.feccorrida = ct.feccorrida and ct.origen_id = bo.origen_id ");
sql.append(" join ruta r on co.ruta_id = r.ruta_id ");
sql.append(" left join empresa e on e.empresa_id = bo.empresacorrida_id ");
- sql.append(" join parada ori on ori.parada_id = bo.origen_id ");
- sql.append(" join parada des on des.parada_id = bo.destino_id ");
+ sql.append(" join parada ori on ori.parada_id = co.origen_id ");
+ sql.append(" join parada des on des.parada_id = co.destino_id ");
sql.append(" join clase_servicio cs on cs.claseservicio_id = co.claseservicio_id ");
sql.append(" join rol_operativo ro on ro.roloperativo_id = co.roloperativo_id ");
sql.append(" join diagrama_autobus da on ro.diagramaautobus_id = da.diagramaautobus_id ");
@@ -99,7 +99,7 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas {
sql.append(" ) ");
}
- sql.append("group by trunc(co.feccorrida), trunc(bo.fechorviaje), r.descruta, r.numruta, co.corrida_id, ");
+ sql.append("group by co.feccorrida, co.fechorsalida, r.descruta, r.numruta, co.corrida_id, ");
sql.append(" case when ((ori.indvisibleinternet is null or ori.indvisibleinternet = 1) ");
sql.append(" and (des.indvisibleinternet is null or des.indvisibleinternet = 1)) then 'SIM' else 'NÃO' end, ");
sql.append(" bo.fechorviaje, ori.descparada, des.descparada, cs.descclase, ");
@@ -109,8 +109,8 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas {
sql.append(" ), nao_vendidos as ( ");
- sql.append(" SELECT co.FECHORSALIDA AS data_corrida, ");
- sql.append(" co.FECHORSALIDA AS data, ");
+ sql.append(" SELECT TRUNC(co.FECHORSALIDA) AS data_corrida, ");
+ sql.append(" TRUNC(co.FECHORSALIDA) AS data, ");
sql.append(" r.descruta AS linha, ");
sql.append(" r.numruta AS codlinha, ");
sql.append(" co.corrida_id AS servico, ");
@@ -122,7 +122,7 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas {
sql.append("THEN 'SIM' ");
sql.append("ELSE 'NÃO' ");
sql.append("END AS internet, ");
- sql.append("co.FECCORRIDA AS horario, ");
+ sql.append("co.FECHORSALIDA AS horario, ");
sql.append("ori.descparada AS origem, ");
sql.append(" des.descparada AS destino, ");
sql.append(" cs.descclase AS classe, ");
@@ -156,6 +156,7 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas {
sql.append(" WHERE ct.activo = 1 ");
sql.append(" and co.activo = 1 ");
sql.append(" and co.FECHORSALIDA >= :DATA_INICIAL and co.FECHORSALIDA <= :DATA_FINAL ");
+ sql.append(" and co.CORRIDA_ID not in (select servico from vendidos ) ");
if (parametros.get("HORA_INICIAL") != null && parametros.get("HORA_FINAL") != null) {
sql.append(" AND ");
@@ -174,8 +175,12 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas {
sql.append(" ) ");
}
- sql.append(" )select * from ( ");
- sql.append(" select * from vendidos v union select * from nao_vendidos ) order by empresa ");
+ sql.append(" )select ");
+ sql.append(" DATA_CORRIDA, DATA, LINHA, CODLINHA, SERVICO, INTERNET, HORARIO, ORIGEM, DESTINO, CLASSE, CAPACIDADE, SUM(OCUPACAO) OCUPACAO, TIPO_SERVICO, PLATAFORMA, EMPRESA, SENTIDO ");
+ sql.append(" from ( ");
+ sql.append(" select * from vendidos v union select * from nao_vendidos ) ");
+ sql.append(" GROUP BY DATA_CORRIDA, DATA, LINHA, CODLINHA, SERVICO, INTERNET, HORARIO, ORIGEM, DESTINO, CLASSE, CAPACIDADE, OCUPACAO, TIPO_SERVICO, PLATAFORMA, EMPRESA, SENTIDO ");
+ sql.append(" order by empresa ");
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString());
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDetalhadoNovoLayout.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDetalhadoNovoLayout.jasper
index 24558e6a7..342dd39f1 100644
Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDetalhadoNovoLayout.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDetalhadoNovoLayout.jasper differ
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDetalhadoNovoLayout.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDetalhadoNovoLayout.jrxml
index 73cc6fd88..687d5930b 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDetalhadoNovoLayout.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDetalhadoNovoLayout.jrxml
@@ -76,14 +76,14 @@
-
+
-
+
@@ -91,7 +91,7 @@
-
+
@@ -99,7 +99,7 @@
-
+
@@ -107,7 +107,7 @@
-
+
@@ -115,7 +115,7 @@
-
+
@@ -123,7 +123,7 @@
-
+
@@ -131,7 +131,7 @@
-
+
@@ -139,7 +139,7 @@
-
+
@@ -154,11 +154,11 @@
-
+
-
+
@@ -190,63 +190,63 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -260,18 +260,18 @@
-
+
-
+
-
+