diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java index 437bf8420..f790717f8 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java @@ -35,7 +35,8 @@ public class RelatorioTabelaPreco extends Relatorio { dataResult.put("tipoClasse", rset.getString("tipoClasse")); dataResult.put("linha", rset.getString("linha")); dataResult.put("empresa", rset.getString("empresa")); - dataResult.put("dataVigencia", rset.getString("dataVigencia")); + dataResult.put("dataVigenciaInicial", rset.getDate("dataVigenciaInicial")); + dataResult.put("dataVigenciaFinal", rset.getDate("dataVigenciaFinal")); dataResult.put("idLinha", rset.getInt("idLinha")); dataResult.put("idVigencia", rset.getInt("idVigencia")); @@ -64,7 +65,8 @@ public class RelatorioTabelaPreco extends Relatorio { sql.append(" cs.DESCCLASE as tipoClasse, "); sql.append(" r.DESCRUTA as linha, "); sql.append(" e.NOMBEMPRESA as empresa, "); - sql.append(" vt.FECINICIOVIGENCIA || ' à ' || vt.FECFINVIGENCIA as dataVigencia, "); + sql.append(" vt.FECINICIOVIGENCIA as dataVigenciaInicial, "); + sql.append(" vt.FECFINVIGENCIA as dataVigenciaFinal, "); sql.append(" vt.VIGENCIATARIFA_ID as idVigencia, "); sql.append(" vt.FECINICIOVIGENCIA as dataVigenciaInicial, "); sql.append(" r.RUTA_ID as idLinha "); @@ -76,7 +78,7 @@ public class RelatorioTabelaPreco extends Relatorio { sql.append("INNER JOIN MARCA m ON m.MARCA_ID = t.MARCA_ID "); sql.append("INNER JOIN EMPRESA e ON e.EMPRESA_ID = m.EMPRESA_ID "); sql.append("INNER JOIN VIGENCIA_TARIFA vt ON vt.VIGENCIATARIFA_ID = t.VIGENCIATARIFA_ID "); - sql.append("WHERE (1 = 1) AND ROWNUM < 101 "); + sql.append("WHERE (1 = 1) "); if(parametros.get("VIGENCIA_ID") != null){ sql.append(" AND vt.VIGENCIATARIFA_ID = " + parametros.get("VIGENCIA_ID")); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jasper index 9252c709f..ad6272611 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jrxml index d45db442e..55b9fe71e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jrxml @@ -1,8 +1,8 @@ - + - + @@ -27,7 +27,8 @@ - + + @@ -36,31 +37,45 @@ - + - + - + - - - + + + - + + + + + + + + + + + + + + + - <band height="124"> + <band height="119"> <textField pattern="" isBlankWhenNull="false"> <reportElement uuid="136a5066-d141-4362-af36-0780f0d16542" mode="Transparent" x="0" y="0" width="457" height="35" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none"> @@ -119,11 +134,11 @@ <textFieldExpression><![CDATA[$R{label.empresa} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="bcd47f18-94dc-4d33-96db-6d89795188d3" x="102" y="57" width="513" height="18"/> + <reportElement uuid="bcd47f18-94dc-4d33-96db-6d89795188d3" x="102" y="57" width="699" height="18"/> <textElement/> <textFieldExpression><![CDATA[$P{EMPRESA_ID} == null ? "Todas" : -($P{EMPRESA_ID}.toString() + " - " + $P{EMPRESA}) ]]></textFieldExpression> +($P{EMPRESA_ID}.toString() + " - " + $P{EMPRESA})]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> <reportElement uuid="049832ef-f634-42f9-95b1-ac2e1fe23b10" x="0" y="75" width="102" height="18" isPrintWhenDetailOverflows="true"/> @@ -136,11 +151,10 @@ <textFieldExpression><![CDATA[$R{label.linha} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="df6b8946-988c-479c-8eeb-c8d40c94734b" x="102" y="75" width="511" height="18"/> + <reportElement uuid="df6b8946-988c-479c-8eeb-c8d40c94734b" x="102" y="75" width="586" height="18"/> <textElement/> <textFieldExpression><![CDATA[$P{RUTA_ID} == null ? -"Todas" : -($P{RUTA_ID}.toString() + " - " + $P{RUTA})]]></textFieldExpression> +"Todas" : $P{RUTA}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> <reportElement uuid="2d048310-1ec5-4711-b402-75ef3d3500d4" x="0" y="93" width="102" height="18" isPrintWhenDetailOverflows="true"/> @@ -153,28 +167,28 @@ <textFieldExpression><![CDATA[$R{label.dataVigencia} + ":"]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy"> - <reportElement uuid="40c47b73-ef86-4b76-a4bb-ec284d4e6f59" x="102" y="93" width="56" height="18"> + <reportElement uuid="40c47b73-ef86-4b76-a4bb-ec284d4e6f59" x="102" y="93" width="70" height="18"> <printWhenExpression><![CDATA[new Boolean($P{VIGENCIA_ID} != null)]]></printWhenExpression> </reportElement> - <textElement/> + <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$P{VIGENCIA_INICIAL}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy"> - <reportElement uuid="12564f32-d986-46a6-a184-23b23ba50bcb" x="176" y="93" width="56" height="18"> + <reportElement uuid="12564f32-d986-46a6-a184-23b23ba50bcb" x="190" y="93" width="70" height="18"> <printWhenExpression><![CDATA[new Boolean($P{VIGENCIA_ID} != null)]]></printWhenExpression> </reportElement> <textElement/> <textFieldExpression><![CDATA[$P{VIGENCIA_FINAL}]]></textFieldExpression> </textField> <staticText> - <reportElement uuid="bdfc1a2c-9e77-418f-8169-50c67ad7f116" x="158" y="93" width="18" height="18"> + <reportElement uuid="bdfc1a2c-9e77-418f-8169-50c67ad7f116" x="172" y="93" width="18" height="18"> <printWhenExpression><![CDATA[new Boolean($P{VIGENCIA_ID} != null)]]></printWhenExpression> </reportElement> <textElement textAlignment="Center"/> <text><![CDATA[à]]></text> </staticText> <staticText> - <reportElement uuid="1bba53bd-7d81-491b-b1de-11a0c570c5c7" x="102" y="93" width="130" height="18"> + <reportElement uuid="1bba53bd-7d81-491b-b1de-11a0c570c5c7" x="102" y="93" width="158" height="18"> <printWhenExpression><![CDATA[new Boolean($P{VIGENCIA_ID} == null)]]></printWhenExpression> </reportElement> <textElement/>