fixes bug #6115
git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@42500 d1611594-4594-4d17-8e1d-87c2c4800839master
leonardo
parent
47cd53c217
commit
b050d83e24
|
|
@ -77,7 +77,7 @@ public class RelatorioGratuidade extends Relatorio {
|
|||
gratuidadeBean.setPorccategoria(rset.getBigDecimal("porccategoria"));
|
||||
gratuidadeBean.setPreciooriginal(rset.getBigDecimal("preciooriginal"));
|
||||
gratuidadeBean.setPreciopagado(rset.getBigDecimal("preciopagado"));
|
||||
|
||||
gratuidadeBean.setNombempresa(rset.getString("nombempresa"));
|
||||
lsDadosRelatorio.add(gratuidadeBean);
|
||||
}
|
||||
|
||||
|
|
@ -102,7 +102,7 @@ public class RelatorioGratuidade extends Relatorio {
|
|||
sql.append("SELECT b.feccorrida, ori.cveparada origen, des.cveparada destino, ");
|
||||
sql.append("b.numkmviaje, r.descruta, b.corrida_id, b.fechorviaje, ");
|
||||
sql.append("tv.desctipoventa, b.nombpasajero, b.descnumdoc, tar.preciooriginal, ");
|
||||
sql.append("b.porccategoria, b.preciopagado, u.cveusuario, ag.nombpuntoventa ");
|
||||
sql.append("b.porccategoria, b.preciopagado, u.cveusuario, ag.nombpuntoventa, e.nombempresa ");
|
||||
sql.append("FROM boleto b ");
|
||||
sql.append("JOIN categoria c ON b.categoria_id = c.categoria_id ");
|
||||
sql.append("JOIN grupo_categoria gc ON c.grupocategoria_id = gc.grupocategoria_id ");
|
||||
|
|
@ -119,6 +119,7 @@ public class RelatorioGratuidade extends Relatorio {
|
|||
sql.append(" AND tar.vigenciatarifa_id = vt.vigenciatarifa_id ");
|
||||
sql.append(" AND tar.origen_id = b.origen_id ");
|
||||
sql.append(" AND tar.destino_id = b.destino_id) ");
|
||||
sql.append("JOIN empresa e ON e.empresa_id = b.empresacorrida_id ");
|
||||
sql.append("WHERE ");
|
||||
sql.append(" gc.grupocategoria_id IN (1,2,3,4) ");
|
||||
sql.append("AND b.feccorrida BETWEEN :fecInicio AND :fecFinal ");
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -2,7 +2,7 @@
|
|||
<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="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="RelatorioEmpresaCorrida" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e">
|
||||
<property name="ireport.zoom" value="1.5"/>
|
||||
<property name="ireport.x" value="0"/>
|
||||
<property name="ireport.y" value="0"/>
|
||||
<property name="ireport.y" value="61"/>
|
||||
<parameter name="fecInicio" class="java.lang.String">
|
||||
<defaultValueExpression><![CDATA[]]></defaultValueExpression>
|
||||
</parameter>
|
||||
|
|
@ -30,6 +30,7 @@
|
|||
<field name="preciopagado" class="java.math.BigDecimal"/>
|
||||
<field name="cveusuario" class="java.lang.String"/>
|
||||
<field name="nombpuntoventa" class="java.lang.String"/>
|
||||
<field name="nombempresa" class="java.lang.String"/>
|
||||
<variable name="qtde" class="java.lang.Integer" calculation="Count">
|
||||
<variableExpression><![CDATA[$F{km}]]></variableExpression>
|
||||
</variable>
|
||||
|
|
@ -39,6 +40,98 @@
|
|||
<variable name="total_com_desconto" class="java.math.BigDecimal" calculation="Sum">
|
||||
<variableExpression><![CDATA[$F{preciopagado}]]></variableExpression>
|
||||
</variable>
|
||||
<group name="empresa">
|
||||
<groupExpression><![CDATA[$F{nombempresa}]]></groupExpression>
|
||||
<groupHeader>
|
||||
<band height="67">
|
||||
<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
|
||||
<reportElement uuid="d15af518-c902-4903-bf8a-d4cf3ff6c05e" x="1" y="11" width="144" height="16"/>
|
||||
<textElement textAlignment="Left">
|
||||
<font size="10"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{nombempresa}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="d08e6683-5388-4505-9e47-fc3d501c62b9" x="0" y="51" width="49" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.data}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="2c09f3ff-c554-4ce2-886e-eaab93fa15eb" x="49" y="51" width="30" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.origen}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="e18edb89-17f4-417e-8041-664f11245cbd" x="79" y="51" width="34" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.destino}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="6124e4be-a471-4867-86f5-bb635ce5db7f" x="123" y="51" width="21" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.km}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="67851ba5-cc9c-4f37-8857-9e3c5be9b362" x="144" y="51" width="142" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.linha}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="93fedb4f-18e2-4d95-82e8-2108d3eb135c" x="286" y="51" width="44" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.servicio}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="3de0b54a-0b10-4556-9b0a-ba8f19989716" x="330" y="51" width="42" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.hora}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="cc834009-ae90-46d4-8bbb-37578b69f621" x="372" y="51" width="44" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.tipobilhete}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="842c2e2b-0a9e-4a28-9010-9b0c814c5bcb" x="416" y="51" width="72" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.pasajero}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="94fe9e9b-e231-43b8-aeb8-7bc3eb2d61af" x="488" y="51" width="46" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.documento}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="952c3d60-ade1-4f57-8801-3ef6bc7f2333" x="534" y="51" width="41" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.precio}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="e14732be-42a0-4f54-9eb2-52f10ece154b" x="575" y="51" width="48" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.desconto}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="b34ce751-6969-47b0-aeb7-fff00a5de1e3" x="623" y="51" width="53" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.tarifadesconto}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="bb3d2388-6bda-4727-ba30-0a5f4612f1a8" x="676" y="51" width="54" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.bilheteiro}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="e727feec-a329-4f8c-af2a-c89c3c2e9606" x="730" y="51" width="72" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.agencia}]]></textFieldExpression>
|
||||
</textField>
|
||||
<line>
|
||||
<reportElement uuid="8e2d6686-e4d7-43d5-b3a9-46adc3e58350" x="1" y="66" width="802" height="1"/>
|
||||
</line>
|
||||
</band>
|
||||
</groupHeader>
|
||||
</group>
|
||||
<background>
|
||||
<band splitType="Stretch"/>
|
||||
</background>
|
||||
|
|
@ -84,84 +177,6 @@
|
|||
<textElement textAlignment="Right"/>
|
||||
<textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="d08e6683-5388-4505-9e47-fc3d501c62b9" x="0" y="55" width="49" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.data}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="2c09f3ff-c554-4ce2-886e-eaab93fa15eb" x="49" y="55" width="30" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.origen}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="e18edb89-17f4-417e-8041-664f11245cbd" x="79" y="55" width="34" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.destino}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="6124e4be-a471-4867-86f5-bb635ce5db7f" x="123" y="55" width="21" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.km}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="67851ba5-cc9c-4f37-8857-9e3c5be9b362" x="144" y="55" width="142" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.linha}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="93fedb4f-18e2-4d95-82e8-2108d3eb135c" x="286" y="55" width="44" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.servicio}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="3de0b54a-0b10-4556-9b0a-ba8f19989716" x="330" y="55" width="42" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.hora}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="cc834009-ae90-46d4-8bbb-37578b69f621" x="372" y="55" width="44" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.tipobilhete}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="842c2e2b-0a9e-4a28-9010-9b0c814c5bcb" x="416" y="55" width="72" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.pasajero}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="94fe9e9b-e231-43b8-aeb8-7bc3eb2d61af" x="488" y="55" width="46" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.documento}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="952c3d60-ade1-4f57-8801-3ef6bc7f2333" x="534" y="55" width="41" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.precio}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="e14732be-42a0-4f54-9eb2-52f10ece154b" x="575" y="55" width="48" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.desconto}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="b34ce751-6969-47b0-aeb7-fff00a5de1e3" x="623" y="55" width="53" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.tarifadesconto}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="bb3d2388-6bda-4727-ba30-0a5f4612f1a8" x="676" y="55" width="54" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.bilheteiro}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="e727feec-a329-4f8c-af2a-c89c3c2e9606" x="730" y="55" width="72" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{detail.agencia}]]></textFieldExpression>
|
||||
</textField>
|
||||
<line>
|
||||
<reportElement uuid="8e2d6686-e4d7-43d5-b3a9-46adc3e58350" x="0" y="70" width="802" height="1"/>
|
||||
</line>
|
||||
</band>
|
||||
</pageHeader>
|
||||
<columnHeader>
|
||||
|
|
@ -277,24 +292,24 @@
|
|||
</band>
|
||||
</detail>
|
||||
<summary>
|
||||
<band height="19">
|
||||
<band height="53">
|
||||
<textField>
|
||||
<reportElement uuid="5fdd8d50-c70b-4a5c-9621-5b91642257bf" x="0" y="0" width="186" height="16"/>
|
||||
<reportElement uuid="5fdd8d50-c70b-4a5c-9621-5b91642257bf" x="0" y="24" width="186" height="16"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textFieldExpression><![CDATA[$R{detail.total}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="6005f63d-1abc-408d-9af2-adea341fadda" x="196" y="0" width="90" height="16"/>
|
||||
<reportElement uuid="6005f63d-1abc-408d-9af2-adea341fadda" x="196" y="24" width="90" height="16"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$V{qtde}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="c3632bd6-baee-4919-880b-1e0f94fe44c0" x="510" y="0" width="65" height="16"/>
|
||||
<reportElement uuid="c3632bd6-baee-4919-880b-1e0f94fe44c0" x="510" y="24" width="65" height="16"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textFieldExpression><![CDATA[$V{total_sem_desconto}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="5bb15b93-745c-48fd-8803-3047a49c358c" x="601" y="0" width="65" height="16"/>
|
||||
<reportElement uuid="5bb15b93-745c-48fd-8803-3047a49c358c" x="601" y="24" width="65" height="16"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textFieldExpression><![CDATA[$V{total_com_desconto}]]></textFieldExpression>
|
||||
</textField>
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@ public class RelatorioGratuidadeBean {
|
|||
private BigDecimal preciopagado;
|
||||
private String cveusuario;
|
||||
private String nombpuntoventa;
|
||||
private String nombempresa;
|
||||
|
||||
public Date getFeccorrida() {
|
||||
return feccorrida;
|
||||
}
|
||||
|
|
@ -109,4 +111,10 @@ public class RelatorioGratuidadeBean {
|
|||
public void setNombpuntoventa(String nombpuntoventa) {
|
||||
this.nombpuntoventa = nombpuntoventa;
|
||||
}
|
||||
public String getNombempresa() {
|
||||
return nombempresa;
|
||||
}
|
||||
public void setNombempresa(String nombempresa) {
|
||||
this.nombempresa = nombempresa;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue