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

fixes bug#23365 

qua:
dev:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@109068 d1611594-4594-4d17-8e1d-87c2c4800839
master
aristides 2021-10-13 14:16:17 +00:00
parent e978c18935
commit f7a9416f2a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,6 +154,8 @@ public class RelatorioGratuidadeANTT extends Relatorio {
sb.append("JOIN parada ori ON ori.parada_id = b.origen_id ");
sb.append("JOIN parada des ON des.parada_id = b.destino_id ");
sb.append("JOIN ruta r ON r.ruta_id = b.ruta_id ");
sb.append("JOIN ruta_combinacion rc ON rc.ruta_id = r.ruta_id ");
sb.append("JOIN tramo tr on (tr.tramo_id=rc.tramo_id and ori.parada_id=tr.origen_id and des.parada_id=tr.destino_id) ");
sb.append("LEFT JOIN cliente c ON c.cliente_id = b.cliente_id ");
sb.append("LEFT JOIN CLIENTE_DIRECCION cd ON cd.cliente_id = c.cliente_id ");
sb.append("AND cd.ACTIVO = 1 ");
@ -163,10 +165,11 @@ public class RelatorioGratuidadeANTT extends Relatorio {
sb.append("AND b.DESTINO_ID = T.DESTINO_ID ");
sb.append("AND b.CLASESERVICIO_ID = T.CLASESERVICIO_ID ");
sb.append("AND m.MARCA_ID = T.MARCA_ID ");
sb.append("AND tr.tramo_id = T.TRAMO_ID ");
sb.append("AND oc.ORGAOCONCEDENTE_ID = T.ORGAOCONCEDENTE_ID ");
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("WHERE m.activo=1 and rc.activo=1 and tr.activo=1 and b.fechorventa BETWEEN :fecInicioVenda AND :fecFinalVenda ");
sb.append("AND (b.MOTIVOCANCELACION_ID not in (4) or b.MOTIVOCANCELACION_ID is null) ");
if( tipoGratu != null ) {