diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.java index 5c0633f71..16f8667aa 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.java @@ -10,6 +10,7 @@ import java.util.Map; import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; public class RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout extends Relatorio { @@ -67,6 +68,7 @@ public class RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout extends String origem = map.get("origem").toString(); String destino = map.get("destino").toString(); String numRuta = map.get("numRuta").toString(); + BigDecimal tarifa = (BigDecimal) map.get("tarifa"); Long ida = (Long) map.get("totalida"); Long volta = (Long) map.get("totalvolta"); @@ -74,7 +76,7 @@ public class RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout extends if (origem.equals(rset.getString("destino")) && destino.equals(rset.getString("origem")) - && numRuta.equals(rset.getString("numRuta"))) { + && numRuta.equals(rset.getString("numRuta")) && (tarifa != null && MoneyHelper.isIgual(tarifa, rset.getBigDecimal("tarifa")))) { agrupar = true; if (ida == 0) { map.put("totalida", rset.getLong("totalida")); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.jasper index b131a64e3..21eb2b2e0 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.jrxml index 3eb0094c9..53b8644d7 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioQuadroDemonstrativoMovimentoPassageirosNovoLayout.jrxml @@ -1,8 +1,8 @@ - - - - + + + + @@ -42,144 +42,168 @@ <band height="176" splitType="Stretch"> <staticText> - <reportElement mode="Transparent" x="0" y="0" width="570" height="41" forecolor="#000000" backcolor="#FFFFFF"/> - <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> + <reportElement uuid="48387206-d35a-46c3-92bc-7337730b5b29" mode="Transparent" x="0" y="0" width="555" height="41" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="16" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <paragraph lineSpacing="Single"/> </textElement> <text><![CDATA[QUADRO DEMONSTRATIVO DO MOVIMENTO DE PASSAGEIROS]]></text> </staticText> <textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false"> - <reportElement mode="Transparent" x="654" y="0" width="95" height="25" forecolor="#000000" backcolor="#FFFFFF"/> - <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> + <reportElement uuid="08f1d92b-4dee-433a-b066-f1b568988bce" mode="Transparent" x="654" y="0" width="95" height="25" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement textAlignment="Left" 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"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[new java.util.Date()]]></textFieldExpression> + <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="false"> - <reportElement mode="Transparent" x="570" y="25" width="84" height="16" forecolor="#000000" backcolor="#FFFFFF"/> - <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" lineSpacing="Single" markup="none"> + <reportElement uuid="98b19fb9-fbbf-4a0d-972d-4984bfba62b0" mode="Transparent" x="555" y="25" width="99" 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"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA["Página " + $V{PAGE_NUMBER}+ " de " + $V{PAGE_NUMBER}]]></textFieldExpression> + <textFieldExpression><![CDATA["Página " + $V{PAGE_NUMBER}+ " de " + $V{PAGE_NUMBER}]]></textFieldExpression> </textField> <line> - <reportElement x="-1" y="48" width="750" height="1"/> + <reportElement uuid="0ef26664-c3c7-4239-b964-4dd4c07dc70e" x="-1" y="48" width="750" height="1"/> </line> <line> - <reportElement positionType="Float" x="-1" y="160" width="750" height="1"/> + <reportElement uuid="75af562f-9dac-46dc-8b06-1e50896893d0" positionType="Float" x="-1" y="160" width="750" height="1"/> </line> <staticText> - <reportElement x="-1" y="49" width="63" height="22"/> - <textElement lineSpacing="Single"> + <reportElement uuid="8816e3ed-08fc-44c4-9b5c-90065a97ea1f" x="-1" y="49" width="78" height="22"/> + <textElement> <font isBold="true"/> + <paragraph lineSpacing="Single"/> </textElement> <text><![CDATA[Empresa:]]></text> </staticText> <textField> - <reportElement x="62" y="49" width="509" height="22"/> - <textElement lineSpacing="Single"/> - <textFieldExpression class="java.lang.String"><![CDATA[$P{EMPRESA}]]></textFieldExpression> + <reportElement uuid="e4dcbf34-9a95-47d4-9d85-ef9c75ed8270" x="77" y="49" width="577" height="22"/> + <textElement> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[$P{EMPRESA}]]></textFieldExpression> </textField> <textField> - <reportElement x="0" y="71" width="251" height="20"/> - <textElement lineSpacing="Single"> + <reportElement uuid="bbfa56eb-b0e4-4ce8-95ec-03fa5fecdaa5" x="0" y="71" width="306" height="20"/> + <textElement> <font isBold="true"/> + <paragraph lineSpacing="Single"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA["Período: " + $P{DATA_DE} + " a " + $P{DATA_ATE}]]></textFieldExpression> + <textFieldExpression><![CDATA["Período: " + $P{DATA_DE} + " a " + $P{DATA_ATE}]]></textFieldExpression> </textField> <staticText> - <reportElement x="0" y="133" width="50" height="20"/> - <textElement lineSpacing="Single"> + <reportElement uuid="09cdf961-cdc2-4062-94e2-241e21a728b5" x="0" y="133" width="50" height="20"/> + <textElement> <font isBold="true"/> + <paragraph lineSpacing="Single"/> </textElement> <text><![CDATA[Linha:]]></text> </staticText> <textField> - <reportElement x="150" y="133" width="425" height="20"/> - <textElement lineSpacing="Single"/> - <textFieldExpression class="java.lang.String"><![CDATA[$P{DESC_LINHAS_SELECIONADAS}]]></textFieldExpression> + <reportElement uuid="70f366bb-2104-429a-8899-66f853c0f260" x="150" y="133" width="405" height="20"/> + <textElement> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[$P{DESC_LINHAS_SELECIONADAS}]]></textFieldExpression> </textField> <staticText> - <reportElement x="0" y="91" width="77" height="20"/> - <textElement lineSpacing="Single"> + <reportElement uuid="2284285a-4769-4bc9-b48d-ea18d3a2b726" x="0" y="91" width="77" height="20"/> + <textElement> <font isBold="true"/> + <paragraph lineSpacing="Single"/> </textElement> <text><![CDATA[Tipo de Data:]]></text> </staticText> <staticText> - <reportElement x="77" y="91" width="73" height="20"/> - <textElement lineSpacing="Single"> + <reportElement uuid="6650b65f-2a11-4a23-8afd-c1b2a46c2e47" x="77" y="91" width="73" height="20"/> + <textElement> <font isBold="false"/> + <paragraph lineSpacing="Single"/> </textElement> <text><![CDATA[SERVIÇO]]></text> </staticText> <staticText> - <reportElement x="0" y="111" width="77" height="20"/> - <textElement lineSpacing="Single"> + <reportElement uuid="251da91e-5f8e-452d-9ed9-4414e4d88cc5" x="0" y="111" width="77" height="20"/> + <textElement> <font isBold="true"/> + <paragraph lineSpacing="Single"/> </textElement> <text><![CDATA[Lugar Ofer:]]></text> </staticText> <textField isBlankWhenNull="true"> - <reportElement x="77" y="113" width="498" height="20"/> - <textElement lineSpacing="Single"/> - <textFieldExpression class="java.lang.String"><![CDATA[$P{CANTASIENTOS}]]></textFieldExpression> + <reportElement uuid="c023bf07-8aa7-4848-a922-a556dd64c576" x="77" y="113" width="478" height="20"/> + <textElement> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[$P{CANTASIENTOS}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement x="50" y="133" width="100" height="20"/> - <textElement lineSpacing="Single"/> - <textFieldExpression class="java.lang.String"><![CDATA[$P{LINHAS}]]></textFieldExpression> + <reportElement uuid="379fb4cf-7160-4ed9-b230-c5613786e420" x="50" y="133" width="100" height="20"/> + <textElement> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[$P{LINHAS}]]></textFieldExpression> </textField> </band> - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + @@ -188,101 +212,114 @@ - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - - + + + - + - - + + +