fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug#14522 

dev: fabio
qua: xxx


git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@95865 d1611594-4594-4d17-8e1d-87c2c4800839
master
lucassilverio 2019-07-18 00:02:06 +00:00
parent 8fc89928cc
commit 9f17eee78c
5 changed files with 64 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java
View File

@ -72,17 +72,16 @@ public class RelatorioOperacionalFinanceiro extends Relatorio {
while (rset.next()) {
RelatorioOperacionalFinanceiroBean bean = new RelatorioOperacionalFinanceiroBean();
bean.setDescRuta( rset.getString("descRuta"));
bean.setDescTramo( rset.getString("descTramo"));
bean.setOutros( rset.getBigDecimal("outros"));
bean.setPedagio( rset.getBigDecimal("pedagio"));
bean.setQtde( rset.getInt("qtde"));
bean.setSeguro( rset.getBigDecimal("seguro"));
bean.setSentido( rset.getString("sentido"));
bean.setTarifa( rset.getBigDecimal("tarifa"));
bean.setTaxaembarque( rset.getBigDecimal("taxaembarque"));
bean.setTipo( rset.getString("tipo"));
bean.setTramoID( rset.getString("tramoID"));
bean.setDescRuta(rset.getString("descRuta"));
bean.setRuta(rset.getInt("ruta"));
bean.setDescTramo(rset.getString("descTramo"));
bean.setQtde(rset.getInt("qtde"));
bean.setTarifa(rset.getBigDecimal("tarifa"));
bean.setTaxaembarque(rset.getBigDecimal("taxaembarque"));
bean.setPedagio(rset.getBigDecimal("pedagio"));
bean.setOutros(rset.getBigDecimal("outros"));
bean.setSeguro(rset.getBigDecimal("seguro"));
bean.setTipo(rset.getString("tipo"));
lsDadosRelatorio.add(bean);
}
@ -119,7 +118,6 @@ public class RelatorioOperacionalFinanceiro extends Relatorio {
StringBuilder sql = new StringBuilder();
sql.append(" SELECT ");
sql.append(" tramoId, ");
sql.append(" origem || ' x ' || destino as DESCTRAMO, ");
sql.append(" DESCRUTA, ");
sql.append(" count(caja_id) as qtde, ");
@ -128,14 +126,14 @@ public class RelatorioOperacionalFinanceiro extends Relatorio {
sql.append(" SUM(pedagio) as pedagio, ");
sql.append(" SUM(outros) as outros, ");
sql.append(" SUM(seguro) as seguro, ");
sql.append(" sentido, ");
sql.append(" tipo ");
sql.append(" tipo, ");
sql.append(" ruta_id as ruta ");
sql.append(" from ( ");
sql.append(" SELECT ");
sql.append(" ");
sql.append(" t.TRAMO_ID as tramoId, ");
sql.append(" distinct ");
sql.append(" ORI.DESCPARADA as origem, ");
sql.append(" DES.DESCPARADA as destino, ");
sql.append(" r.ruta_id, ");
sql.append(" r.DESCRUTA, ");
sql.append(" c.TIPOVENTA_ID as tipoVenda, ");
sql.append(" c.caja_id, ");
@ -215,8 +213,8 @@ public class RelatorioOperacionalFinanceiro extends Relatorio {
sql.append(" LEFT JOIN CORRIDA cor ON c.CORRIDA_ID = cor.CORRIDA_ID and cor.FECCORRIDA = c.FECCORRIDA and cor.ACTIVO = 1 ");
sql.append(" LEFT JOIN CORRIDA_TRAMO ct ON ct.CORRIDA_ID = cor.CORRIDA_ID and ct.FECCORRIDA = cor.FECCORRIDA and ct.ACTIVO = 1 ");
sql.append(" LEFT JOIN TRAMO t ON t.TRAMO_ID = ct.TRAMO_ID and t.ACTIVO = 1 ");
sql.append(" LEFT JOIN parada ORI ON ORI.parada_id = t.origen_id ");
sql.append(" LEFT JOIN parada DES ON DES.parada_id = t.destino_id ");
sql.append(" LEFT JOIN parada ORI ON ORI.parada_id = c.origen_id ");
sql.append(" LEFT JOIN parada DES ON DES.parada_id = c.destino_id ");
sql.append(" where c.ACTIVO = 1 ");
sql.append(" AND c.FECHORVENTA BETWEEN :fecInicioVenda AND :fecFinalVenda ");
@ -234,13 +232,12 @@ public class RelatorioOperacionalFinanceiro extends Relatorio {
sql.append(" ) dados ");
sql.append(" GROUP BY ");
sql.append(" tramoId, ");
sql.append(" origem, ");
sql.append(" destino, ");
sql.append(" DESCRUTA, ");
sql.append(" sentido, ");
sql.append(" tipo ");
sql.append(" ORDER BY DESCRUTA, origem, destino, tipo ");
sql.append(" descruta, ");
sql.append(" tipo, ");
sql.append(" ruta_id ");
sql.append(" ORDER BY descruta, origem, destino, tipo ");
return sql.toString();
}

4
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml
View File

@ -25,7 +25,7 @@
<field name="seguro" class="java.math.BigDecimal"/>
<field name="sentido" class="java.lang.String"/>
<field name="tipo" class="java.lang.String"/>
<variable name="totalTrecho" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" calculation="Sum">
<variable name="totalTrecho" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTrecho" incrementType="Group" incrementGroup="groupTrecho" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO")
?
($F{tarifa}
@ -135,7 +135,7 @@ new java.math.BigDecimal("0")
.add( $F{seguro} ))]]></variableExpression>
<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
</variable>
<variable name="totalLinhaQte" class="java.lang.Integer" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variable name="totalLinhaQte" class="java.lang.Integer" resetType="Group" resetGroup="groupLinha" incrementType="Group" incrementGroup="groupTrecho" calculation="Sum">
<variableExpression><![CDATA[$F{tipo}.equals("CANCELADO")
?
$F{qtde}*-1

9
src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioOperacionalFinanceiroBean.java
View File

@ -15,6 +15,7 @@ public class RelatorioOperacionalFinanceiroBean {
private BigDecimal seguro;
private String sentido;
private String tipo;
private Integer ruta;
public String getTramoID() {
return tramoID;
@ -104,4 +105,12 @@ public class RelatorioOperacionalFinanceiroBean {
this.tipo = tipo;
}
public Integer getRuta() {
return ruta;
}
public void setRuta(Integer ruta) {
this.ruta = ruta;
}
}

3
web/WEB-INF/i3-label_pt_BR.label
View File

@ -8410,6 +8410,9 @@ relatorioOperacionalFinanceiroController.lvVenda = Venda
relatorioOperacionalFinanceiroController.labelOrigen.value = Origem
relatorioOperacionalFinanceiroController.labelDestino.value = Destino
relatorioOperacionalFinanceiroController.lbOrgao.value = Orgão Concedente
relatorioOperacionalFinanceiroController.lbOrganizacao.value = Tipo
relatorioVendasBilheteiroSinteticoController.lbDetalhado.value = Detalhado
relatorioVendasBilheteiroSinteticoController.lbSintetico.value = Sintetico
# Relatório Exportacao Idoso ARTESP
relatorioGratuidadeARTESPController.window.title = Relatório Gratuidade ARTESP

3
web/gui/relatorios/filtroRelatorioOperacionalFinanceiro.zul
View File

@ -7,7 +7,7 @@
<zk xmlns="http://www.zkoss.org/2005/zul">
<window id="winFiltroRelatorioOperacionalFinanceiro"
apply="${relatorioOperacionalFinanceiroController}"
contentStyle="overflow:auto" height="435px" width="550px"
contentStyle="overflow:auto" height="470px" width="580px"
border="normal">
<grid fixedLayout="true">
@ -47,6 +47,7 @@
mold="rounded" readonly="true">
<bandpopup>
<vbox>
<hbox>
<textbox
id="txtPalavraPesquisaLinha" />