diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMmphDer.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMmphDer.java index 724a83b95..cd6b2ed47 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMmphDer.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMmphDer.java @@ -39,6 +39,7 @@ public class RelatorioMmphDer extends Relatorio { sql.append(" select * from ( "); sql.append(" SELECT "); sql.append(" r.DESCRUTA as linha, "); + sql.append(" r.numruta as numlinha, "); sql.append(" count( distinct b.boleto_id) as bilhete, "); sql.append(" to_char( b.fechorviaje, 'DD') as dia, "); sql.append(" r.indsentidoida as sentido, "); @@ -94,7 +95,7 @@ public class RelatorioMmphDer extends Relatorio { sql.append(" and b.MOTIVOCANCELACION_ID is null "); sql.append(" and b.INDSTATUSBOLETO = 'V' "); - sql.append(" GROUP BY r.descruta, "); + sql.append(" GROUP BY r.descruta, r.numruta, "); sql.append(" to_char(b.fechorviaje, 'DD'), "); sql.append(" r.indsentidoida, "); sql.append(" da.cantasientos, "); @@ -112,7 +113,7 @@ public class RelatorioMmphDer extends Relatorio { sql.append(" '20','21','22','23','24','25','26','27','28','29', "); sql.append(" '30','31') "); sql.append(" ) "); - sql.append(" ORDER BY linha, sentido desc"); + sql.append(" ORDER BY linha, numlinha, sentido desc"); NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString()); @@ -240,7 +241,8 @@ public class RelatorioMmphDer extends Relatorio { } } - dataResult.put("LINHA", rset.getString("linha")); + String linha = rset.getString("numlinha") +"-"+ rset.getString("linha"); + dataResult.put("LINHA", linha); dataResult.put("SENTIDO", sentido); dataResult.put("SERVICO", rset.getString("servico")); dataResult.put("HORARIO", rset.getString("horario")); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMmphDer.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMmphDer.jasper index 1197091ad..4c541cdce 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMmphDer.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMmphDer.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMmphDer.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMmphDer.jrxml index 93546da36..3693e93b1 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMmphDer.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMmphDer.jrxml @@ -1,8 +1,8 @@ - - + + - +