From 0ff2891e500dac7f3dab290d6d98213858e67cfe Mon Sep 17 00:00:00 2001 From: julio Date: Fri, 18 Sep 2015 17:20:09 +0000 Subject: [PATCH] =?UTF-8?q?Erro=20-=20Crian=C3=A7a=20Gratuidade=20(fixes?= =?UTF-8?q?=20bug=20#6629)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@47996 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioAcompanhamentoEquivalentes.java | 1 + .../impl/RelatorioLinhasHorario.java | 12 + .../impl/RelatorioOrigemDestino.java | 48 ++-- .../templates/RelatorioOrigemDestino.jasper | Bin 75533 -> 75606 bytes .../templates/RelatorioOrigemDestino.jrxml | 218 ++++++++---------- 5 files changed, 146 insertions(+), 133 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAcompanhamentoEquivalentes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAcompanhamentoEquivalentes.java index 7114d2b22..89c5562d4 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAcompanhamentoEquivalentes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAcompanhamentoEquivalentes.java @@ -394,6 +394,7 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio { sql.append(" AND BO.ACTIVO = 1 "); sql.append(" AND BO.INDSTATUSOPERACION = 'F' "); sql.append(" AND BO.MOTIVOCANCELACION_ID IS NULL OR BO.MOTIVOCANCELACION_ID = 0 "); + sql.append(" AND BO.CATEGORIA_ID <> ").append(CONSTANTE_GRATUIDADE_CRIANCA); sql.append(" GROUP BY CR.CORRIDA_ID, CR.FECCORRIDA, SUB_KM.KM "); sql.append(" ) SUB_REC "); sql.append("ORDER BY SUB_REC.FECCORRIDA "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java index bcd58f296..9aab0e6e2 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java @@ -20,12 +20,15 @@ import com.rjconsultores.ventaboletos.entidad.Ruta; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioLinhasHorarioBean; +import com.rjconsultores.ventaboletos.service.ConstanteService; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; +import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; public class RelatorioLinhasHorario extends Relatorio { private static Logger log = Logger.getLogger(RelatorioLinhasHorario.class); private List lsDadosRelatorio; + private static String CONSTANTE_GRATUIDADE_CRIANCA; public RelatorioLinhasHorario(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); @@ -34,6 +37,8 @@ public class RelatorioLinhasHorario extends Relatorio { @Override public void initDados() throws Exception { + CONSTANTE_GRATUIDADE_CRIANCA = buscarConstante("GRATUIDADE_CRIANCA"); + Connection conexao = this.relatorio.getConexao(); Map parametros = this.relatorio.getParametros(); @@ -435,6 +440,7 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(" LEFT JOIN BOLETO B ON (B.CORRIDA_ID = C.CORRIDA_ID AND B.FECCORRIDA = C.FECCORRIDA ) "); sql.append(" WHERE C.ACTIVO <> 0 AND B.ACTIVO = 1 "); sql.append(" AND B.MOTIVOCANCELACION_ID IS NULL "); + sql.append(" AND B.CATEGORIA_ID <> ").append(CONSTANTE_GRATUIDADE_CRIANCA); sql.append(" GROUP BY C.CORRIDA_ID, C.ROLOPERATIVO_ID) TB4, "); sql.append(" CORRIDA C "); sql.append("INNER JOIN "); @@ -454,6 +460,7 @@ public class RelatorioLinhasHorario extends Relatorio { sql.append(" INNER JOIN BOLETO BO ON CO.CORRIDA_ID = BO.CORRIDA_ID AND CO.FECCORRIDA = BO.FECCORRIDA "); sql.append(" WHERE BO.ACTIVO = 1 AND CO.ACTIVO <> 0 "); sql.append(" AND BO.INDSTATUSBOLETO != 'S' AND BO.MOTIVOCANCELACION_ID IS NULL "); + sql.append(" AND BO.CATEGORIA_ID <> ").append(CONSTANTE_GRATUIDADE_CRIANCA); sql.append(" AND BO.FECCORRIDA BETWEEN :DATA_INICIO AND :DATA_FINAL "); if (lsNumServico.size() > 0) { @@ -532,4 +539,9 @@ public class RelatorioLinhasHorario extends Relatorio { return sql.toString(); } + + private String buscarConstante(String nomeConstante) { + ConstanteService constanteService = (ConstanteService) AppContext.getApplicationContext().getBean("constanteService"); + return constanteService.buscarPorNomeConstante(nomeConstante).getValorconstante(); + } } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java index 68843ec8f..7eaa1ffc9 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java @@ -14,15 +14,22 @@ import java.util.Map; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.beans.PesoOperacional; +import com.rjconsultores.ventaboletos.service.ConstanteService; +import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; public class RelatorioOrigemDestino extends Relatorio { + private static String CONSTANTE_GRATUIDADE_CRIANCA; + public RelatorioOrigemDestino(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); } @Override protected void processaParametros() throws Exception { + + CONSTANTE_GRATUIDADE_CRIANCA = buscarConstante("GRATUIDADE_CRIANCA"); + String corridasIds = (String) getParametros().get("CORRIDAS_SELECIONADAS"); String empresaIds = (String) getParametros().get("EMPRESA_IDS"); String dataDe = (String) getParametros().get("DATA_DE_WHERE"); @@ -31,7 +38,7 @@ public class RelatorioOrigemDestino extends Relatorio { Boolean trechosSemMovimento = (Boolean) getParametros().get("TRECHOS_SEM_MOVIMENTO"); String sql = getSQL(empresaIds, corridasIds, dataDe, dataAte, bilhetesGratuitos, trechosSemMovimento); - + List lsPesoOperacionalRelatorio = getPesoOperacional(corridasIds, dataDe, dataAte, bilhetesGratuitos, empresaIds, trechosSemMovimento); getParametros().put("lsPesoOperacionalRelatorio", lsPesoOperacionalRelatorio); getParametros().put("SQL", sql); @@ -58,6 +65,7 @@ public class RelatorioOrigemDestino extends Relatorio { sql.append(" INNER JOIN PARADA D ON D.PARADA_ID = CA.DESTINO_ID "); sql.append(" WHERE CA.ACTIVO = 1 "); sql.append(" AND CA.MOTIVOCANCELACION_ID IS NULL "); + sql.append(" AND CA.CATEGORIA_ID <> ").append(CONSTANTE_GRATUIDADE_CRIANCA); sql.append(" AND CA.PRECIOBASE IS NOT NULL "); if (bilhetesGratuitos) { sql.append(" AND CA.PRECIOBASE >= 0 "); @@ -131,6 +139,7 @@ public class RelatorioOrigemDestino extends Relatorio { sql.append(" WHERE CA.ACTIVO = 1 "); sql.append(" AND RS.ACTIVO = 1 "); sql.append(" AND CA.MOTIVOCANCELACION_ID IS NULL "); + sql.append(" AND CA.CATEGORIA_ID <> ").append(CONSTANTE_GRATUIDADE_CRIANCA); sql.append(" AND CA.PRECIOBASE IS NOT NULL "); if (bilhetesGratuitos) { sql.append(" AND CA.PRECIOBASE >= 0 "); @@ -297,10 +306,11 @@ public class RelatorioOrigemDestino extends Relatorio { sql.append(" FROM boleto CA "); sql.append(" INNER JOIN corrida CO ON ( CO.corrida_id = CA.corrida_id AND CO.feccorrida = CA.feccorrida ) "); sql.append(" WHERE CA.activo = 1 "); - sql.append((" AND CO.EMPRESACORRIDA_ID IN (") + empresaIds + ") "); + sql.append((" AND CO.EMPRESACORRIDA_ID IN (") + empresaIds + ") "); sql.append(" AND CA.corrida_id = RESULTADO.corrida_id "); - sql.append(" AND CA.FECCORRIDA BETWEEN to_date('" + dataDe + "','dd/mm/yyyy HH24:mi:ss') AND to_date('" + dataAte + "','dd/mm/yyyy HH24:mi:ss') "); + sql.append(" AND CA.FECCORRIDA BETWEEN to_date('" + dataDe + "','dd/mm/yyyy HH24:mi:ss') AND to_date('" + dataAte + "','dd/mm/yyyy HH24:mi:ss') "); sql.append(" AND CA.motivocancelacion_id IS NULL "); + sql.append(" AND CA.CATEGORIA_ID <> ").append(CONSTANTE_GRATUIDADE_CRIANCA); sql.append(" AND CA.preciobase IS NOT NULL "); sql.append((bilhetesGratuitos ? " AND CA.PRECIOBASE >= 0 ) " : " AND CA.PRECIOBASE > 0 ) ")); sql.append(" ABSOLUTO_TOTAL_CORRIDA "); @@ -316,22 +326,26 @@ public class RelatorioOrigemDestino extends Relatorio { sql.append(" Count(*) ABSOLUTOS, "); sql.append(" Sum(CA.preciopagado) RECEITA, "); sql.append(" CA.preciobase, "); - sql.append(" TF.importetaxaembarque, "); - sql.append(" TF.importepedagio "); + sql.append(" CA.IMPORTETAXAEMBARQUE as importetaxaembarque, "); + sql.append(" CA.IMPORTEPEDAGIO as importepedagio "); sql.append(" FROM boleto CA "); sql.append(" INNER JOIN parada ORI ON ORI.parada_id = CA.origen_id "); sql.append(" INNER JOIN parada DES ON DES.parada_id = CA.destino_id "); sql.append(" INNER JOIN corrida CO ON ( CO.corrida_id = CA.corrida_id AND CO.feccorrida = CA.feccorrida ) "); sql.append(" INNER JOIN empresa EM ON EM.empresa_id = CO.empresacorrida_id "); sql.append(" INNER JOIN ruta RU ON RU.ruta_id = CO.ruta_id "); - sql.append("INNER JOIN tarifa TF ON (TF.CLASESERVICIO_ID = CO.CLASESERVICIO_ID AND TF.DESTINO_ID = CO.DESTINO_ID AND TF.ORIGEN_ID = CO.ORIGEN_ID AND TF.MARCA_ID = CO.MARCA_ID "); - sql.append("AND TF.RUTA_ID = CO.RUTA_ID)"); + sql.append(" INNER JOIN tarifa TF ON (TF.CLASESERVICIO_ID = CO.CLASESERVICIO_ID "); + sql.append(" AND TF.DESTINO_ID = CO.DESTINO_ID "); + sql.append(" AND TF.ORIGEN_ID = CO.ORIGEN_ID "); + sql.append(" AND TF.MARCA_ID = CO.MARCA_ID "); + sql.append(" AND TF.RUTA_ID = CO.RUTA_ID)"); sql.append("INNER JOIN VIGENCIA_TARIFA VT ON (TF.VIGENCIATARIFA_ID=VT.VIGENCIATARIFA_ID)"); sql.append(" WHERE CA.activo = 1 AND RU.activo = 1 AND EM.activo = 1 AND ORI.activo = 1 AND DES.activo = 1 "); sql.append((!corridasIds.equals("Todas") ? " AND CA.CORRIDA_ID IN (" + corridasIds + ") " : " ")); - sql.append((" AND CO.EMPRESACORRIDA_ID IN (") + empresaIds + ") "); - sql.append(" AND CA.FECCORRIDA BETWEEN to_date('" + dataDe + "','dd/mm/yyyy HH24:mi:ss') AND to_date('" + dataAte + "','dd/mm/yyyy HH24:mi:ss') "); + sql.append((" AND CO.EMPRESACORRIDA_ID IN (") + empresaIds + ") "); + sql.append(" AND CA.FECCORRIDA BETWEEN to_date('" + dataDe + "','dd/mm/yyyy HH24:mi:ss') AND to_date('" + dataAte + "','dd/mm/yyyy HH24:mi:ss') "); sql.append(" AND CA.motivocancelacion_id IS NULL "); + sql.append(" AND CA.CATEGORIA_ID <> ").append(CONSTANTE_GRATUIDADE_CRIANCA); sql.append(" AND CA.preciobase IS NOT NULL "); sql.append((bilhetesGratuitos ? " AND CA.PRECIOBASE >= 0 " : " AND CA.PRECIOBASE > 0 ")); sql.append(" AND CO.FECCORRIDA BETWEEN vt.FECINICIOVIGENCIA and vt.FECFINVIGENCIA"); @@ -344,8 +358,9 @@ public class RelatorioOrigemDestino extends Relatorio { sql.append(" RU.descruta, "); sql.append(" RU.indsentidoida, "); sql.append(" CA.preciobase, "); - sql.append(" TF.IMPORTETAXAEMBARQUE, "); - sql.append(" TF.IMPORTEPEDAGIO ) RESULTADO "); + sql.append(" CA.IMPORTETAXAEMBARQUE, "); + sql.append(" CA.IMPORTEPEDAGIO ) RESULTADO "); + sql.append(" INNER JOIN ruta_secuencia RS ON RS.ruta_id = RESULTADO.ruta_id "); sql.append(" INNER JOIN tramo TR ON TR.tramo_id = RS.tramo_id "); sql.append(" WHERE RS.activo = 1 AND TR.activo = 1 "); @@ -392,10 +407,11 @@ public class RelatorioOrigemDestino extends Relatorio { sql.append(" INNER JOIN parada PO ON CA.origen_id = PO.parada_id "); sql.append(" INNER JOIN parada PD ON CA.destino_id = PD.parada_id "); sql.append(" WHERE CA.activo = 1 "); - sql.append((" AND CO.EMPRESACORRIDA_ID IN (") + empresaIds + ") "); + sql.append((" AND CO.EMPRESACORRIDA_ID IN (") + empresaIds + ") "); sql.append(" AND CA.corrida_id = RESULTADO.corrida_id "); - sql.append(" AND CA.FECCORRIDA BETWEEN to_date('" + dataDe + "','dd/mm/yyyy HH24:mi:ss') AND to_date('" + dataAte + "','dd/mm/yyyy HH24:mi:ss') "); + sql.append(" AND CA.FECCORRIDA BETWEEN to_date('" + dataDe + "','dd/mm/yyyy HH24:mi:ss') AND to_date('" + dataAte + "','dd/mm/yyyy HH24:mi:ss') "); sql.append(" AND CA.motivocancelacion_id IS NULL "); + sql.append(" AND CA.CATEGORIA_ID <> ").append(CONSTANTE_GRATUIDADE_CRIANCA); sql.append(" AND CA.preciobase IS NOT NULL "); sql.append(" AND CA.preciobase = RESULTADO.preciobase "); sql.append(" AND PO.cveparada = RESULTADO.origem "); @@ -417,6 +433,7 @@ public class RelatorioOrigemDestino extends Relatorio { sql.append((" AND CO.EMPRESACORRIDA_ID IN (") + empresaIds + ") "); sql.append(" AND CA.FECCORRIDA BETWEEN to_date('" + dataDe + "','dd/mm/yyyy HH24:mi:ss') AND to_date('" + dataAte + "','dd/mm/yyyy HH24:mi:ss') "); sql.append(" AND CA.motivocancelacion_id IS NULL "); + sql.append(" AND CA.CATEGORIA_ID <> ").append(CONSTANTE_GRATUIDADE_CRIANCA); sql.append(" AND CA.preciobase IS NOT NULL "); sql.append((bilhetesGratuitos ? " AND CA.PRECIOBASE >= 0 " : " AND CA.PRECIOBASE > 0 ")); sql.append(" GROUP BY RU.ruta_id, "); @@ -518,4 +535,9 @@ public class RelatorioOrigemDestino extends Relatorio { return RelatorioOrigemDestino.this; } } + + private String buscarConstante(String nomeConstante) { + ConstanteService constanteService = (ConstanteService) AppContext.getApplicationContext().getBean("constanteService"); + return constanteService.buscarPorNomeConstante(nomeConstante).getValorconstante(); + } } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper index cf90d49e068d9a7b78f1e401f4a9203d267576fb..017b5ebb64ff372cb16779e75e8c4f341e33a00c 100644 GIT binary patch delta 11207 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml index eff91ecad..741ebb261 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml @@ -43,8 +43,8 @@ - - + + @@ -101,172 +101,166 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - - + - - + - - + - + - + - + - + - - + - - + - - + - + - + - + - + - + @@ -277,184 +271,182 @@ - + - + - + - + - + - + 0?new BigDecimal("100.00"):$V{sum_por_equivalente}]]> - + 0?new BigDecimal("100.00"):$V{sum_porc_abs}]]> - + - + - + - + - + - + - + - + - + - + - - + - - + - + - + - + - + - + - + - + - + - + @@ -464,90 +456,79 @@ - + - - + - - + - - + - - + - - + - - + - - + - + - - + - - + - - + - + - - + @@ -559,50 +540,49 @@ <band height="82" splitType="Stretch"> <staticText> - <reportElement uuid="58b5b133-43e0-42f0-a904-5cc3645d3df3" x="0" y="0" width="391" height="20"/> + <reportElement x="0" y="0" width="391" height="20" uuid="58b5b133-43e0-42f0-a904-5cc3645d3df3"/> <textElement verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <text><![CDATA[ORIGEM/DESTINO OD]]></text> </staticText> <textField pattern="dd/MM/yyyy HH:mm"> - <reportElement uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5" x="391" y="0" width="374" height="20"/> + <reportElement x="391" y="0" width="374" height="20" uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <staticText> - <reportElement uuid="bb8d0dec-2060-456e-bca1-c69d7c272fa3" x="0" y="63" width="74" height="19"/> + <reportElement x="0" y="63" width="74" height="19" uuid="bb8d0dec-2060-456e-bca1-c69d7c272fa3"/> <textElement verticalAlignment="Middle"> <font isBold="true"/> </textElement> <text><![CDATA[Serviço(s):]]></text> </staticText> <textField> - <reportElement uuid="a16eb33b-78ca-4fb4-80c2-f5c85a0d09c3" x="0" y="20" width="765" height="20"/> + <reportElement x="0" y="20" width="765" height="20" uuid="a16eb33b-78ca-4fb4-80c2-f5c85a0d09c3"/> <textElement verticalAlignment="Middle"> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA["Período: " + $P{DATA_DE} + " a " + $P{DATA_ATE}]]></textFieldExpression> </textField> <line> - <reportElement uuid="3f36efc2-5272-4015-95bb-b8efdc893b89" x="0" y="81" width="765" height="1"/> + <reportElement x="0" y="81" width="765" height="1" uuid="3f36efc2-5272-4015-95bb-b8efdc893b89"/> </line> <staticText> - <reportElement uuid="3857502f-b69a-4362-97fe-6f7a7f6ee32b" x="0" y="40" width="74" height="23"/> + <reportElement x="0" y="40" width="74" height="23" uuid="3857502f-b69a-4362-97fe-6f7a7f6ee32b"/> <textElement verticalAlignment="Middle"> <font isBold="true"/> </textElement> <text><![CDATA[Empresa(s):]]></text> </staticText> <textField> - <reportElement uuid="7f31cdf0-886d-4eef-b64c-28bc94c05b77" x="74" y="40" width="691" height="23" isPrintWhenDetailOverflows="true"/> - <textElement/> + <reportElement x="74" y="40" width="691" height="23" isPrintWhenDetailOverflows="true" uuid="7f31cdf0-886d-4eef-b64c-28bc94c05b77"/> <textFieldExpression><![CDATA[$P{EMPRESAS}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="44b1c344-61df-4dd0-b661-cae5f2f8e699" x="74" y="63" width="691" height="19" isPrintWhenDetailOverflows="true"/> + <reportElement x="74" y="63" width="691" height="19" isPrintWhenDetailOverflows="true" uuid="44b1c344-61df-4dd0-b661-cae5f2f8e699"/> <textElement> <font isBold="false" isUnderline="false" isStrikeThrough="false"/> </textElement> @@ -616,10 +596,10 @@ <pageHeader> <band height="21" splitType="Stretch"> <line> - <reportElement uuid="4f39b5b4-849a-4fe2-9365-06930866fbaa" x="0" y="20" width="763" height="1"/> + <reportElement x="0" y="20" width="763" height="1" uuid="4f39b5b4-849a-4fe2-9365-06930866fbaa"/> </line> <textField> - <reportElement uuid="6a8a0843-7236-40a3-98ae-5fbf59b4cfec" x="0" y="0" width="765" height="20"/> + <reportElement x="0" y="0" width="765" height="20" uuid="6a8a0843-7236-40a3-98ae-5fbf59b4cfec"/> <textElement textAlignment="Right"> <font isBold="true"/> </textElement> @@ -633,67 +613,65 @@ <detail> <band height="21" splitType="Stretch"> <textField> - <reportElement uuid="c45c70fb-1c4e-46a8-9a39-f804605e85b5" x="329" y="0" width="77" height="21"/> + <reportElement x="329" y="0" width="77" height="21" uuid="c45c70fb-1c4e-46a8-9a39-f804605e85b5"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{ABSOLUTOS}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="87a6161e-e6ed-4330-bbff-34a87a5fb1a6" x="108" y="0" width="41" height="21"/> + <reportElement x="108" y="0" width="41" height="21" uuid="87a6161e-e6ed-4330-bbff-34a87a5fb1a6"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{KM_TRAMO}]]></textFieldExpression> </textField> <textField pattern="#,##0.00"> - <reportElement uuid="22d22d0b-ed49-44a7-8725-c4a62b7fbb41" x="662" y="0" width="51" height="21"/> + <reportElement x="662" y="0" width="51" height="21" uuid="22d22d0b-ed49-44a7-8725-c4a62b7fbb41"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{porc_abs}]]></textFieldExpression> </textField> <textField pattern="#,##0.00"> - <reportElement uuid="5ecd33c0-2648-482f-b87a-d5197d2f193e" x="713" y="0" width="50" height="21"/> + <reportElement x="713" y="0" width="50" height="21" uuid="5ecd33c0-2648-482f-b87a-d5197d2f193e"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{por_equivalente}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="0de4edf8-49c8-49d2-b2d6-0476fb8ab3ed" x="610" y="0" width="52" height="21"/> + <reportElement x="610" y="0" width="52" height="21" uuid="0de4edf8-49c8-49d2-b2d6-0476fb8ab3ed"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{pax_km}]]></textFieldExpression> </textField> <textField pattern="#,##0.00"> - <reportElement uuid="c88714a3-010d-4e26-801d-8982acc15a19" x="406" y="0" width="64" height="21"/> + <reportElement x="406" y="0" width="64" height="21" uuid="c88714a3-010d-4e26-801d-8982acc15a19"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{RECEITA}]]></textFieldExpression> </textField> - <textField pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement uuid="3a76b131-6ebf-4234-a367-ba5e1527886a" x="193" y="0" width="77" height="21"/> + <textField pattern="###0.00;-###0.00" isBlankWhenNull="true"> + <reportElement x="193" y="0" width="77" height="21" uuid="3a76b131-6ebf-4234-a367-ba5e1527886a"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{IMPORTETAXAEMBARQUE}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> - <reportElement uuid="32534bbc-2bf6-4786-b5cd-e68c4062d3ec" x="270" y="0" width="59" height="21"/> + <textField pattern="###0.00;-###0.00" isBlankWhenNull="true"> + <reportElement x="270" y="0" width="59" height="21" uuid="32534bbc-2bf6-4786-b5cd-e68c4062d3ec"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{IMPORTEPEDAGIO}]]></textFieldExpression> </textField> <textField pattern="#,##0.00"> - <reportElement uuid="0fe8352f-f787-46b6-adcb-e8dda60b4d9d" x="470" y="0" width="66" height="21"/> + <reportElement x="470" y="0" width="66" height="21" uuid="0fe8352f-f787-46b6-adcb-e8dda60b4d9d"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{rec_abs}]]></textFieldExpression> </textField> <textField pattern="#,##0.00"> - <reportElement uuid="5ad372c0-5127-4441-aae3-be6ca2949a93" x="536" y="0" width="74" height="21"/> + <reportElement x="536" y="0" width="74" height="21" uuid="5ad372c0-5127-4441-aae3-be6ca2949a93"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{equivalente}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="b3bae3e1-ad19-4ed0-8188-b4700f493c28" x="1" y="0" width="58" height="21"/> - <textElement/> + <reportElement x="1" y="0" width="58" height="21" uuid="b3bae3e1-ad19-4ed0-8188-b4700f493c28"/> <textFieldExpression><![CDATA[$F{ORIGEM}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="e3a13390-06e7-4bda-bb55-8afbfb15d6fb" x="59" y="0" width="49" height="21"/> - <textElement/> + <reportElement x="59" y="0" width="49" height="21" uuid="e3a13390-06e7-4bda-bb55-8afbfb15d6fb"/> <textFieldExpression><![CDATA[$F{DESTINO}]]></textFieldExpression> </textField> - <textField> - <reportElement uuid="9fef3b4f-3c79-4b11-8702-0f4c5757b81e" x="149" y="0" width="44" height="21"/> + <textField pattern="###0.00;-###0.00"> + <reportElement x="149" y="0" width="44" height="21" uuid="9fef3b4f-3c79-4b11-8702-0f4c5757b81e"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{PRECIOBASE}]]></textFieldExpression> </textField>