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

fixes bug#19081 

dev: Thiago Clemente
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@101704 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabio 2020-05-20 19:19:28 +00:00
parent 23e0b28a3b
commit f412de083f
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeAGER.java
View File

@ -181,6 +181,7 @@ public class RelatorioGratuidadeAGER extends Relatorio {
sql.append("INNER JOIN VIGENCIA_TARIFA vt ON vt.VIGENCIATARIFA_ID = t.VIGENCIATARIFA_ID AND b.FECHORVIAJE BETWEEN vt.FECINICIOVIGENCIA AND vt.FECFINVIGENCIA ");
sql.append("WHERE b.MOTIVOCANCELACION_ID IS NULL ");
sql.append("AND b.fechorventa BETWEEN :fecInicioVenda AND :fecFinalVenda ");
sql.append("AND (b.MOTIVOCANCELACION_ID not in (4) or b.MOTIVOCANCELACION_ID is null) ");
if (tipoGratu != null) {
sql.append(" AND b.CATEGORIA_ID in (").append(tipoGratu).append(") ");

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

@ -171,6 +171,8 @@ public class RelatorioGratuidadeANTT extends Relatorio {
sb.append("JOIN VIGENCIA_TARIFA vt ON vt.VIGENCIATARIFA_ID = t.VIGENCIATARIFA_ID ");
sb.append("AND b.FECHORVIAJE BETWEEN vt.FECINICIOVIGENCIA AND vt.FECFINVIGENCIA ");
sb.append("WHERE b.fechorventa BETWEEN :fecInicioVenda AND :fecFinalVenda ");
sb.append("AND (b.MOTIVOCANCELACION_ID not in (4) or b.MOTIVOCANCELACION_ID is null) ");
if( tipoGratu != null ) {
sb.append(" AND b.CATEGORIA_ID in (").append(tipoGratu).append(") ");
}

1
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeARTESP.java
View File

@ -210,6 +210,7 @@ public class RelatorioGratuidadeARTESP extends Relatorio {
sql.append("JOIN TARIFA T ON r.RUTA_ID = T.RUTA_ID AND b.ORIGEN_ID = T.ORIGEN_ID AND b.DESTINO_ID = T.DESTINO_ID AND b.CLASESERVICIO_ID = T.CLASESERVICIO_ID AND m.MARCA_ID = T.MARCA_ID AND oc.ORGAOCONCEDENTE_ID = T.ORGAOCONCEDENTE_ID ");
sql.append("JOIN VIGENCIA_TARIFA vt ON vt.VIGENCIATARIFA_ID = t.VIGENCIATARIFA_ID AND b.FECHORVIAJE BETWEEN vt.FECINICIOVIGENCIA AND vt.FECFINVIGENCIA ");
sql.append("WHERE b.fechorventa BETWEEN to_date(:fecInicioVenda,'dd/mm/yyyy hh24:mi') AND to_date(:fecFinalVenda,'dd/mm/yyyy hh24:mi') ");
sql.append("AND (b.MOTIVOCANCELACION_ID not in (4) or b.MOTIVOCANCELACION_ID is null) ");
if (tipoGratu != null) {
sql.append(" AND b.CATEGORIA_ID in (").append(tipoGratu).append(") ");