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

fixed bug#13111 

qua:Renato
dev:Valdir

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@88429 d1611594-4594-4d17-8e1d-87c2c4800839
master
frederico 2019-01-02 16:54:29 +00:00
parent f081aa271d
commit 7a1376ca8a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,10 +162,11 @@ public class RelatorioGratuidadeARTESP extends Relatorio {
sql.append("THEN 1 ELSE 0 ");
sql.append("END AS DESISTENCIA, ");
sql.append(" (COALESCE(T.PRECIO, 0) + COALESCE(T.IMPORTEPEDAGIO,0)) ");
sql.append("-(COALESCE(b.PRECIOPAGADO, 0) + COALESCE(b.IMPORTEPEDAGIO,0)) AS vlrGratuidade ");
sql.append("-(COALESCE(b.PRECIOPAGADO, 0) + COALESCE(b.IMPORTEPEDAGIO,0)) AS vlrGratuidade ");
sql.append("FROM BOLETO b ");
sql.append("JOIN categoria ca ON b.categoria_id = ca.categoria_id ");
sql.append("JOIN empresa e ON e.empresa_id = b.EMPRESACORRIDA_ID ");
sql.append("JOIN marca m ON m.EMPRESA_ID = e.EMPRESA_ID ");
sql.append("JOIN parada ori ON ori.parada_id = b.origen_id ");
sql.append("JOIN parada des ON des.parada_id = b.destino_id ");
sql.append("JOIN ruta r ON r.ruta_id = b.ruta_id ");
@ -173,7 +174,7 @@ public class RelatorioGratuidadeARTESP extends Relatorio {
sql.append("LEFT JOIN CLIENTE_DIRECCION cd ON cd.cliente_id = c.cliente_id ");
sql.append("JOIN ORGAO_CONCEDENTE OC ON r.ORGAOCONCEDENTE_ID = OC.ORGAOCONCEDENTE_ID ");
sql.append("JOIN ORGAO_EMP_PARAM O ON e.empresa_id = O.EMPRESA_ID AND OC.ORGAOCONCEDENTE_ID = O.ORGAOCONCEDENTE_ID AND O.ACTIVO = 1 ");
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 ");
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 o.ORGAOCONCEDENTE_ID = T.ORGAOCONCEDENTE_ID ");
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 T.ACTIVO = 1 ");