From 1b250c9a54cfee0ae5ff23983257b2a27369463f Mon Sep 17 00:00:00 2001 From: Fabio Faria Date: Mon, 8 May 2023 16:52:37 -0300 Subject: [PATCH] =?UTF-8?q?Implementa=C3=A7=C3=A3o=20de=20campos=20no=20re?= =?UTF-8?q?latorio=20tabela=20de=20pre=C3=A7o=20feat=20#AL-2351?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../relatorios/impl/RelatorioTabelaPreco.java | 14 +- .../RelatorioTabelaPreco_es.properties | 3 + .../RelatorioTabelaPreco_pt_BR.properties | 3 + .../templates/RelatorioTabelaPreco.jasper | Bin 46502 -> 50595 bytes .../templates/RelatorioTabelaPreco.jrxml | 139 +++++++++++++----- 6 files changed, 117 insertions(+), 44 deletions(-) diff --git a/pom.xml b/pom.xml index 7de7e1051..cb27f7cac 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.4.0 + 1.4.1 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java index 92b491d60..6b9be26e0 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java @@ -53,7 +53,10 @@ public class RelatorioTabelaPreco extends Relatorio { dataResult.put("destino", rset.getString("destino")); dataResult.put("aliasorigem", rset.getString("aliasorigem")); dataResult.put("aliasdestino", rset.getString("aliasdestino")); + dataResult.put("origemid", rset.getString("origemid")); + dataResult.put("destinoid", rset.getString("destinoid")); dataResult.put("tarifa", rset.getBigDecimal("tarifa")); + dataResult.put("tarifaoriginal", rset.getBigDecimal("tarifaoriginal")); dataResult.put("pedagio", rset.getBigDecimal("pedagio")); dataResult.put("taxaEmbarque", rset.getBigDecimal("taxaEmbarque")); dataResult.put("outros", rset.getBigDecimal("outros")); @@ -67,6 +70,7 @@ public class RelatorioTabelaPreco extends Relatorio { dataResult.put("dataVigenciaFinal", rset.getDate("dataVigenciaFinal")); dataResult.put("idLinha", rset.getInt("idLinha")); dataResult.put("idVigencia", rset.getInt("idVigencia")); + dataResult.put("kmreal", rset.getString("kmReal")); dataResult.put("orgao", rset.getString("orgao")); this.dados.add(dataResult); @@ -98,16 +102,19 @@ public class RelatorioTabelaPreco extends Relatorio { StringBuilder sql = new StringBuilder(); if (isLayoutArtesp) { - sql.append("SELECT DISTINCT origem,destino,tarifa,pedagio,taxaEmbarque,outros,tipoClasse,empresa,kmReal FROM ("); + sql.append("SELECT dados.* FROM ("); } - sql.append(" SELECT "); + sql.append(" SELECT DISTINCT "); sql.append(" po.cveparada as cveorigem, "); sql.append(" pd.cveparada as cvedestino, "); sql.append(" po.DESCPARADA as origem, "); sql.append(" pd.DESCPARADA as destino, "); sql.append(" pos.DESCPARADA as aliasorigem, "); sql.append(" pds.DESCPARADA as aliasdestino, "); + sql.append(" po.parada_id as origemid, "); + sql.append(" pd.parada_id as destinoid, "); sql.append(" COALESCE(t.precio,0) as tarifa, "); + sql.append(" coalesce(t.preciooriginal, 0) AS tarifaoriginal, "); sql.append(" COALESCE(t.IMPORTEPEDAGIO, 0) as pedagio, "); sql.append(" COALESCE(t.IMPORTETAXAEMBARQUE, 0) as taxaEmbarque, "); sql.append(" COALESCE(t.IMPORTESEGURO, 0) as seguro, "); @@ -119,7 +126,6 @@ public class RelatorioTabelaPreco extends Relatorio { sql.append(" vt.FECINICIOVIGENCIA as dataVigenciaInicial, "); sql.append(" vt.FECFINVIGENCIA as dataVigenciaFinal, "); sql.append(" vt.VIGENCIATARIFA_ID as idVigencia, "); - sql.append(" vt.FECINICIOVIGENCIA as dataVigenciaInicial, "); sql.append(" r.RUTA_ID as idLinha, "); sql.append(" tr.CANTKMREAL as kmReal, "); sql.append(" o.descorgao as orgao "); @@ -175,7 +181,7 @@ public class RelatorioTabelaPreco extends Relatorio { sql.append(" ORDER BY r.DESCRUTA, vt.FECINICIOVIGENCIA"); if (isLayoutArtesp) { - sql.append(") ORDER BY origem,destino"); + sql.append(") dados ORDER BY origem,destino"); } return sql.toString(); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPreco_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPreco_es.properties index 37510b651..ce5742704 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPreco_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPreco_es.properties @@ -18,6 +18,7 @@ label.destino=Destino label.origemalias=Origem Alias label.destinoalias=Destino Alias label.tarifa=Tarifa +label.tarifaoriginal =Tari. Orig. label.pedagio=Pedágio label.taxaEmbarque=Taxa label.seguro=Seguro @@ -30,5 +31,7 @@ label.dataVigencia=Vig label.total=Total label.totalSeg=Total c/ Seg label.cve=CVE +label.id=ID +label.km=KM label.prefixo=Prefixo: label.orgacaoConcedente=Orgão Concedente: \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPreco_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPreco_pt_BR.properties index 37510b651..ce5742704 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPreco_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPreco_pt_BR.properties @@ -18,6 +18,7 @@ label.destino=Destino label.origemalias=Origem Alias label.destinoalias=Destino Alias label.tarifa=Tarifa +label.tarifaoriginal =Tari. Orig. label.pedagio=Pedágio label.taxaEmbarque=Taxa label.seguro=Seguro @@ -30,5 +31,7 @@ label.dataVigencia=Vig label.total=Total label.totalSeg=Total c/ Seg label.cve=CVE +label.id=ID +label.km=KM label.prefixo=Prefixo: label.orgacaoConcedente=Orgão Concedente: \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jasper index 44e7cb8db6a53ac4ee13b5e57363c54860f0788c..e519ea2cf558c1763427c65a2b4255b82b670cab 100644 GIT binary patch literal 50595 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 YXXDe|%!B<)^61_SY)YWE*Ti8A~H;u%wYkBU=W{ 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

V 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 R%TSwq7Q$b$MQ_E4|3Bz(n7RM} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jrxml index 28f281dad..4b8d4de0e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jrxml @@ -1,8 +1,8 @@ - - + + - + @@ -44,6 +44,10 @@ + + + + - + - + - + - + - + - + - + @@ -133,7 +137,7 @@ - + @@ -163,7 +167,7 @@ - + @@ -171,7 +175,7 @@ - + @@ -196,34 +200,63 @@ - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -233,7 +266,7 @@ <band height="67"> <textField pattern="" isBlankWhenNull="false"> - <reportElement uuid="0f6ea959-18ce-45fc-be6c-a814a0476c4e" mode="Transparent" x="963" y="15" width="270" height="16" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement uuid="0f6ea959-18ce-45fc-be6c-a814a0476c4e" mode="Transparent" x="1164" y="15" width="270" height="16" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> @@ -249,7 +282,7 @@ <textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="false"> - <reportElement uuid="ad4046fb-5ef4-410f-85a5-17cca2f7cf4c" stretchType="RelativeToBandHeight" mode="Transparent" x="963" y="31" width="296" height="15" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement uuid="ad4046fb-5ef4-410f-85a5-17cca2f7cf4c" stretchType="RelativeToBandHeight" mode="Transparent" x="1164" y="31" width="296" height="15" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> @@ -257,14 +290,14 @@ <textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO_NOME}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="1e11c007-fe9f-4ae1-b7dd-5b3574ef9cee" x="963" y="0" width="214" height="15"/> + <reportElement uuid="1e11c007-fe9f-4ae1-b7dd-5b3574ef9cee" x="1164" y="0" width="214" height="15"/> <textElement textAlignment="Right"> <font size="9" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="9eee37bf-9dc9-441c-96f7-01562efffce8" x="0" y="46" width="1259" height="21"/> + <reportElement uuid="9eee37bf-9dc9-441c-96f7-01562efffce8" x="32" y="46" width="1428" height="21"/> <box leftPadding="2"> <topPen lineWidth="0.75"/> <bottomPen lineWidth="0.75"/> @@ -275,7 +308,7 @@ <textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false"> - <reportElement uuid="d925825f-4cfd-4dd0-8088-20a6810f1a48" mode="Transparent" x="1179" y="0" width="80" height="15" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement uuid="d925825f-4cfd-4dd0-8088-20a6810f1a48" mode="Transparent" x="1380" y="0" width="80" height="15" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> @@ -283,7 +316,7 @@ <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField evaluationTime="Report" pattern="" isBlankWhenNull="false"> - <reportElement uuid="27212e2f-7312-4bd4-b218-d9aef0e24a14" mode="Transparent" x="1233" y="15" width="26" height="16" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement uuid="27212e2f-7312-4bd4-b218-d9aef0e24a14" mode="Transparent" x="1434" y="15" width="26" height="16" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> @@ -295,77 +328,77 @@ <detail> <band height="17" splitType="Stretch"> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="4a0efda0-b112-4092-8164-292ab7fb1950" x="40" y="1" width="150" height="15"/> + <reportElement uuid="4a0efda0-b112-4092-8164-292ab7fb1950" x="74" y="1" width="150" height="15"/> <textElement textAlignment="Left"> <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="f544e769-3f8c-4200-86ed-01f6c4024334" x="230" y="1" width="150" height="15"/> + <reportElement uuid="f544e769-3f8c-4200-86ed-01f6c4024334" x="298" y="1" width="150" height="15"/> <textElement textAlignment="Left"> <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement uuid="b81fcb18-2337-4514-be27-fe7d3c88acc5" x="474" y="1" width="65" height="15"/> + <reportElement uuid="b81fcb18-2337-4514-be27-fe7d3c88acc5" x="608" y="1" width="65" height="15"/> <textElement textAlignment="Right"> <font size="9"/> </textElement> - <textFieldExpression><![CDATA[$F{tarifa}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{tarifaoriginal}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement uuid="8a545d22-875e-46cd-8011-444a8e884bca" x="539" y="1" width="65" height="15"/> + <reportElement uuid="8a545d22-875e-46cd-8011-444a8e884bca" x="738" y="1" width="65" height="15"/> <textElement textAlignment="Right"> <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement uuid="6f76912d-0eef-439c-9fb8-236181d94033" x="669" y="1" width="65" height="15"/> + <reportElement uuid="6f76912d-0eef-439c-9fb8-236181d94033" x="868" y="1" width="65" height="15"/> <textElement textAlignment="Right"> <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{outros}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement uuid="ac958e4e-b8ad-4abc-b58a-1aaca4992db6" x="604" y="1" width="65" height="15"/> + <reportElement uuid="ac958e4e-b8ad-4abc-b58a-1aaca4992db6" x="803" y="1" width="65" height="15"/> <textElement textAlignment="Right"> <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{taxaEmbarque}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement uuid="72858663-765d-4843-bc51-ec6a80a0b7d0" x="815" y="1" width="65" height="15"/> + <reportElement uuid="72858663-765d-4843-bc51-ec6a80a0b7d0" x="1014" y="1" width="65" height="15"/> <textElement textAlignment="Right"> <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{seguro}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="11f32d65-9824-47f6-95f5-482cce626d4b" x="380" y="1" width="94" height="15"/> + <reportElement uuid="11f32d65-9824-47f6-95f5-482cce626d4b" x="482" y="1" width="126" height="15"/> <textElement textAlignment="Center"> <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{tipoClasse}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement uuid="722229cf-1b78-459d-92fc-1a30615054a2" x="880" y="1" width="83" height="15"/> + <reportElement uuid="722229cf-1b78-459d-92fc-1a30615054a2" x="1079" y="1" width="83" height="15"/> <textElement textAlignment="Right"> <font size="9"/> </textElement> <textFieldExpression><![CDATA[$V{totalgeral}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="0966b1d4-66b6-4e84-b2a6-644808edae46" x="1112" y="1" width="149" height="15"/> + <reportElement uuid="0966b1d4-66b6-4e84-b2a6-644808edae46" x="1311" y="1" width="149" height="15"/> <textElement textAlignment="Center"> <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{aliasdestino}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="d2d3da3e-b81c-4812-8bc1-42762136be8d" x="963" y="1" width="149" height="15"/> + <reportElement uuid="d2d3da3e-b81c-4812-8bc1-42762136be8d" x="1162" y="1" width="149" height="15"/> <box leftPadding="1"/> <textElement textAlignment="Center"> <font size="9"/> @@ -380,25 +413,53 @@ <textFieldExpression><![CDATA[$F{cveorigem}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="909ed476-9b33-47c7-be4d-c72ea5746f99" x="190" y="1" width="40" height="15"/> + <reportElement uuid="909ed476-9b33-47c7-be4d-c72ea5746f99" x="224" y="1" width="40" height="15"/> <textElement textAlignment="Left"> <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{cvedestino}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement uuid="1c762c23-20a3-4164-ba71-96dfbca0e47f" x="734" y="1" width="81" height="15"/> + <reportElement uuid="1c762c23-20a3-4164-ba71-96dfbca0e47f" x="933" y="1" width="81" height="15"/> <textElement textAlignment="Right"> <font size="9"/> </textElement> <textFieldExpression><![CDATA[$V{totalbilhete}]]></textFieldExpression> </textField> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement uuid="6d520501-02bb-4a32-bc37-6dd492385df9" x="40" y="1" width="34" height="15"/> + <textElement textAlignment="Left"> + <font size="9"/> + </textElement> + <textFieldExpression><![CDATA[$F{origemid}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement uuid="f55ff12a-4cfe-4282-bdc0-24099ef44875" x="264" y="1" width="34" height="15"/> + <textElement textAlignment="Left"> + <font size="9"/> + </textElement> + <textFieldExpression><![CDATA[$F{destinoid}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> + <reportElement uuid="165538d2-ca46-497c-9be7-4e4a679a0dd6" x="673" y="1" width="65" height="15"/> + <textElement textAlignment="Right"> + <font size="9"/> + </textElement> + <textFieldExpression><![CDATA[$F{tarifa}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement uuid="37126179-d4c3-4189-8245-3f348338df1e" x="448" y="1" width="34" height="15"/> + <textElement textAlignment="Left"> + <font size="9"/> + </textElement> + <textFieldExpression><![CDATA[$F{kmreal}]]></textFieldExpression> + </textField> </band> </detail> <noData> <band height="28"> <textField> - <reportElement uuid="6f13c961-dd50-4e44-ba73-65e0752b8b83" x="-1" y="0" width="1261" height="28"/> + <reportElement uuid="6f13c961-dd50-4e44-ba73-65e0752b8b83" x="-1" y="0" width="1429" height="28"/> <textElement textAlignment="Center" markup="none"> <font size="12" isBold="true"/> </textElement>