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

fixes bug#24776 

dev: Gleison
qua: 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@113694 d1611594-4594-4d17-8e1d-87c2c4800839
master
celio 2022-08-04 13:56:01 +00:00
parent 5f34b8a9a5
commit cb9ae111e6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java
View File

@ -70,6 +70,7 @@ public class RelatorioAproveitamentoFinanceiro extends Relatorio {
sql.append(" select * from ( "); sql.append(" select * from ( ");
sql.append(" SELECT "); sql.append(" SELECT ");
sql.append(" r.DESCRUTA as linha, "); sql.append(" r.DESCRUTA as linha, ");
sql.append(" r.NUMRUTA as numLinha, ");
sql.append(" r.ruta_id as rutaid, "); sql.append(" r.ruta_id as rutaid, ");
sql.append(" count( c.boleto_id) as passageiros, "); sql.append(" count( c.boleto_id) as passageiros, ");
sql.append(" sum( coalesce(c.preciopagado, 0) )as valor, "); sql.append(" sum( coalesce(c.preciopagado, 0) )as valor, ");
@ -106,7 +107,7 @@ public class RelatorioAproveitamentoFinanceiro extends Relatorio {
} }
sql.append(" and c.MOTIVOCANCELACION_ID is null "); sql.append(" and c.MOTIVOCANCELACION_ID is null ");
sql.append(" GROUP by r.DESCRUTA, r.ruta_id, r.indsentidoida, da.cantasientos, "); sql.append(" GROUP by r.DESCRUTA, r.ruta_id, r.indsentidoida, r.NUMRUTA, da.cantasientos, ");
sql.append(" to_char( co.FECCORRIDA, 'D'), TO_CHAR(co.fechorsalidaoriginal ,'HH24:mi'), "); sql.append(" to_char( co.FECCORRIDA, 'D'), TO_CHAR(co.fechorsalidaoriginal ,'HH24:mi'), ");
sql.append(" co.CORRIDA_ID "); sql.append(" co.CORRIDA_ID ");
sql.append(" ORDER by r.DESCRUTA, r.indsentidoida desc, to_char( co.FECCORRIDA, 'D') "); sql.append(" ORDER by r.DESCRUTA, r.indsentidoida desc, to_char( co.FECCORRIDA, 'D') ");
@ -135,6 +136,7 @@ public class RelatorioAproveitamentoFinanceiro extends Relatorio {
Map<String, Object> dataResult = new HashMap<String, Object>(); Map<String, Object> dataResult = new HashMap<String, Object>();
dataResult.put("LINHA", rset.getString("linha")); dataResult.put("LINHA", rset.getString("linha"));
dataResult.put("NUMLINHA", rset.getString("numLinha"));
dataResult.put("SENTIDO", rset.getString("sentido")); dataResult.put("SENTIDO", rset.getString("sentido"));
dataResult.put("SERVICO", rset.getString("servico")); dataResult.put("SERVICO", rset.getString("servico"));
dataResult.put("HORARIO", rset.getString("horario")); dataResult.put("HORARIO", rset.getString("horario"));