fixes bug#22503
qua: dev: 1 - As duplicidades encontradas, na verdade eram de serviços diferentes com trechos diferentes. Foi incluído no relatorio o campo de serviço, origem, destino para uma identificação melhor dos registros no relatório. 2 - Foi acertado algumas células mescladas na exportação para o excel. 3 - Foi incluído o prefixo junto à descrição da linha. Segue evidencia do excel em anexo. git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@108081 d1611594-4594-4d17-8e1d-87c2c4800839master
walace
parent
01519ad290
commit
e20e487cf5
|
|
@ -117,7 +117,7 @@ public class RelatorioIndiceIRK extends Relatorio {
|
|||
private String getSql(Integer rutaId, Integer grupoRutaId, String rutaIds, String corridasIds) {
|
||||
String TODOS = "TODOS";
|
||||
StringBuilder sql = new StringBuilder();
|
||||
sql.append(" SELECT ");
|
||||
sql.append(" SELECT distinct");
|
||||
sql.append(" servico,");
|
||||
sql.append(" rutaid,");
|
||||
sql.append(" descruta,");
|
||||
|
|
@ -133,7 +133,10 @@ public class RelatorioIndiceIRK extends Relatorio {
|
|||
sql.append(" ( SUM(passagens) + SUM(pedagio) + SUM(txembarque) + SUM(seguro) ) AS totalhorario,");
|
||||
sql.append(" round(((SUM(passagens) + SUM(pedagio) + SUM(txembarque) + SUM(seguro)) / extensao), 2) AS irk, ");
|
||||
sql.append(" indiceirkminimo * extensao AS receitaminima,");
|
||||
sql.append(" (SUM(passagens) + SUM(pedagio) + SUM(txembarque) + SUM(seguro) ) - ( indiceirkminimo * extensao ) AS diferencareceita ");
|
||||
sql.append(" (SUM(passagens) + SUM(pedagio) + SUM(txembarque) + SUM(seguro) ) - ( indiceirkminimo * extensao ) AS diferencareceita, ");
|
||||
sql.append(" origem, ");
|
||||
sql.append(" destino, ");
|
||||
sql.append(" prefixo ");
|
||||
sql.append(" FROM ");
|
||||
sql.append(" ( ");
|
||||
sql.append(" SELECT ");
|
||||
|
|
@ -149,7 +152,10 @@ public class RelatorioIndiceIRK extends Relatorio {
|
|||
sql.append(" cj.importeseguro AS seguro, ");
|
||||
sql.append(" cj.importetaxaembarque AS txembarque, ");
|
||||
sql.append(" cj.importepedagio AS pedagio, ");
|
||||
sql.append(" cj.preciopagado AS passagens ");
|
||||
sql.append(" cj.preciopagado AS passagens, ");
|
||||
sql.append(" origen.descparada as origem, ");
|
||||
sql.append(" destino.descparada as destino, ");
|
||||
sql.append(" r.prefixo as prefixo ");
|
||||
sql.append(" FROM ");
|
||||
sql.append(" caja cj ");
|
||||
sql.append(" INNER JOIN ruta r ON ( cj.ruta_id = r.ruta_id ) ");
|
||||
|
|
@ -162,6 +168,8 @@ public class RelatorioIndiceIRK extends Relatorio {
|
|||
sql.append(" INNER JOIN marca m ON ( cj.marca_id = m.marca_id ");
|
||||
sql.append(" AND m.empresa_id = :empresaId ) ");
|
||||
sql.append(" INNER JOIN empresa e ON ( e.empresa_id = :empresaId ) ");
|
||||
sql.append("inner join parada origen on (origen.parada_id = tr.origen_id) ");
|
||||
sql.append("inner join parada destino on (destino.parada_id = tr.destino_id) ");
|
||||
sql.append(" WHERE ");
|
||||
sql.append(" cj.activo = 1 ");
|
||||
sql.append(" AND cj.motivocancelacion_id IS NULL ");
|
||||
|
|
@ -182,7 +190,10 @@ public class RelatorioIndiceIRK extends Relatorio {
|
|||
sql.append(" cj.importeseguro, ");
|
||||
sql.append(" cj.importetaxaembarque, ");
|
||||
sql.append(" cj.importepedagio, ");
|
||||
sql.append(" cj.preciopagado ");
|
||||
sql.append(" cj.preciopagado, ");
|
||||
sql.append(" origen.descparada, ");
|
||||
sql.append(" destino.descparada, ");
|
||||
sql.append(" r.prefixo ");
|
||||
sql.append(" ORDER BY ");
|
||||
sql.append(" r.descruta ");
|
||||
sql.append(" ) dados_sem_agrupamento ");
|
||||
|
|
@ -194,7 +205,10 @@ public class RelatorioIndiceIRK extends Relatorio {
|
|||
sql.append(" sentido, ");
|
||||
sql.append(" indiceirkminimo, ");
|
||||
sql.append(" hora, ");
|
||||
sql.append(" extensao ");
|
||||
sql.append(" extensao, ");
|
||||
sql.append(" origem, ");
|
||||
sql.append(" destino, ");
|
||||
sql.append(" prefixo ");
|
||||
sql.append(" order by hora ");
|
||||
return sql.toString();
|
||||
|
||||
|
|
@ -222,6 +236,10 @@ public class RelatorioIndiceIRK extends Relatorio {
|
|||
relatorioIndiceIRK.setIrk((BigDecimal) rset.getObject("irk"));
|
||||
relatorioIndiceIRK.setReceitaMinima((BigDecimal) rset.getObject("receitaminima"));
|
||||
relatorioIndiceIRK.setDiferencaReceitas((BigDecimal) rset.getObject("diferencareceita"));
|
||||
relatorioIndiceIRK.setDescOrigemTrecho((String) rset.getObject("origem"));
|
||||
relatorioIndiceIRK.setDescDestinoTrecho((String) rset.getObject("destino"));
|
||||
relatorioIndiceIRK.setPrefixoLinha((String) rset.getObject("prefixo"));
|
||||
|
||||
lsDadosRelatorio.add(relatorioIndiceIRK);
|
||||
}
|
||||
return lsDadosRelatorio;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,53 @@
|
|||
#geral
|
||||
msg.noData=Não foi possivel obter dados com os parâmetros informados.
|
||||
msg.a=à
|
||||
|
||||
#Labels header
|
||||
header.titulo.relatorio=Indice IRK
|
||||
header.periodo=Per\u00EDodo\:
|
||||
header.data.hora=Data/Hora\:
|
||||
header.pagina=P\u00E1gina\:
|
||||
header.filtro=Filtro\:
|
||||
header.filtro.servico=Servi\u00E7o\:
|
||||
header.filtro.linha=Linha\:
|
||||
header.filtro.grupo=Grupo de Linhas\:
|
||||
cabecalho.impressorPor=Impresso por
|
||||
|
||||
#Labels detail
|
||||
|
||||
detail.receita=RECEITA
|
||||
detail.viagens=VIAGENS
|
||||
detail.passageiros=PASSAGEIROS
|
||||
detail.parametrosOperacionais=PARÂMETROS OPERACIONAIS
|
||||
detail.hora=Hora
|
||||
detail.servico=Serviço
|
||||
detail.setido=Sentido
|
||||
detail.origem=Origem
|
||||
detail.destino=Destino
|
||||
detail.prefixo=Prefixo
|
||||
detail.extensao=Extensão
|
||||
detail.passagens=Passagens
|
||||
detail.seguro=Seguro
|
||||
detail.bagagens=Bagagens
|
||||
detail.segOpc=Tx. Embarque
|
||||
detail.total=Total
|
||||
detail.totalViagem=Total
|
||||
detail.km.rodad=Km Rodado
|
||||
detail.irk=IRK
|
||||
detail.rsViagem=R$/Viagem
|
||||
detail.pedagio=Pedágio
|
||||
detail.linha=Linha
|
||||
detail.irkMinimo= IRK Mínimo
|
||||
detail.receitaMinima= Receita Mínima
|
||||
detail.diferencaReceitas= Diferença de Receitas
|
||||
|
||||
|
||||
#Group
|
||||
ruta.total= Total Linha
|
||||
group.total=Total do Grupo
|
||||
sub.total=Sub Total
|
||||
total.geral=Total Geral
|
||||
|
||||
linhas=Linhas
|
||||
|
||||
|
||||
|
|
@ -22,6 +22,9 @@ detail.parametrosOperacionais=PAR
|
|||
detail.hora=Hora
|
||||
detail.servico=Serviço
|
||||
detail.setido=Sentido
|
||||
detail.origem=Origem
|
||||
detail.destino=Destino
|
||||
detail.prefixo=Prefixo
|
||||
detail.extensao=Extensão
|
||||
detail.passagens=Passagens
|
||||
detail.seguro=Seguro
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioLinhasHorario" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="ae2cbb01-bc79-4d18-8206-3b59273fe793">
|
||||
<property name="ireport.zoom" value="2.0"/>
|
||||
<property name="ireport.x" value="353"/>
|
||||
<property name="ireport.y" value="152"/>
|
||||
<property name="ireport.zoom" value="7.594996671664891"/>
|
||||
<property name="ireport.x" value="930"/>
|
||||
<property name="ireport.y" value="886"/>
|
||||
<style name="diferencaReceitaNegativa" forecolor="#000000">
|
||||
<conditionalStyle>
|
||||
<conditionExpression><![CDATA[($F{diferencaReceitas}.compareTo(BigDecimal.ZERO)) < 1]]></conditionExpression>
|
||||
|
|
@ -38,10 +38,13 @@
|
|||
<field name="passagens" class="java.math.BigDecimal"/>
|
||||
<field name="rsViagem" class="java.math.BigDecimal"/>
|
||||
<field name="descRuta" class="java.lang.String"/>
|
||||
<field name="servico" class="java.math.BigDecimal"/>
|
||||
<field name="servico" class="java.lang.Integer"/>
|
||||
<field name="irkMinimo" class="java.math.BigDecimal"/>
|
||||
<field name="receitaMinima" class="java.math.BigDecimal"/>
|
||||
<field name="diferencaReceitas" class="java.math.BigDecimal"/>
|
||||
<field name="prefixoLinha" class="java.lang.String"/>
|
||||
<field name="descDestinoTrecho" class="java.lang.String"/>
|
||||
<field name="descOrigemTrecho" class="java.lang.String"/>
|
||||
<variable name="total_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupRuta" calculation="Sum">
|
||||
<variableExpression><![CDATA[$F{total}]]></variableExpression>
|
||||
</variable>
|
||||
|
|
@ -135,62 +138,62 @@
|
|||
<textFieldExpression><![CDATA[$F{grupoRuta}]]></textFieldExpression>
|
||||
</textField>
|
||||
<line>
|
||||
<reportElement uuid="6e1204b5-dc16-40df-b592-9046e0b31a14" x="1" y="-1" width="802" height="1"/>
|
||||
<reportElement uuid="6e1204b5-dc16-40df-b592-9046e0b31a14" x="1" y="-1" width="801" height="1"/>
|
||||
</line>
|
||||
</band>
|
||||
</groupHeader>
|
||||
<groupFooter>
|
||||
<band height="14">
|
||||
<line>
|
||||
<reportElement uuid="8dd18564-6d32-4232-a0fd-f39054849109" positionType="Float" x="0" y="0" width="803" height="1"/>
|
||||
<reportElement uuid="8dd18564-6d32-4232-a0fd-f39054849109" positionType="Float" x="0" y="1" width="802" height="1"/>
|
||||
</line>
|
||||
<textField>
|
||||
<reportElement uuid="a7c33cf2-944b-4bd1-bb55-72ab698cc599" x="0" y="1" width="69" height="13"/>
|
||||
<reportElement uuid="a7c33cf2-944b-4bd1-bb55-72ab698cc599" x="0" y="2" width="69" height="11"/>
|
||||
<textElement>
|
||||
<font size="8" isBold="true" isItalic="false"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{group.total}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="27802809-5617-44e5-a89b-cc64e8bde961" x="332" y="2" width="38" height="10"/>
|
||||
<reportElement uuid="27802809-5617-44e5-a89b-cc64e8bde961" x="477" y="2" width="69" height="11"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{total_group}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="25f0464f-b216-44bd-aad1-d1b4f4dbe0ea" x="370" y="2" width="57" height="10"/>
|
||||
<reportElement uuid="25f0464f-b216-44bd-aad1-d1b4f4dbe0ea" x="546" y="2" width="57" height="11"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{kmRodado_group}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="d6bdd9c3-6810-4f3b-8b0a-6d90a8abbb2c" x="266" y="2" width="66" height="10"/>
|
||||
<reportElement uuid="d6bdd9c3-6810-4f3b-8b0a-6d90a8abbb2c" x="409" y="2" width="68" height="11"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{media_group_irk}]]></textFieldExpression>
|
||||
</textField>
|
||||
<line>
|
||||
<reportElement uuid="736a47e0-7471-44d8-98df-c61d122bf3ac" x="-1" y="13" width="802" height="1"/>
|
||||
<reportElement uuid="736a47e0-7471-44d8-98df-c61d122bf3ac" x="0" y="13" width="802" height="1"/>
|
||||
</line>
|
||||
<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="e251dac9-9a7b-4db2-a22e-18cb0efce359" x="481" y="1" width="63" height="10"/>
|
||||
<reportElement uuid="e251dac9-9a7b-4db2-a22e-18cb0efce359" x="657" y="2" width="66" height="11"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{totalReceitaMinima_group}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="0ed57298-1a00-4584-8ed1-e4c1af2947b8" x="544" y="1" width="102" height="10"/>
|
||||
<reportElement uuid="0ed57298-1a00-4584-8ed1-e4c1af2947b8" x="723" y="2" width="79" height="11"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{diferencaReceitas_group}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00;-#,##0.00">
|
||||
<reportElement uuid="bf1d2a62-1178-40bc-bb7b-30bcdf1727c0" x="427" y="4" width="54" height="10"/>
|
||||
<reportElement uuid="bf1d2a62-1178-40bc-bb7b-30bcdf1727c0" x="603" y="2" width="54" height="11"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
|
|
@ -204,11 +207,11 @@
|
|||
<groupHeader>
|
||||
<band height="14">
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="5d48a200-7033-4282-af5c-98c5b290afea" x="0" y="1" width="135" height="13"/>
|
||||
<reportElement uuid="5d48a200-7033-4282-af5c-98c5b290afea" x="0" y="0" width="203" height="14"/>
|
||||
<textElement>
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{descRuta}]]></textFieldExpression>
|
||||
<textFieldExpression><![CDATA[$F{descRuta}+ " - " + $F{prefixoLinha}]]></textFieldExpression>
|
||||
</textField>
|
||||
</band>
|
||||
</groupHeader>
|
||||
|
|
@ -218,49 +221,49 @@
|
|||
<reportElement uuid="34ef9a09-219c-47d9-aa44-4e2a5be2ffb6" positionType="Float" x="0" y="1" width="802" height="1"/>
|
||||
</line>
|
||||
<textField>
|
||||
<reportElement uuid="f83c3bc8-2151-4ca1-b06c-fa127b8f7089" x="0" y="1" width="53" height="10"/>
|
||||
<reportElement uuid="f83c3bc8-2151-4ca1-b06c-fa127b8f7089" x="0" y="2" width="69" height="9"/>
|
||||
<textElement>
|
||||
<font size="6" isBold="true" isItalic="false"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{ruta.total}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="47bdfe76-1b48-45e6-8cb1-53feb9e40340" x="332" y="3" width="38" height="8"/>
|
||||
<reportElement uuid="47bdfe76-1b48-45e6-8cb1-53feb9e40340" x="477" y="2" width="69" height="9"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{total_ruta}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="005958bd-8753-49f7-83ed-995568c33644" x="370" y="3" width="57" height="8"/>
|
||||
<reportElement uuid="005958bd-8753-49f7-83ed-995568c33644" x="546" y="2" width="57" height="9"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{kmRodado_ruta}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="abae3006-9685-42e5-952b-15321d7f0063" x="266" y="3" width="66" height="8"/>
|
||||
<reportElement uuid="abae3006-9685-42e5-952b-15321d7f0063" x="409" y="2" width="68" height="9"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{media_ruta_irk}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="56419660-3457-4fe0-8d94-162d8da7ba8f" x="544" y="2" width="102" height="9"/>
|
||||
<reportElement uuid="56419660-3457-4fe0-8d94-162d8da7ba8f" x="723" y="2" width="79" height="9"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{diferencaReceitas_ruta}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="5322dfac-066d-4943-8d06-4c43a779c289" x="481" y="2" width="63" height="9"/>
|
||||
<reportElement uuid="5322dfac-066d-4943-8d06-4c43a779c289" x="657" y="2" width="66" height="9"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{receitaMinima_ruta}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00;-#,##0.00">
|
||||
<reportElement uuid="c0069721-3330-46a5-9174-be54c6360491" x="427" y="2" width="54" height="9"/>
|
||||
<reportElement uuid="c0069721-3330-46a5-9174-be54c6360491" x="603" y="2" width="54" height="9"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
|
|
@ -326,45 +329,45 @@
|
|||
<textFieldExpression><![CDATA[$R{header.filtro} + $R{header.filtro.linha} + " ( " + $P{LINHA_FILTRO} + " ) " + $R{header.filtro.servico} + " ( " + $P{SERVICO_FILTRO} + " ) " + $R{header.filtro.grupo} + " ( " + $P{DESCGRUPO} + " ) "]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="c0f124b2-3691-4f49-9b86-69d76f249584" x="0" y="80" width="22" height="10"/>
|
||||
<reportElement uuid="c0f124b2-3691-4f49-9b86-69d76f249584" x="37" y="80" width="32" height="10"/>
|
||||
<textElement markup="none">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{detail.hora}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="30b30f3d-c4f3-40a2-825a-812ae5475414" x="203" y="80" width="63" height="11"/>
|
||||
<reportElement uuid="30b30f3d-c4f3-40a2-825a-812ae5475414" x="203" y="80" width="63" height="10"/>
|
||||
<textElement textAlignment="Center" markup="none">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{detail.setido}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="723b5317-9cfc-4722-900f-5d94c2050b39" x="332" y="80" width="38" height="11"/>
|
||||
<reportElement uuid="723b5317-9cfc-4722-900f-5d94c2050b39" x="477" y="80" width="69" height="10"/>
|
||||
<textElement textAlignment="Right" markup="none">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{detail.total}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="b97305e9-580b-4cdb-a5f2-eae59e567ec7" x="370" y="80" width="57" height="11"/>
|
||||
<reportElement uuid="b97305e9-580b-4cdb-a5f2-eae59e567ec7" x="546" y="80" width="57" height="10"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{detail.km.rodad}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField evaluationTime="Report">
|
||||
<reportElement uuid="f9fd6d4e-46da-4f69-a9bd-6e4183f317b4" x="266" y="80" width="66" height="10"/>
|
||||
<reportElement uuid="f9fd6d4e-46da-4f69-a9bd-6e4183f317b4" x="409" y="80" width="68" height="10"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{detail.irk}]]></textFieldExpression>
|
||||
</textField>
|
||||
<line>
|
||||
<reportElement uuid="b6bdef50-f793-4c23-b188-505c0fb7bf18" x="0" y="90" width="803" height="1"/>
|
||||
<reportElement uuid="b6bdef50-f793-4c23-b188-505c0fb7bf18" x="0" y="90" width="802" height="1"/>
|
||||
</line>
|
||||
<textField>
|
||||
<reportElement uuid="f7a61ca8-00fd-400d-b1c4-e22f5295941f" x="22" y="80" width="180" height="10"/>
|
||||
<reportElement uuid="f7a61ca8-00fd-400d-b1c4-e22f5295941f" x="69" y="80" width="134" height="10"/>
|
||||
<textElement markup="none">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
|
|
@ -386,26 +389,47 @@
|
|||
<textFieldExpression><![CDATA[$P{USUARIO_ID}+"-"+$P{NOME_USUARIO}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="d7da670e-b8ce-4f71-9315-40333034e9b2" x="427" y="80" width="54" height="11"/>
|
||||
<reportElement uuid="d7da670e-b8ce-4f71-9315-40333034e9b2" x="603" y="80" width="54" height="10"/>
|
||||
<textElement textAlignment="Right" markup="none">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{detail.irkMinimo}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="70957eaa-5277-457d-ab37-ba812c97a0a4" x="481" y="80" width="63" height="11"/>
|
||||
<reportElement uuid="70957eaa-5277-457d-ab37-ba812c97a0a4" x="657" y="80" width="66" height="10"/>
|
||||
<textElement textAlignment="Right" markup="none">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{detail.receitaMinima}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="fce223f2-9740-4250-9921-b9ef733b2f2c" x="544" y="80" width="102" height="10"/>
|
||||
<reportElement uuid="fce223f2-9740-4250-9921-b9ef733b2f2c" x="723" y="80" width="79" height="10"/>
|
||||
<textElement textAlignment="Right" markup="none">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{detail.diferencaReceitas}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="7ca1ae47-4562-4721-99b0-c8c9176c3ce5" x="266" y="80" width="63" height="10"/>
|
||||
<textElement textAlignment="Center" markup="none">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{detail.origem}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="0b63cf51-56d9-45f5-b7ef-60e0bbd8b3c5" x="329" y="80" width="80" height="10"/>
|
||||
<textElement textAlignment="Center" markup="none">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{detail.destino}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="9961f2c4-054b-4b99-8515-df6dbe13dd02" x="0" y="80" width="37" height="10"/>
|
||||
<textElement markup="none">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{detail.servico}]]></textFieldExpression>
|
||||
</textField>
|
||||
</band>
|
||||
</pageHeader>
|
||||
<columnHeader>
|
||||
|
|
@ -414,28 +438,21 @@
|
|||
<detail>
|
||||
<band height="11" splitType="Stretch">
|
||||
<textField pattern="#,##0.00;-#,##0.00">
|
||||
<reportElement uuid="f75ac988-7ec6-4d13-a51e-3a9f933eee66" style="diferencaReceitaNegativa" x="332" y="0" width="38" height="11"/>
|
||||
<reportElement uuid="f75ac988-7ec6-4d13-a51e-3a9f933eee66" style="diferencaReceitaNegativa" x="477" y="0" width="69" height="11"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{total}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00;-#,##0.00">
|
||||
<reportElement uuid="e1bac278-5cfb-4732-8e2d-2973b3e847e4" style="diferencaReceitaNegativa" x="370" y="0" width="57" height="11"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{kmRodado}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="ac86ec2e-f3d6-4841-b40f-7b37d53c3f04" style="diferencaReceitaNegativa" x="0" y="0" width="22" height="10"/>
|
||||
<reportElement uuid="ac86ec2e-f3d6-4841-b40f-7b37d53c3f04" style="diferencaReceitaNegativa" x="37" y="0" width="32" height="11"/>
|
||||
<textElement>
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{hora}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00;-#,##0.00">
|
||||
<reportElement uuid="8c3fd018-651e-4cb3-96da-7c33a0c8db83" style="diferencaReceitaNegativa" x="266" y="0" width="66" height="11"/>
|
||||
<reportElement uuid="8c3fd018-651e-4cb3-96da-7c33a0c8db83" style="diferencaReceitaNegativa" x="409" y="0" width="68" height="11"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
|
|
@ -449,33 +466,61 @@
|
|||
<textFieldExpression><![CDATA[$F{sentido}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="3850d6a2-d8f1-4e97-9dfb-b93b8ef5472f" style="diferencaReceitaNegativa" x="22" y="0" width="180" height="10"/>
|
||||
<reportElement uuid="3850d6a2-d8f1-4e97-9dfb-b93b8ef5472f" style="diferencaReceitaNegativa" x="69" y="0" width="134" height="11"/>
|
||||
<textElement>
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{descRuta}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="50584682-eedc-4aa4-a78a-9eb8a5b7a426" style="diferencaReceitaNegativa" x="481" y="0" width="63" height="10"/>
|
||||
<reportElement uuid="50584682-eedc-4aa4-a78a-9eb8a5b7a426" style="diferencaReceitaNegativa" x="657" y="0" width="66" height="11"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{receitaMinima}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="2abcbea0-fc74-453c-a86e-7d7e1a3c6845" style="diferencaReceitaNegativa" x="544" y="0" width="102" height="10"/>
|
||||
<reportElement uuid="2abcbea0-fc74-453c-a86e-7d7e1a3c6845" style="diferencaReceitaNegativa" x="723" y="0" width="79" height="11"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{diferencaReceitas}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00;-#,##0.00">
|
||||
<reportElement uuid="4001b02b-ebe4-437d-8a5a-3b4dfa3e247c" style="diferencaReceitaNegativa" x="427" y="0" width="54" height="10"/>
|
||||
<reportElement uuid="4001b02b-ebe4-437d-8a5a-3b4dfa3e247c" style="diferencaReceitaNegativa" x="603" y="0" width="54" height="11"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{irkMinimo}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00;-#,##0.00">
|
||||
<reportElement uuid="e1bac278-5cfb-4732-8e2d-2973b3e847e4" style="diferencaReceitaNegativa" x="546" y="0" width="57" height="11"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{kmRodado}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="d53198ea-5396-46d9-b08c-14b5f6cbbb59" style="diferencaReceitaNegativa" x="266" y="0" width="63" height="11"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{descOrigemTrecho}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="b5993294-982a-465b-af08-96cf3c54a3a1" style="diferencaReceitaNegativa" x="329" y="0" width="80" height="11"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{descDestinoTrecho}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="db659017-3127-465c-a237-45c9d808239c" style="diferencaReceitaNegativa" x="0" y="0" width="37" height="11"/>
|
||||
<textElement>
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{servico}]]></textFieldExpression>
|
||||
</textField>
|
||||
</band>
|
||||
</detail>
|
||||
<columnFooter>
|
||||
|
|
@ -490,7 +535,7 @@
|
|||
<summary>
|
||||
<band height="14" splitType="Stretch">
|
||||
<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="7bbb0c46-57d5-449b-ac94-15eba31bae5b" positionType="Float" x="332" y="1" width="38" height="10"/>
|
||||
<reportElement uuid="7bbb0c46-57d5-449b-ac94-15eba31bae5b" positionType="Float" x="477" y="0" width="69" height="14"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
|
|
@ -504,46 +549,46 @@
|
|||
<textFieldExpression><![CDATA[$R{total.geral}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="c89eabd5-2f70-4834-a49a-a44efa77b8c8" positionType="Float" x="266" y="1" width="66" height="10"/>
|
||||
<reportElement uuid="c89eabd5-2f70-4834-a49a-a44efa77b8c8" positionType="Float" x="409" y="0" width="68" height="14"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6" isBold="true" isStrikeThrough="false"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{irk_total}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="a2d7e658-d200-4e09-856c-b88cbee79521" positionType="Float" x="481" y="0" width="63" height="10"/>
|
||||
<reportElement uuid="a2d7e658-d200-4e09-856c-b88cbee79521" positionType="Float" x="657" y="0" width="66" height="14"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{receitaMinima_total}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="35ac2bb4-6e35-4eb1-8d97-85d441aadfe7" positionType="Float" x="544" y="0" width="102" height="10"/>
|
||||
<reportElement uuid="35ac2bb4-6e35-4eb1-8d97-85d441aadfe7" positionType="Float" x="723" y="0" width="79" height="14"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{diferencaReceitas_total}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="0497b315-b7d5-436d-9e66-144db5dec2c1" positionType="Float" x="370" y="0" width="57" height="11"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{kmRodado_total}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00;-#,##0.00">
|
||||
<reportElement uuid="e45e3972-83b7-43f8-8160-f5bad9d38c0e" x="427" y="0" width="54" height="10"/>
|
||||
<reportElement uuid="e45e3972-83b7-43f8-8160-f5bad9d38c0e" x="603" y="0" width="54" height="14"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{irkMinimo}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="0497b315-b7d5-436d-9e66-144db5dec2c1" positionType="Float" x="546" y="0" width="57" height="14"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="6" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{kmRodado_total}]]></textFieldExpression>
|
||||
</textField>
|
||||
</band>
|
||||
</summary>
|
||||
<noData>
|
||||
<band height="20">
|
||||
<textField>
|
||||
<reportElement uuid="3429e199-e682-4e28-b2ce-1bc9f2d031b2" x="37" y="0" width="803" height="20"/>
|
||||
<reportElement uuid="3429e199-e682-4e28-b2ce-1bc9f2d031b2" x="0" y="0" width="840" height="20"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
|
||||
</textField>
|
||||
|
|
|
|||
|
|
@ -85,6 +85,21 @@ public class RelatorioIndiceIRKBean {
|
|||
|
||||
private Integer rutaId;
|
||||
|
||||
/**
|
||||
* Descrição da origem do tercho
|
||||
*/
|
||||
private String descOrigemTrecho;
|
||||
|
||||
/**
|
||||
* Descrição do destino do tercho
|
||||
*/
|
||||
private String descDestinoTrecho;
|
||||
|
||||
/**
|
||||
* Descrição do prefixo da linhao
|
||||
*/
|
||||
private String prefixoLinha;
|
||||
|
||||
public Integer getRutaId() {
|
||||
return rutaId;
|
||||
}
|
||||
|
|
@ -236,6 +251,30 @@ public class RelatorioIndiceIRKBean {
|
|||
public void setIrk(BigDecimal irk) {
|
||||
this.irk = irk;
|
||||
}
|
||||
|
||||
public String getDescOrigemTrecho() {
|
||||
return descOrigemTrecho;
|
||||
}
|
||||
|
||||
public void setDescOrigemTrecho(String descOrigemTrecho) {
|
||||
this.descOrigemTrecho = descOrigemTrecho;
|
||||
}
|
||||
|
||||
public String getDescDestinoTrecho() {
|
||||
return descDestinoTrecho;
|
||||
}
|
||||
|
||||
public void setDescDestinoTrecho(String descDestinoTrecho) {
|
||||
this.descDestinoTrecho = descDestinoTrecho;
|
||||
}
|
||||
|
||||
public String getPrefixoLinha() {
|
||||
return prefixoLinha;
|
||||
}
|
||||
|
||||
public void setPrefixoLinha(String prefixoLinha) {
|
||||
this.prefixoLinha = prefixoLinha;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue