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

fixes bug#24234 

dev: Wallace
qua: 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@112129 d1611594-4594-4d17-8e1d-87c2c4800839
master
celio 2022-05-04 14:47:22 +00:00
parent 5f8eb16013
commit 1e90f4a6ac
1 changed files with 64 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.java
View File

@ -112,67 +112,78 @@ public class RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout extends
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append(" SELECT DISTINCT "); sql.append(" SELECT DISTINCT ");
sql.append(" sum(b.preciopagado + b.importepedagio) as totalReceita, "); sql.append(" sum(b.preciopagado + b.importepedagio) as totalReceita, ");
sql.append(" tar.precio as tarifa, "); sql.append(" tar.precio as tarifa, ");
sql.append(" e.nombempresa empresa, "); sql.append(" e.nombempresa empresa, ");
sql.append(" r.descruta linha, "); sql.append(" r.descruta linha, ");
sql.append(" r.NUMRUTA, "); sql.append(" r.NUMRUTA, ");
sql.append(" ori.descparada AS origem, "); sql.append(" ori.descparada AS origem, ");
sql.append(" des.descparada AS destino, "); sql.append(" des.descparada AS destino, ");
sql.append(" MAX(tr.CANTKMREAL) as km, "); sql.append(" MAX(tr.CANTKMREAL) as km, ");
sql.append(" COUNT( DISTINCT "); sql.append(" COUNT( DISTINCT ");
sql.append(" CASE "); sql.append(" CASE ");
sql.append(" WHEN(r.indsentidoida = 1) THEN b.boleto_id "); sql.append(" WHEN(r.indsentidoida = 1) THEN b.boleto_id ");
sql.append(" ELSE NULL "); sql.append(" ELSE NULL ");
sql.append(" END "); sql.append(" END ");
sql.append(" ) AS totalida, "); sql.append(" ) AS totalida, ");
sql.append(" COUNT( DISTINCT "); sql.append(" COUNT( DISTINCT ");
sql.append(" CASE "); sql.append(" CASE ");
sql.append(" WHEN(r.indsentidoida = 0) THEN b.boleto_id "); sql.append(" WHEN(r.indsentidoida = 0) THEN b.boleto_id ");
sql.append(" ELSE NULL "); sql.append(" ELSE NULL ");
sql.append(" END "); sql.append(" END ");
sql.append(" ) AS totalvolta, "); sql.append(" ) AS totalvolta, ");
sql.append(" rc.rutacombinacion_id rutaCombinacionId "); sql.append(" rc.rutacombinacion_id rutaCombinacionId ");
sql.append(" FROM "); sql.append(" FROM ");
sql.append(" boleto b "); sql.append(" boleto b ");
sql.append(" JOIN empresa e ON e.empresa_id = b.empresacorrida_id "); sql.append(" JOIN empresa e ON ( e.empresa_id = b.empresacorrida_id ) ");
sql.append(" JOIN marca m ON m.empresa_id = b.empresacorrida_id "); sql.append(" JOIN marca m ON ( m.empresa_id = b.empresacorrida_id ) ");
sql.append(" JOIN categoria ca ON b.categoria_id = ca.categoria_id "); sql.append(" JOIN categoria ca ON ( b.categoria_id = ca.categoria_id ) ");
sql.append(" JOIN parada ori ON ori.parada_id = b.origen_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 parada des ON ( des.parada_id = b.destino_id ) ");
sql.append(" JOIN ruta r ON r.ruta_id = b.ruta_id "); sql.append(" JOIN ruta r ON (r.ruta_id = b.ruta_id ) ");
sql.append(" JOIN RUTA_COMBINACION rc ON rc.ruta_id = r.ruta_id and rc.activo = 1 "); sql.append(" JOIN RUTA_COMBINACION rc ON ( rc.ruta_id = r.ruta_id and rc.activo = 1 ) ");
sql.append(" INNER JOIN tramo tr ON tr.TRAMO_ID =rc.TRAMO_ID AND tr.ORIGEN_ID = ori.PARADA_ID AND tr.DESTINO_ID = des.PARADA_ID AND tr.ACTIVO = 1 "); sql.append(" INNER JOIN tramo tr ON ( tr.TRAMO_ID = rc.TRAMO_ID ");
sql.append(" JOIN clase_servicio cs ON (b.claseservicio_id = cs.claseservicio_id ) "); sql.append(" AND tr.ORIGEN_ID = ori.PARADA_ID ");
sql.append(" INNER JOIN vigencia_tarifa vt ON b.fechorventa BETWEEN vt.feciniciovigencia AND vt.fecfinvigencia AND vt.activo = 1 "); sql.append(" AND tr.DESTINO_ID = des.PARADA_ID ");
sql.append(" INNER JOIN tarifa tar ON (tar.ruta_id = b.ruta_id "); sql.append(" AND tr.ACTIVO = 1 ) ");
sql.append(" AND tar.marca_id = m.marca_id "); sql.append(" JOIN clase_servicio cs ON ( b.claseservicio_id = cs.claseservicio_id ) ");
sql.append(" AND tar.claseservicio_id = b.claseservicio_id "); sql.append(" INNER JOIN vigencia_tarifa vt ON ( b.fechorventa BETWEEN vt.feciniciovigencia ");
sql.append(" AND tar.vigenciatarifa_id = vt.vigenciatarifa_id "); sql.append(" AND vt.fecfinvigencia ");
sql.append(" AND tar.origen_id = b.origen_id "); sql.append(" AND vt.activo = 1 ) ");
sql.append(" AND tar.destino_id = b.destino_id "); sql.append(" INNER JOIN tarifa tar ON ( tar.ruta_id = b.ruta_id ");
sql.append(" AND tar.TRAMO_ID = tr.TRAMO_ID "); sql.append(" AND tar.marca_id = m.marca_id ");
sql.append("AND tar.activo = 1 ) "); sql.append(" AND tar.claseservicio_id = b.claseservicio_id ");
sql.append(" WHERE b.empresacorrida_id IN :empresa_id "); sql.append(" AND tar.vigenciatarifa_id = vt.vigenciatarifa_id ");
sql.append(" AND tar.origen_id = b.origen_id ");
sql.append(" AND tar.destino_id = b.destino_id ");
sql.append(" AND tar.TRAMO_ID = tr.TRAMO_ID ");
sql.append(" AND tar.activo = 1 ) ");
sql.append(" INNER JOIN corrida_tramo ct ON (tr.tramo_id = ct.tramo_id ");
sql.append(" AND b.corrida_id = ct.corrida_id ");
sql.append(" AND ct.activo =1 ) ");
sql.append(" WHERE b.empresacorrida_id IN :empresa_id ");
sql.append(" AND b.motivocancelacion_id is null "); sql.append(" AND b.motivocancelacion_id is null ");
if (linhasIds) { if (linhasIds) {
sql.append(" AND r.NUMRUTA = :linhas_id "); sql.append(" AND r.NUMRUTA = :linhas_id ");
} }
sql.append(" AND b.feccorrida BETWEEN :dataIni AND :dataFim "); sql.append(" AND b.feccorrida BETWEEN :dataIni AND :dataFim ");
sql.append(" GROUP BY "); sql.append(" GROUP BY ");
sql.append(" tar.precio, "); sql.append(" tar.precio, ");
sql.append(" e.nombempresa, "); sql.append(" e.nombempresa, ");
sql.append(" r.descruta, "); sql.append(" r.descruta, ");
sql.append(" r.numruta, "); sql.append(" r.numruta, ");
sql.append(" ori.descparada, "); sql.append(" ori.descparada, ");
sql.append(" des.descparada, rc.rutacombinacion_id "); sql.append(" des.descparada, ");
sql.append(" ORDER BY "); sql.append(" rc.rutacombinacion_id, ");
sql.append(" r.descruta, "); sql.append(" ct.numsecuencia ");
sql.append(" rc.rutacombinacion_id "); sql.append(" ORDER BY ");
sql.append(" ct.numsecuencia, ");
sql.append(" r.descruta, ");
sql.append(" rc.rutacombinacion_id ");
return sql.toString(); return sql.toString();
} }