fix bug#22299
dev: GLEIMAR qua: Silvania git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@108218 d1611594-4594-4d17-8e1d-87c2c4800839master
celio
parent
04e21ac8d1
commit
916ff7f3fe
|
|
@ -77,7 +77,10 @@ public class RelatorioMensalDAER extends Relatorio {
|
|||
}
|
||||
stmt.setInt("EMPRESA", empresa.getEmpresaId());
|
||||
stmt.setString("AGENCIA", agencia);
|
||||
stmt.setString("TIPOVENTA_ID", tipoVenta);
|
||||
if(istipoVenta) {
|
||||
stmt.setString("TIPOVENTA_ID", tipoVenta);
|
||||
}
|
||||
|
||||
rset = stmt.executeQuery();
|
||||
return rset;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,10 +6,14 @@ msg.a=
|
|||
header.titulo.relatorio=BOLETIM ESTATÍSTICO MENSAL DE ESTAÇÕES RODIVIÁRIAS
|
||||
header.mes=M-S
|
||||
header.ano=ANO
|
||||
header.periodo=Per\u00EDodo\:
|
||||
header.data.hora=Data/Hora\:
|
||||
header.tr=TR
|
||||
header.tl=TL
|
||||
header.nl=NL
|
||||
header.estacao=NUM.ESTAC.
|
||||
cabecalho.impressorPor=Impresso por
|
||||
header.pagina=P\u00E1gina\:
|
||||
header.filtro.rodoviaria= Rodoviária de:
|
||||
|
||||
#Labels detail
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -44,9 +44,9 @@
|
|||
<band splitType="Stretch"/>
|
||||
</title>
|
||||
<pageHeader>
|
||||
<band height="91" splitType="Stretch">
|
||||
<band height="92" splitType="Stretch">
|
||||
<textField>
|
||||
<reportElement uuid="2523431f-2c2c-4a2b-a34f-785b8ea8f9dd" mode="Opaque" x="2" y="1" width="427" height="15" backcolor="#FFFFFF"/>
|
||||
<reportElement uuid="2523431f-2c2c-4a2b-a34f-785b8ea8f9dd" mode="Opaque" x="2" y="1" width="381" height="14" backcolor="#FFFFFF"/>
|
||||
<textElement verticalAlignment="Middle">
|
||||
<font size="11"/>
|
||||
</textElement>
|
||||
|
|
@ -56,7 +56,7 @@
|
|||
<reportElement uuid="27a77abc-db13-4836-9261-8208f3825802" x="1" y="30" width="802" height="1"/>
|
||||
</line>
|
||||
<textField>
|
||||
<reportElement uuid="c0f124b2-3691-4f49-9b86-69d76f249584" x="1" y="79" width="26" height="10"/>
|
||||
<reportElement uuid="c0f124b2-3691-4f49-9b86-69d76f249584" x="1" y="80" width="26" height="9"/>
|
||||
<box>
|
||||
<topPen lineWidth="1.0"/>
|
||||
<leftPen lineWidth="1.0"/>
|
||||
|
|
@ -209,7 +209,7 @@
|
|||
<textFieldExpression><![CDATA[$R{detail.horarioInicial}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="e691721c-a2ba-4f35-9586-a06dd7dcd627" x="27" y="79" width="26" height="10"/>
|
||||
<reportElement uuid="e691721c-a2ba-4f35-9586-a06dd7dcd627" x="27" y="80" width="26" height="9"/>
|
||||
<box>
|
||||
<topPen lineWidth="1.0"/>
|
||||
<leftPen lineWidth="1.0"/>
|
||||
|
|
@ -222,7 +222,7 @@
|
|||
<textFieldExpression><![CDATA[$R{detail.min}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="e8c52931-daa9-4ab3-bc48-2e3ce235ad95" x="79" y="79" width="26" height="10"/>
|
||||
<reportElement uuid="e8c52931-daa9-4ab3-bc48-2e3ce235ad95" x="80" y="80" width="25" height="9"/>
|
||||
<box>
|
||||
<topPen lineWidth="1.0"/>
|
||||
<leftPen lineWidth="1.0"/>
|
||||
|
|
@ -248,7 +248,7 @@
|
|||
<textFieldExpression><![CDATA[$R{detail.horarioPartida}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="9ffbfe45-e881-4ddc-9fa1-bbf27978760a" x="54" y="79" width="26" height="10"/>
|
||||
<reportElement uuid="9ffbfe45-e881-4ddc-9fa1-bbf27978760a" x="54" y="80" width="26" height="9"/>
|
||||
<box>
|
||||
<topPen lineWidth="1.0"/>
|
||||
<leftPen lineWidth="1.0"/>
|
||||
|
|
@ -481,6 +481,41 @@
|
|||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{detail.taxaF}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField evaluationTime="Report">
|
||||
<reportElement uuid="c35f1119-077f-4283-86b9-c0064213dc49" mode="Opaque" x="609" y="14" width="22" height="14" backcolor="#FFFFFF"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="a856130c-a157-409b-a006-8bfe6818d9b0" mode="Opaque" x="488" y="0" width="66" height="14" backcolor="#FFFFFF"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="58052fa4-219d-46ed-a430-7eaa67fa6a70" mode="Opaque" x="383" y="0" width="46" height="14" backcolor="#FFFFFF"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{cabecalho.impressorPor}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="e0bf83af-efdc-4b20-998b-ec4ea2ef031e" mode="Opaque" x="584" y="14" width="25" height="14" backcolor="#FFFFFF"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="f427c8ff-68af-4495-ad50-6d430142a60e" mode="Opaque" x="488" y="14" width="96" height="14" backcolor="#FFFFFF"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="a60a06c4-005e-4801-89ed-7433d44a37cc" mode="Opaque" x="429" y="0" width="59" height="14" backcolor="#FFFFFF"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$P{USUARIO_ID}+"-"+$P{NOME_USUARIO}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="dd/MM/yyyy HH:mm">
|
||||
<reportElement uuid="6d7a1040-e794-4a2c-a85b-80a586038ffd" mode="Opaque" x="554" y="0" width="79" height="14" backcolor="#FFFFFF"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
|
||||
</textField>
|
||||
</band>
|
||||
</pageHeader>
|
||||
<columnHeader>
|
||||
|
|
@ -513,8 +548,7 @@
|
|||
<rightPen lineWidth="1.0"/>
|
||||
</box>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle"/>
|
||||
<textFieldExpression><![CDATA[$F{fecMinInicio}
|
||||
]]></textFieldExpression>
|
||||
<textFieldExpression><![CDATA[$F{fecMinInicio}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="65b14685-7b36-49fb-a030-b9baf7b0574d" x="53" y="0" width="26" height="14"/>
|
||||
|
|
@ -663,10 +697,21 @@
|
|||
<band/>
|
||||
</lastPageFooter>
|
||||
<summary>
|
||||
<band height="11" splitType="Stretch">
|
||||
<band height="39" splitType="Stretch">
|
||||
<line>
|
||||
<reportElement uuid="54af9115-a2ad-4af8-8c41-3262d81ba1f7" x="0" y="0" width="801" height="1"/>
|
||||
</line>
|
||||
</band>
|
||||
</summary>
|
||||
<noData>
|
||||
<band height="50">
|
||||
<textField>
|
||||
<reportElement uuid="16e403a1-d59a-4ba9-9d9e-17fcb760d26a" x="2" y="12" width="840" height="20"/>
|
||||
<textElement textAlignment="Center">
|
||||
<font size="13"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
|
||||
</textField>
|
||||
</band>
|
||||
</noData>
|
||||
</jasperReport>
|
||||
|
|
|
|||
|
|
@ -127,15 +127,25 @@ public class RelatorioMensalDAERController extends MyGenericForwardComposer {
|
|||
|
||||
StringBuilder tipVenta = new StringBuilder();
|
||||
StringBuilder tipVentaIds = new StringBuilder();
|
||||
for (TipoVenta venta : listSelectedTipoVenta) {
|
||||
tipVenta.append(venta.getDesctipoventa()).append(",");
|
||||
tipVentaIds.append(venta.getTipoventaId()).append(",");
|
||||
String todos = "-1";
|
||||
|
||||
if (!listSelectedTipoVenta.isEmpty()) {
|
||||
for (TipoVenta venta : listSelectedTipoVenta) {
|
||||
tipVenta.append(venta.getDesctipoventa()).append(",");
|
||||
if (todos.equals(venta.getTipoventaId().toString())) {
|
||||
tipVentaIds = new StringBuilder();
|
||||
tipVentaIds.append("");
|
||||
break;
|
||||
}
|
||||
tipVentaIds.append(venta.getTipoventaId()).append(",");
|
||||
}
|
||||
|
||||
// removendo ultima virgula
|
||||
tipVentaIds = tipVentaIds.delete(tipVentaIds.length() -1, tipVentaIds.length());
|
||||
tipVenta = tipVenta.delete(tipVenta.length() -1, tipVenta.length());
|
||||
|
||||
}
|
||||
|
||||
// removendo ultima virgula
|
||||
tipVentaIds = tipVentaIds.delete(tipVentaIds.length() -1, tipVentaIds.length());
|
||||
tipVenta = tipVenta.delete(tipVenta.length() -1, tipVenta.length());
|
||||
|
||||
parametros.put("TIPOVENTA", tipVenta.append(";").toString());
|
||||
parametros.put("TIPOVENTA_ID", tipVentaIds.toString());
|
||||
|
||||
|
|
@ -274,17 +284,17 @@ public class RelatorioMensalDAERController extends MyGenericForwardComposer {
|
|||
|
||||
public void onCheck$rdTipoAnexoPDF() {
|
||||
if (rdTipoAnexoPDF.isChecked()) {
|
||||
tipoRelatorio(true, false);
|
||||
tipoRelatorio(true);
|
||||
}
|
||||
}
|
||||
|
||||
private void tipoRelatorio(boolean PDF, boolean XLS) {
|
||||
isPDF = (PDF ? PDF : XLS);
|
||||
private void tipoRelatorio(boolean isPDFSelected) {
|
||||
isPDF = isPDFSelected;
|
||||
}
|
||||
|
||||
public void onCheck$rdTipoAnexoXLS() {
|
||||
if (rdTipoAnexoXLS.isChecked()) {
|
||||
tipoRelatorio(false, true);
|
||||
tipoRelatorio(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue