fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug#AL-4968

master
celio 2024-10-30 17:22:36 -03:00
parent 5337d43026
commit a3dd24d88d
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.166.1</version>
<version>1.166.2</version>
<packaging>war</packaging>
<properties>

4
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2ITaxaEmbarqueAnalitico.java
View File

@ -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 ");

2
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioW2ITaxaEmbarqueSintetico.java
View File

@ -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) ");