fixes bug #9386
git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@72115 d1611594-4594-4d17-8e1d-87c2c4800839master
julio
parent
7023b178c2
commit
7c73082b75
Binary file not shown.
|
|
@ -8,6 +8,7 @@
|
|||
<parameter name="fim" class="java.util.Date"/>
|
||||
<parameter name="usuario" class="java.lang.String"/>
|
||||
<parameter name="ufs" class="java.lang.String"/>
|
||||
<parameter name="receitaTerceiros" class="java.lang.Boolean"/>
|
||||
<field name="estado" class="java.lang.String"/>
|
||||
<field name="tipoViagem" class="java.lang.String"/>
|
||||
<field name="tipoReceita" class="java.lang.String"/>
|
||||
|
|
@ -784,240 +785,254 @@
|
|||
<band splitType="Stretch"/>
|
||||
</title>
|
||||
<pageHeader>
|
||||
<band height="101" splitType="Stretch">
|
||||
<band height="69" splitType="Stretch">
|
||||
<textField>
|
||||
<reportElement x="0" y="0" width="278" height="20" uuid="66f5e638-78e6-4e57-ad87-1d109a2bf1b6"/>
|
||||
<reportElement x="0" y="0" width="278" height="13" uuid="66f5e638-78e6-4e57-ad87-1d109a2bf1b6"/>
|
||||
<textElement>
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$P{empresa}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="0" y="20" width="278" height="20" uuid="1ffbad0c-0aca-4d25-b005-7d65c9c29949"/>
|
||||
<reportElement x="0" y="13" width="278" height="13" uuid="1ffbad0c-0aca-4d25-b005-7d65c9c29949"/>
|
||||
<textElement>
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["RDI"]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="0" y="40" width="55" height="20" uuid="3bb19596-b652-4457-a4dc-ca388bbe2d62"/>
|
||||
<reportElement x="0" y="26" width="37" height="13" uuid="3bb19596-b652-4457-a4dc-ca388bbe2d62"/>
|
||||
<textElement>
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Período"]]></textFieldExpression>
|
||||
<textFieldExpression><![CDATA["Período: "]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="dd/MM/yyyy">
|
||||
<reportElement x="55" y="40" width="45" height="20" uuid="6ad65d40-63a6-4ef3-b4b4-aedaa42328a2"/>
|
||||
<reportElement x="37" y="26" width="42" height="13" uuid="6ad65d40-63a6-4ef3-b4b4-aedaa42328a2"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$P{inicio}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="dd/MM/yyyy">
|
||||
<reportElement x="100" y="40" width="38" height="20" uuid="6e76b64a-19d8-4ca7-88a0-b732d0bf0334"/>
|
||||
<reportElement x="99" y="26" width="42" height="13" uuid="6e76b64a-19d8-4ca7-88a0-b732d0bf0334"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$P{fim}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="dd/MM/yyyy HH:mm:ss">
|
||||
<reportElement x="716" y="0" width="86" height="20" uuid="ac6e0a0b-d8e5-47f3-8363-4459de367663"/>
|
||||
<reportElement x="734" y="0" width="68" height="13" uuid="ac6e0a0b-d8e5-47f3-8363-4459de367663"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
<font size="7"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="661" y="0" width="55" height="20" uuid="5f733d35-f18c-4f20-8dd2-35f3d413e417"/>
|
||||
<reportElement x="691" y="0" width="43" height="13" uuid="5f733d35-f18c-4f20-8dd2-35f3d413e417"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Data/Hora: "]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="784" y="20" width="18" height="20" uuid="54589c9f-ab03-47e5-b0f4-2e3782a51ce6"/>
|
||||
<reportElement x="789" y="13" width="13" height="13" uuid="54589c9f-ab03-47e5-b0f4-2e3782a51ce6"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="748" y="20" width="36" height="20" uuid="2880f492-1e0d-4195-8d22-c8ebf3e989df"/>
|
||||
<reportElement x="761" y="13" width="28" height="13" uuid="2880f492-1e0d-4195-8d22-c8ebf3e989df"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Página: "]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="661" y="41" width="60" height="20" uuid="8f3e95fb-9cc3-4974-b35c-dd848bb90173"/>
|
||||
<reportElement x="697" y="26" width="50" height="13" uuid="8f3e95fb-9cc3-4974-b35c-dd848bb90173"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Impresso por "]]></textFieldExpression>
|
||||
<textFieldExpression><![CDATA["Impresso por: "]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="721" y="40" width="81" height="20" uuid="1baff849-54d0-4838-bbc7-52250d92548e"/>
|
||||
<reportElement x="747" y="26" width="55" height="13" uuid="1baff849-54d0-4838-bbc7-52250d92548e"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$P{usuario}]]></textFieldExpression>
|
||||
</textField>
|
||||
<line>
|
||||
<reportElement x="0" y="60" width="802" height="1" uuid="b7a7e03f-4a4a-4d64-93a0-8444102fa4ff"/>
|
||||
<reportElement x="0" y="39" width="802" height="1" uuid="b7a7e03f-4a4a-4d64-93a0-8444102fa4ff"/>
|
||||
</line>
|
||||
<textField>
|
||||
<reportElement x="0" y="60" width="55" height="20" uuid="fe71752a-f3cd-4acc-bf64-91aa19144cb6"/>
|
||||
<reportElement x="0" y="40" width="37" height="13" uuid="fe71752a-f3cd-4acc-bf64-91aa19144cb6"/>
|
||||
<textElement>
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Filtros: UF: "]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="55" y="61" width="145" height="20" uuid="78103360-25d3-45f9-82ee-c737635104c9"/>
|
||||
<reportElement x="37" y="40" width="145" height="13" uuid="78103360-25d3-45f9-82ee-c737635104c9"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$P{ufs}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="200" y="60" width="78" height="20" uuid="db13d3df-a6ed-498f-b374-3261b9b17482"/>
|
||||
<reportElement x="182" y="40" width="66" height="13" uuid="db13d3df-a6ed-498f-b374-3261b9b17482"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Receita por: UF"]]></textFieldExpression>
|
||||
<textFieldExpression><![CDATA["Receita Terceiros: "]]></textFieldExpression>
|
||||
</textField>
|
||||
<line>
|
||||
<reportElement x="0" y="80" width="802" height="1" uuid="51dde29e-c27d-451b-ab9b-f91839d6d5cd"/>
|
||||
<reportElement x="0" y="53" width="802" height="1" uuid="51dde29e-c27d-451b-ab9b-f91839d6d5cd"/>
|
||||
</line>
|
||||
<textField>
|
||||
<reportElement x="55" y="81" width="26" height="20" uuid="b44799fa-1835-45b8-9488-47c5c9590eba"/>
|
||||
<reportElement x="55" y="54" width="26" height="13" uuid="b44799fa-1835-45b8-9488-47c5c9590eba"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Alc."]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="81" y="81" width="45" height="20" uuid="b41fc2cc-0cc0-4136-ad5d-ed7654f5e83e"/>
|
||||
<reportElement x="81" y="54" width="45" height="13" uuid="b41fc2cc-0cc0-4136-ad5d-ed7654f5e83e"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Rec./Dev."]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="126" y="81" width="39" height="20" uuid="c7ee5a55-7327-4653-8772-c2abf8b0b7f6"/>
|
||||
<reportElement x="126" y="54" width="39" height="13" uuid="c7ee5a55-7327-4653-8772-c2abf8b0b7f6"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Qtd. Bil."]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="165" y="81" width="47" height="20" uuid="563fc15c-a31f-48ed-b69d-9fb56f0ed32a"/>
|
||||
<reportElement x="165" y="54" width="47" height="13" uuid="563fc15c-a31f-48ed-b69d-9fb56f0ed32a"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Tarifa"]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="212" y="81" width="36" height="20" uuid="1262471c-2b82-4508-a6e2-676355e9f510"/>
|
||||
<reportElement x="212" y="54" width="36" height="13" uuid="1262471c-2b82-4508-a6e2-676355e9f510"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Seguro"]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="248" y="81" width="51" height="20" uuid="0c177488-9c96-4c00-b80e-61684e11ea3b"/>
|
||||
<reportElement x="248" y="54" width="51" height="13" uuid="0c177488-9c96-4c00-b80e-61684e11ea3b"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Tx. Embar."]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="299" y="80" width="47" height="20" uuid="457304e0-7311-4e29-a4e3-920e51482cc7"/>
|
||||
<reportElement x="299" y="53" width="47" height="13" uuid="457304e0-7311-4e29-a4e3-920e51482cc7"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Pedágio"]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="346" y="81" width="55" height="20" uuid="109e41dd-9e89-4d43-b9c2-370cccd6fa79"/>
|
||||
<reportElement x="346" y="54" width="55" height="13" uuid="109e41dd-9e89-4d43-b9c2-370cccd6fa79"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Passagem"]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="401" y="81" width="28" height="20" uuid="6b254509-dd48-4b5a-a3cd-5294607af7f7"/>
|
||||
<reportElement x="401" y="54" width="28" height="13" uuid="6b254509-dd48-4b5a-a3cd-5294607af7f7"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Isento"]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="0" y="80" width="55" height="20" uuid="5cfcdbc4-ba96-4693-a1f4-c8043d0ddaf0"/>
|
||||
<reportElement x="0" y="54" width="55" height="13" uuid="5cfcdbc4-ba96-4693-a1f4-c8043d0ddaf0"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[""]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="429" y="81" width="30" height="20" uuid="5d7330e0-1cc4-47d9-bf1d-c296b257bcd0"/>
|
||||
<reportElement x="429" y="54" width="30" height="13" uuid="5d7330e0-1cc4-47d9-bf1d-c296b257bcd0"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Outros"]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="459" y="81" width="28" height="20" uuid="0840cd38-79ce-44b2-8a26-e17fe9bf3d29"/>
|
||||
<reportElement x="459" y="54" width="28" height="13" uuid="0840cd38-79ce-44b2-8a26-e17fe9bf3d29"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["RBC%"]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="487" y="81" width="68" height="20" uuid="dbaa3f34-0b4b-41b6-8649-f62976acb543"/>
|
||||
<reportElement x="487" y="54" width="68" height="13" uuid="dbaa3f34-0b4b-41b6-8649-f62976acb543"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Base Calc."]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="555" y="81" width="27" height="20" uuid="a9a2ab9c-bc59-4bc2-9fd1-693862894b1c"/>
|
||||
<reportElement x="555" y="54" width="27" height="13" uuid="a9a2ab9c-bc59-4bc2-9fd1-693862894b1c"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Aliq.%"]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="582" y="81" width="68" height="20" uuid="d2d56386-c300-4456-b07b-a518eb7e49c6"/>
|
||||
<reportElement x="582" y="54" width="68" height="13" uuid="d2d56386-c300-4456-b07b-a518eb7e49c6"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["ICMS"]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="650" y="81" width="34" height="20" uuid="8cbcf55d-6530-4c91-83df-aaa538716fc0"/>
|
||||
<reportElement x="650" y="54" width="34" height="13" uuid="8cbcf55d-6530-4c91-83df-aaa538716fc0"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["C.P.%"]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="684" y="81" width="50" height="20" uuid="27b5e273-20ee-40bd-b304-c461a08aea4c"/>
|
||||
<reportElement x="684" y="54" width="50" height="13" uuid="27b5e273-20ee-40bd-b304-c461a08aea4c"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Cred. Pres."]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="734" y="81" width="68" height="20" uuid="e125e24f-708d-4652-ac75-d1a1841312f0"/>
|
||||
<reportElement x="734" y="54" width="68" height="13" uuid="e125e24f-708d-4652-ac75-d1a1841312f0"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["ICMS a Rec."]]></textFieldExpression>
|
||||
</textField>
|
||||
<line>
|
||||
<reportElement x="0" y="100" width="802" height="1" uuid="e00bc40a-38a8-4dfd-b403-7767a7ffc5e3"/>
|
||||
<reportElement x="0" y="67" width="802" height="1" uuid="e00bc40a-38a8-4dfd-b403-7767a7ffc5e3"/>
|
||||
</line>
|
||||
<textField pattern="dd/MM/yyyy">
|
||||
<reportElement x="79" y="26" width="20" height="13" uuid="8088db47-6a6c-4b1c-9e5b-13c79f11e4aa"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[" até "]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="248" y="40" width="55" height="13" uuid="b12716d2-8292-4c7a-a412-e7728248e19d"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$P{receitaTerceiros} ? "SIM" : "NÂO"]]></textFieldExpression>
|
||||
</textField>
|
||||
</band>
|
||||
</pageHeader>
|
||||
<columnHeader>
|
||||
|
|
|
|||
|
|
@ -93,6 +93,7 @@ public class BusquedaRelatorioRDIController extends MyGenericForwardComposer {
|
|||
parametros.put("inicio", datInicial.getValue());
|
||||
parametros.put("fim", datFinal.getValue());
|
||||
parametros.put("estados", estados);
|
||||
parametros.put("receitaTerceiros", radSim.isChecked());
|
||||
parametros.put("usuario", UsuarioLogado.getUsuarioLogado().getClaveUsuario());
|
||||
|
||||
Relatorio relatorio = new RelatorioRDI(parametros, dataSourceRead.getConnection());
|
||||
|
|
|
|||
Loading…
Reference in New Issue