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

fixes bug#14567 

dev:lucas

qua: 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@94775 d1611594-4594-4d17-8e1d-87c2c4800839
master
lucas.taia 2019-06-19 00:58:33 +00:00
parent 0132c055e9
commit 201203044c
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,8 +205,7 @@ public class RelatorioGratuidadeARTESP extends Relatorio {
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 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 AND m.MARCA_ID = T.MARCA_ID AND o.ORGAOCONCEDENTE_ID = T.ORGAOCONCEDENTE_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("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("WHERE b.fechorventa BETWEEN :fecInicioVenda AND :fecFinalVenda ");
sql.append("AND b.fechorventa BETWEEN :fecInicioVenda AND :fecFinalVenda ");
if (tipoGratu != null) { if (tipoGratu != null) {
sql.append(" AND b.CATEGORIA_ID in (").append(tipoGratu).append(") "); sql.append(" AND b.CATEGORIA_ID in (").append(tipoGratu).append(") ");