fixes bug#22026

qua: 
dev: Wallace

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@106758 d1611594-4594-4d17-8e1d-87c2c4800839
master
celio 2021-05-18 14:57:57 +00:00
parent 4ed94ad86b
commit 294a46cc6a
6 changed files with 68 additions and 39 deletions

View File

@ -127,6 +127,7 @@ public class RelatorioGratuidade extends Relatorio {
gratuidadeBean.setPorccategoria(rset.getBigDecimal("porccategoria"));
gratuidadeBean.setPreciooriginal(rset.getBigDecimal("preciooriginal"));
gratuidadeBean.setPreciopagado(rset.getBigDecimal("preciopagado"));
gratuidadeBean.setDesctelefono(rset.getString("desctelefono"));
gratuidadeBean.setNombempresa(rset.getString("nombempresa"));
gratuidadeBean.setCvecategoria(rset.getString("cvecategoria"));
gratuidadeBean.setNumasiento(rset.getString("numasiento"));
@ -196,6 +197,7 @@ public class RelatorioGratuidade extends Relatorio {
sb.append(" (select sum(bfpv.importe) from boleto_formapago bfpv where bfpv.boleto_id = b.boleto_id and bfpv.activo = 1) as preciopagado, ");;
sb.append(" u.cveusuario,");
sb.append(" ag.nombpuntoventa,");
sb.append(" b.desctelefono,");
sb.append(" e.nombempresa,");
sb.append(" ca.cvecategoria,");
sb.append(" b.desctipodoc,");
@ -292,6 +294,7 @@ public class RelatorioGratuidade extends Relatorio {
sb.append(" (select sum(cfpv.importe) from caja_formapago cfpv where cfpv.caja_id = c.caja_id and cfpv.activo = 1) as preciopagado, ");
sb.append(" u.cveusuario,");
sb.append(" ag.nombpuntoventa,");
sb.append(" c.desctelefono,");
sb.append(" e.nombempresa,");
sb.append(" ca.cvecategoria,");
sb.append(" c.desctipodoc,");

View File

@ -36,6 +36,7 @@ detail.bilheteiro=Bilheteiro
detail.agencia=Agência
detail.dataMD=Data MD
detail.empresa=Empresa
detail.telefone=Telefono
detail.tipo=Tipo
detail.tipoDoc=Tipo Doc.
detail.tarifa=Tarifa

View File

@ -36,6 +36,7 @@ detail.bilheteiro=Bilheteiro
detail.agencia=Agência
detail.dataMD=Data MD
detail.empresa=Empresa
detail.telefone=Telefone
detail.tipo=Tipo
detail.tipoDoc=Tipo Doc.
detail.tarifa=Tarifa

View File

@ -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="RelatorioEmpresaCorrida" pageWidth="1152" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1132" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" resourceBundle="RelatorioEmpresaCorrida" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e">
<property name="ireport.zoom" value="3.53692153650001"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="479"/>
<property name="ireport.zoom" value="2.923075650000008"/>
<property name="ireport.x" value="1620"/>
<property name="ireport.y" value="277"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
<parameter name="fecInicioViagem" class="java.lang.String">
<defaultValueExpression><![CDATA[]]></defaultValueExpression>
@ -55,6 +55,7 @@
<field name="tarifa" class="java.math.BigDecimal"/>
<field name="fecdatviaje" class="java.lang.String"/>
<field name="chbpe" class="java.lang.String"/>
<field name="desctelefono" class="java.lang.String"/>
<variable name="qtde" class="java.lang.Integer" calculation="Count">
<variableExpression><![CDATA[$F{km}]]></variableExpression>
</variable>
@ -160,42 +161,42 @@
<textFieldExpression><![CDATA[$R{detail.hora}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="cc834009-ae90-46d4-8bbb-37578b69f621" x="702" y="114" width="39" height="26"/>
<reportElement uuid="cc834009-ae90-46d4-8bbb-37578b69f621" x="735" y="114" width="39" height="26"/>
<textElement>
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.tipobilhete}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="842c2e2b-0a9e-4a28-9010-9b0c814c5bcb" x="596" y="114" width="44" height="26"/>
<reportElement uuid="842c2e2b-0a9e-4a28-9010-9b0c814c5bcb" x="591" y="114" width="44" height="26"/>
<textElement>
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.pasajero}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="94fe9e9b-e231-43b8-aeb8-7bc3eb2d61af" x="670" y="114" width="32" height="26"/>
<reportElement uuid="94fe9e9b-e231-43b8-aeb8-7bc3eb2d61af" x="665" y="114" width="32" height="26"/>
<textElement textAlignment="Center">
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.documento}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="952c3d60-ade1-4f57-8801-3ef6bc7f2333" x="804" y="114" width="28" height="26"/>
<reportElement uuid="952c3d60-ade1-4f57-8801-3ef6bc7f2333" x="837" y="114" width="28" height="26"/>
<textElement>
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.precio}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="e14732be-42a0-4f54-9eb2-52f10ece154b" x="832" y="114" width="40" height="26"/>
<reportElement uuid="e14732be-42a0-4f54-9eb2-52f10ece154b" x="865" y="114" width="37" height="26"/>
<textElement>
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.desconto}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="b34ce751-6969-47b0-aeb7-fff00a5de1e3" x="872" y="114" width="41" height="26"/>
<reportElement uuid="b34ce751-6969-47b0-aeb7-fff00a5de1e3" x="902" y="114" width="41" height="26"/>
<textElement>
<font size="7"/>
</textElement>
@ -209,7 +210,7 @@
<textFieldExpression><![CDATA[$R{detail.bilheteiro}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="6b1fac8d-c098-4893-b1dd-7b64573f0173" x="741" y="114" width="34" height="26"/>
<reportElement uuid="6b1fac8d-c098-4893-b1dd-7b64573f0173" x="774" y="114" width="33" height="26"/>
<textElement>
<font size="7"/>
</textElement>
@ -223,7 +224,7 @@
<textFieldExpression><![CDATA[$R{detail.numasiento}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="c4b5d11d-79a1-4850-8294-8ccaa0898bca" x="539" y="114" width="36" height="26"/>
<reportElement uuid="c4b5d11d-79a1-4850-8294-8ccaa0898bca" x="539" y="114" width="33" height="26"/>
<textElement>
<font size="7"/>
</textElement>
@ -237,49 +238,49 @@
<textFieldExpression><![CDATA[$R{detail.dataMD}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="7b62e459-04bc-4227-be76-24bf5938d552" x="774" y="114" width="30" height="26"/>
<reportElement uuid="7b62e459-04bc-4227-be76-24bf5938d552" x="807" y="114" width="30" height="26"/>
<textElement>
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.tipo}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="069eab80-7d6d-4dae-a598-c5014deb81f4" x="640" y="114" width="30" height="26"/>
<reportElement uuid="069eab80-7d6d-4dae-a598-c5014deb81f4" x="635" y="114" width="30" height="26"/>
<textElement>
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.tipoDoc}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="5105aee2-c3ec-4571-a14c-06b69218decc" x="1025" y="114" width="20" height="26"/>
<reportElement uuid="5105aee2-c3ec-4571-a14c-06b69218decc" x="1045" y="114" width="17" height="26"/>
<textElement>
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.tpp}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="1fe1fad6-d193-4dc1-9696-5614ff9a10d0" x="1081" y="114" width="50" height="26"/>
<reportElement uuid="1fe1fad6-d193-4dc1-9696-5614ff9a10d0" x="1098" y="114" width="33" height="26"/>
<textElement>
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.status}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="f3655778-94dd-4fb6-8c84-cf32416201e0" x="946" y="114" width="27" height="26"/>
<reportElement uuid="f3655778-94dd-4fb6-8c84-cf32416201e0" x="973" y="114" width="25" height="26"/>
<textElement>
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.seguro}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="b68a4e34-b6e9-4006-8373-707c4e37eb31" x="1006" y="114" width="19" height="26"/>
<reportElement uuid="b68a4e34-b6e9-4006-8373-707c4e37eb31" x="1028" y="114" width="17" height="26"/>
<textElement>
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.utr}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="c74391a0-cc07-44f7-90af-3036910e6bb3" x="973" y="114" width="33" height="26"/>
<reportElement uuid="c74391a0-cc07-44f7-90af-3036910e6bb3" x="998" y="114" width="30" height="26"/>
<textElement>
<font size="7"/>
</textElement>
@ -314,14 +315,14 @@
<textFieldExpression><![CDATA[$R{detail.agencia}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="9e0176f6-a8ff-4246-8038-34155064d017" x="575" y="114" width="21" height="26"/>
<reportElement uuid="9e0176f6-a8ff-4246-8038-34155064d017" x="572" y="114" width="19" height="26"/>
<textElement>
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.ccf}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="97583aa4-45de-402c-8ce9-978c974d6e0c" x="913" y="114" width="33" height="26"/>
<reportElement uuid="97583aa4-45de-402c-8ce9-978c974d6e0c" x="943" y="114" width="30" height="26"/>
<textElement>
<font size="7"/>
</textElement>
@ -343,12 +344,19 @@
<textFieldExpression><![CDATA[$P{nomb_empresa}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="31514fcb-1c10-41ba-9e10-7903ee73f607" x="1045" y="114" width="36" height="26"/>
<reportElement uuid="31514fcb-1c10-41ba-9e10-7903ee73f607" x="1062" y="114" width="36" height="26"/>
<textElement>
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.chaveBPe}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="72f2ffff-f6a7-4a82-a884-a2c6c3f38d31" x="697" y="114" width="38" height="26"/>
<textElement textAlignment="Center">
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$R{detail.telefone}]]></textFieldExpression>
</textField>
</band>
</title>
<columnHeader>
@ -371,28 +379,28 @@
<textFieldExpression><![CDATA[$F{fechorviaje}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="6cc780bc-645e-4f03-a7d0-b4ecf7d4eb6c" stretchType="RelativeToBandHeight" x="702" y="0" width="39" height="23"/>
<reportElement uuid="6cc780bc-645e-4f03-a7d0-b4ecf7d4eb6c" stretchType="RelativeToBandHeight" x="735" y="0" width="39" height="23"/>
<textElement textAlignment="Center">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{desctipoventa}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="37fa056d-c401-4268-a455-c5caf5e4eb54" stretchType="RelativeToBandHeight" x="670" y="0" width="32" height="23"/>
<reportElement uuid="37fa056d-c401-4268-a455-c5caf5e4eb54" stretchType="RelativeToBandHeight" x="665" y="0" width="32" height="23"/>
<textElement textAlignment="Left">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{descnumdoc}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<reportElement uuid="d7019a40-a617-43c7-9ad2-b7c47fb38d60" stretchType="RelativeToBandHeight" x="832" y="0" width="40" height="23"/>
<reportElement uuid="d7019a40-a617-43c7-9ad2-b7c47fb38d60" stretchType="RelativeToBandHeight" x="865" y="0" width="37" height="23"/>
<textElement>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{porccategoria}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<reportElement uuid="f0161d55-b853-4318-8028-8aec04c0487d" stretchType="RelativeToBandHeight" x="872" y="0" width="41" height="23"/>
<reportElement uuid="f0161d55-b853-4318-8028-8aec04c0487d" stretchType="RelativeToBandHeight" x="902" y="0" width="41" height="23"/>
<textElement>
<font size="6"/>
</textElement>
@ -413,14 +421,14 @@
<textFieldExpression><![CDATA[$F{descorigen}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<reportElement uuid="695d5bfa-16e3-4163-82a0-36d2a2ba21ed" stretchType="RelativeToBandHeight" x="804" y="0" width="28" height="23"/>
<reportElement uuid="695d5bfa-16e3-4163-82a0-36d2a2ba21ed" stretchType="RelativeToBandHeight" x="837" y="0" width="28" height="23"/>
<textElement>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{preciooriginal}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="f7539e74-4ab5-45e3-b3ca-b66967acc3e2" stretchType="RelativeToBandHeight" x="741" y="0" width="33" height="23"/>
<reportElement uuid="f7539e74-4ab5-45e3-b3ca-b66967acc3e2" stretchType="RelativeToBandHeight" x="774" y="0" width="33" height="23"/>
<textElement textAlignment="Center">
<font size="6"/>
</textElement>
@ -434,49 +442,49 @@
<textFieldExpression><![CDATA[$F{numasiento}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement uuid="9e5ccd79-6850-4b3c-bfa1-405a96d3f826" x="973" y="0" width="33" height="23"/>
<reportElement uuid="9e5ccd79-6850-4b3c-bfa1-405a96d3f826" x="998" y="0" width="30" height="23"/>
<textElement>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement uuid="32e01305-63ee-444c-a4a7-e9246621ca83" x="1006" y="0" width="19" height="23"/>
<reportElement uuid="32e01305-63ee-444c-a4a7-e9246621ca83" x="1028" y="0" width="17" height="23"/>
<textElement>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{utr}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement uuid="bff1a8a9-115f-4abf-811a-92ac988ca380" x="946" y="0" width="27" height="23"/>
<reportElement uuid="bff1a8a9-115f-4abf-811a-92ac988ca380" x="973" y="0" width="25" height="23"/>
<textElement>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{seguro}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="9df5776a-63e5-4480-81d5-34427fd79e23" x="640" y="0" width="30" height="23"/>
<reportElement uuid="9df5776a-63e5-4480-81d5-34427fd79e23" x="635" y="0" width="30" height="23"/>
<textElement textAlignment="Left">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{tipoDoc}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="d75d9725-26ac-47f5-94db-995e5b49f30a" x="774" y="0" width="30" height="23"/>
<reportElement uuid="d75d9725-26ac-47f5-94db-995e5b49f30a" x="807" y="0" width="30" height="23"/>
<textElement textAlignment="Left">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{tipo}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
<reportElement uuid="fe98c2f8-b8cc-4f51-bf9d-9b767fe94088" x="1025" y="0" width="20" height="23"/>
<reportElement uuid="fe98c2f8-b8cc-4f51-bf9d-9b767fe94088" x="1045" y="0" width="17" height="23"/>
<textElement>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{tpp}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="c6379bbf-bdfb-4600-b6ec-e1e9a6640c6d" x="1081" y="0" width="50" height="23"/>
<reportElement uuid="c6379bbf-bdfb-4600-b6ec-e1e9a6640c6d" x="1098" y="0" width="33" height="23"/>
<textElement>
<font size="6"/>
</textElement>
@ -532,28 +540,28 @@
<textFieldExpression><![CDATA[$F{linha}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="9c9861ac-780e-4e8b-aab8-9a4f506ce62b" stretchType="RelativeToBandHeight" x="596" y="0" width="44" height="23"/>
<reportElement uuid="9c9861ac-780e-4e8b-aab8-9a4f506ce62b" stretchType="RelativeToBandHeight" x="591" y="0" width="44" height="23"/>
<textElement textAlignment="Left">
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{nombpasajero}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<reportElement uuid="7a2eccbc-06b0-450a-bd27-6b1c669f408c" stretchType="RelativeToBandHeight" x="913" y="0" width="33" height="23"/>
<reportElement uuid="7a2eccbc-06b0-450a-bd27-6b1c669f408c" stretchType="RelativeToBandHeight" x="943" y="0" width="30" height="23"/>
<textElement>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{tarifa}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<reportElement uuid="4177f54f-ba97-4731-8c32-c8fc23ce483a" stretchType="RelativeToBandHeight" x="539" y="0" width="36" height="23"/>
<reportElement uuid="4177f54f-ba97-4731-8c32-c8fc23ce483a" stretchType="RelativeToBandHeight" x="539" y="0" width="33" height="23"/>
<textElement>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{numfoliosistema}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="###0.00;-###0.00" isBlankWhenNull="true">
<reportElement uuid="56de76ac-7bd5-489d-bb2f-5fdba2eb8f67" stretchType="RelativeToBandHeight" x="575" y="0" width="21" height="23"/>
<reportElement uuid="56de76ac-7bd5-489d-bb2f-5fdba2eb8f67" stretchType="RelativeToBandHeight" x="572" y="0" width="19" height="23"/>
<textElement>
<font size="6"/>
</textElement>
@ -567,12 +575,20 @@
<textFieldExpression><![CDATA[$F{fecdatviaje}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="c74335ef-0e0d-452a-9eac-3f9879d04bd1" stretchType="RelativeToBandHeight" x="1045" y="0" width="36" height="23"/>
<reportElement uuid="c74335ef-0e0d-452a-9eac-3f9879d04bd1" stretchType="RelativeToBandHeight" x="1062" y="0" width="36" height="23"/>
<textElement>
<font size="6"/>
</textElement>
<textFieldExpression><![CDATA[$F{chbpe}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="e28d50c2-ec86-477e-931c-99bc211e1162" stretchType="RelativeToBandHeight" x="697" y="0" width="38" height="23"/>
<textElement textAlignment="Justified">
<font size="6"/>
<paragraph leftIndent="1"/>
</textElement>
<textFieldExpression><![CDATA[$F{desctelefono}]]></textFieldExpression>
</textField>
</band>
</detail>
<summary>

View File

@ -24,6 +24,7 @@ public class RelatorioGratuidadeBean {
private String cveusuario;
private String nombpuntoventa;
private String nombempresa;
private String desctelefono;
private String cvecategoria;
private String numasiento;
private String numfoliosistema;
@ -43,6 +44,13 @@ public class RelatorioGratuidadeBean {
private String ccf;
private String chbpe; // Mantis 15731
public String getDesctelefono() {
return desctelefono;
}
public void setDesctelefono(String desctelefono) {
this.desctelefono = desctelefono;
}
public String getFecdatviaje() {
return fecdatviaje;
}