From a3dd24d88dbef8148f2730a108f1b4332b7a8bb8 Mon Sep 17 00:00:00 2001 From: celio Date: Wed, 30 Oct 2024 17:22:36 -0300 Subject: [PATCH] fixes bug#AL-4968 --- pom.xml | 2 +- .../relatorios/impl/RelatorioW2ITaxaEmbarqueAnalitico.java | 4 +++- .../relatorios/impl/RelatorioW2ITaxaEmbarqueSintetico.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index ec580ac4e..a5a4f7b12 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.166.1 + 1.166.2 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2ITaxaEmbarqueAnalitico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2ITaxaEmbarqueAnalitico.java index a7af3b428..330c67053 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2ITaxaEmbarqueAnalitico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2ITaxaEmbarqueAnalitico.java @@ -57,6 +57,8 @@ public class RelatorioW2ITaxaEmbarqueAnalitico extends Relatorio { stmt.setDate("DATA_INICIAL", dataInicial); stmt.setDate("DATA_FINAL", dataFinal); + stmt.setDate("DATA_INICIAL_CANCEL",dataInicial); + stmt.setDate("DATA_FINAL_CANCEL", dataFinal); if (empresaID != null) stmt.setInt("EMPRESA_ID", empresaID); @@ -169,7 +171,7 @@ public class RelatorioW2ITaxaEmbarqueAnalitico extends Relatorio { sql.append("INNER JOIN parada pd ON pd.parada_id=b.destino_id "); sql.append("INNER JOIN CIUDAD co ON co.ciudad_id=po.ciudad_id "); sql.append("INNER JOIN CIUDAD cd ON cd.ciudad_id=pd.ciudad_id "); - sql.append("WHERE b.fechorventa BETWEEN :DATA_INICIAL AND :DATA_FINAL "); + sql.append("WHERE TO_DATE(sx.DATACANCELAMENTO ,'ddMMyy') BETWEEN :DATA_INICIAL_CANCEL AND :DATA_FINAL_CANCEL "); sql.append("AND sx.indcancelado = 1 "); if(empresaID != null) sql.append("AND em.empresa_id = :EMPRESA_ID "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2ITaxaEmbarqueSintetico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2ITaxaEmbarqueSintetico.java index dfb2da11e..b8c78a22b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2ITaxaEmbarqueSintetico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2ITaxaEmbarqueSintetico.java @@ -133,7 +133,7 @@ public class RelatorioW2ITaxaEmbarqueSintetico extends Relatorio { sql.append(" INNER JOIN parada pd ON pd.parada_id=b.destino_id "); sql.append(" INNER JOIN CIUDAD co ON co.ciudad_id=po.ciudad_id "); sql.append(" INNER JOIN CIUDAD cd ON cd.ciudad_id=pd.ciudad_id "); - sql.append(" WHERE TO_DATE(sx.DATAVENDA ,'ddMMyyyy') BETWEEN :DATA_INICIAL AND :DATA_FINAL "); + sql.append(" WHERE b.fechorventa BETWEEN :DATA_INICIAL AND :DATA_FINAL "); sql.append(" AND sx.ACTIVO = 1 "); sql.append(" AND em.empresa_id = COALESCE(:EMPRESA_ID, em.empresa_id) "); sql.append(" AND po.parada_id = COALESCE(:ORIGEN_ID, po.parada_id) ");