From ceb182b295a74ff91b3d2ee2cdb5d336ad29b5ed Mon Sep 17 00:00:00 2001 From: "daniel.zauli" Date: Thu, 14 Dec 2017 19:15:32 +0000 Subject: [PATCH] fixes bug #10327 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@77320 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioDemandasDetalhadoNovoLayout.java | 4 +- ...elatorioDemandasDetalhadoNovoLayout.jasper | Bin 36599 -> 37281 bytes ...RelatorioDemandasDetalhadoNovoLayout.jrxml | 66 +++++++++--------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java index 78f6780c6..6a2a9fcf8 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDemandasDetalhadoNovoLayout.java @@ -102,7 +102,7 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { sql.append("group by co.feccorrida, co.fechorsalida, r.descruta, r.numruta, co.corrida_id, "); sql.append(" case when ((ori.indvisibleinternet is null or ori.indvisibleinternet = 1) "); sql.append(" and (des.indvisibleinternet is null or des.indvisibleinternet = 1)) then 'SIM' else 'NÃO' end, "); - sql.append(" bo.fechorviaje, ori.descparada, des.descparada, cs.descclase, "); + sql.append(" ori.descparada, des.descparada, cs.descclase, "); sql.append(" da.cantasientos, ts.descservicio, ct.plataforma, e.nombempresa, r.INDSENTIDOIDA "); sql.append("order by e.nombempresa, data, linha, servico, origem, destino "); @@ -180,7 +180,7 @@ public class RelatorioDemandasDetalhadoNovoLayout extends RelatorioDemandas { sql.append(" from ( "); sql.append(" select * from vendidos v union select * from nao_vendidos ) "); sql.append(" GROUP BY DATA_CORRIDA, DATA, LINHA, CODLINHA, SERVICO, INTERNET, HORARIO, ORIGEM, DESTINO, CLASSE, CAPACIDADE, OCUPACAO, TIPO_SERVICO, PLATAFORMA, EMPRESA, SENTIDO "); - sql.append(" order by empresa "); + sql.append(" order by empresa, servico "); NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString()); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDetalhadoNovoLayout.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDemandasDetalhadoNovoLayout.jasper index 342dd39f1bcab88336c61493cfe7920ed5a37dbc..f4967d28fe698b1e182426e1c970024d5c58281f 100644 GIT binary patch delta 9550 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 delta 8292 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 - +