From 41a3abfbadd667ae798a79122aaad745475293ca Mon Sep 17 00:00:00 2001 From: wilian Date: Fri, 18 Sep 2015 20:06:48 +0000 Subject: [PATCH] fixes bug #6631 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@48009 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioVendasBoletos.java | 274 ++++++++++++++ .../RelatorioVendasBoletosItem_es.properties | 10 + ...elatorioVendasBoletosItem_pt_BR.properties | 10 + .../RelatorioVendasBoletos_es.properties | 18 + .../RelatorioVendasBoletos_pt_BR.properties | 18 + .../templates/RelatorioVendasBoletos.jasper | Bin 0 -> 29456 bytes .../templates/RelatorioVendasBoletos.jrxml | 142 +++++++ .../RelatorioVendasBoletosItem.jasper | Bin 0 -> 39044 bytes .../RelatorioVendasBoletosItem.jrxml | 358 ++++++++++++++++++ .../RelatorioVendasPacotesBoletosBean.java | 9 + ...latorioVendasPacotesBoletosController.java | 36 +- web/WEB-INF/i3-label_es_MX.label | 3 + web/WEB-INF/i3-label_pt_BR.label | 4 + .../filtroRelatorioVendasPacotesBoletos.zul | 12 + 14 files changed, 887 insertions(+), 7 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasBoletos.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasBoletosItem_es.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasBoletosItem_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasBoletos_es.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasBoletos_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasBoletos.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasBoletos.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasBoletosItem.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasBoletosItem.jrxml diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasBoletos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasBoletos.java new file mode 100644 index 000000000..1016b82d4 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasBoletos.java @@ -0,0 +1,274 @@ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.sql.Date; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; + +import org.apache.log4j.Logger; + +import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioVendasPacotesBoletosBean; +import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; + +public class RelatorioVendasBoletos extends Relatorio { + + private static Logger log = Logger.getLogger(RelatorioVendasBoletos.class); + + private SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + + private List lsDadosRelatorio; + + private Date fecInicio; + private Date fecFinal; + private Integer empresaId; + private Integer origenId; + private Integer destinoId; + + public RelatorioVendasBoletos(Map parametros, Connection conexao, final String... nomeSubReporte) throws Exception { + super(parametros, conexao); + + this.setCustomDataSource(new DataSource(this) { + + + @Override + public void initDados() throws Exception { + Map parametros = this.relatorio.getParametros(); + fecInicio = new java.sql.Date(sdf.parse(parametros.get("fecInicio").toString()).getTime()); + fecFinal = new java.sql.Date(sdf.parse(parametros.get("fecFinal").toString()).getTime()); + empresaId = parametros.get("empresaId") != null && !parametros.get("empresaId").equals("null") ? Integer.valueOf(parametros.get("empresaId").toString()) : null; + origenId = parametros.get("origenId") != null && !parametros.get("origenId").equals("null") ? Integer.valueOf(parametros.get("origenId").toString()) : null; + destinoId = parametros.get("destinoId") != null && !parametros.get("destinoId").equals("null") ? Integer.valueOf(parametros.get("destinoId").toString()) : null; + + Connection conexao = this.relatorio.getConexao(); + processarVendasPacote(conexao); + processarVendasPacoteCancelados(conexao); + + setNomeSubReporte(nomeSubReporte); + setLsDadosRelatorio(lsDadosRelatorio); + } + + }); + } + + private void processarVendasPacote(Connection conexao) { + ResultSet rset = null; + NamedParameterStatement stmt = null; + + try { + stmt = carregarNamedParameterStatement(conexao, false); + rset = stmt.executeQuery(); + + if(lsDadosRelatorio == null) { + lsDadosRelatorio = new ArrayList(); + } + + while (rset.next()) { + RelatorioVendasPacotesBoletosBean relatorioVendasBoletosBean = carregarRelatorioVendasBoletosBean(rset); + Integer idx = carregarIndice(relatorioVendasBoletosBean); + + if(idx != null) { + relatorioVendasBoletosBean = lsDadosRelatorio.get(idx); + } + + relatorioVendasBoletosBean.setRelatorioVendasPacotesBoletosItemBeans(carregarItens(rset, relatorioVendasBoletosBean, relatorioVendasBoletosBean.getRelatorioVendasPacotesBoletosItemBeans())); + + if(idx != null) { + lsDadosRelatorio.set(idx, relatorioVendasBoletosBean); + } else { + lsDadosRelatorio.add(relatorioVendasBoletosBean); + } + } + + } catch (Exception e) { + log.error(e.getMessage(), e); + } finally { + try { + if(rset != null) { + rset.close(); + } + if(stmt != null) { + stmt.close(); + } + } catch (SQLException e) { + log.error(e.getMessage(), e); + } + } + + } + + private List carregarItens(ResultSet rset, RelatorioVendasPacotesBoletosBean relatorioVendasPacotesBoletosBean, List itens) throws SQLException { + RelatorioVendasPacotesBoletosBean.RelatorioVendasPacotesBoletosItemBean relatorioVendasPacotesBoletosItemBean = relatorioVendasPacotesBoletosBean.new RelatorioVendasPacotesBoletosItemBean(); + relatorioVendasPacotesBoletosItemBean.setDesccategoria(rset.getString("desccategoria")); + relatorioVendasPacotesBoletosItemBean.setQtde(rset.getLong("qtde")); + relatorioVendasPacotesBoletosItemBean.setSimportetaxaembarque(rset.getBigDecimal("simportetaxaembarque")); + relatorioVendasPacotesBoletosItemBean.setSimportepedagio(rset.getBigDecimal("simportepedagio")); + relatorioVendasPacotesBoletosItemBean.setSimporteoutros(rset.getBigDecimal("simporteoutros")); + relatorioVendasPacotesBoletosItemBean.setSimporteseguro(rset.getBigDecimal("simporteseguro")); + relatorioVendasPacotesBoletosItemBean.setSpreciobase(rset.getBigDecimal("spreciobase")); + relatorioVendasPacotesBoletosItemBean.setDesconto(rset.getBigDecimal("desconto")); + + if(itens == null) { + itens = new ArrayList(); + } + itens.add(relatorioVendasPacotesBoletosItemBean); + + return itens; + } + + private Integer carregarIndice(RelatorioVendasPacotesBoletosBean relatorioVendasBoletosBean) { + Integer idx = null; + if(lsDadosRelatorio.contains(relatorioVendasBoletosBean)) { + idx = lsDadosRelatorio.indexOf(relatorioVendasBoletosBean); + relatorioVendasBoletosBean = lsDadosRelatorio.get(idx); + } + return idx; + } + + private RelatorioVendasPacotesBoletosBean carregarRelatorioVendasBoletosBean(ResultSet rset) throws SQLException { + RelatorioVendasPacotesBoletosBean relatorioVendasPacotesBoletosBean = new RelatorioVendasPacotesBoletosBean(); + relatorioVendasPacotesBoletosBean.setDescdestino(rset.getString("destino")); + relatorioVendasPacotesBoletosBean.setDescorigen(rset.getString("origem")); + relatorioVendasPacotesBoletosBean.setCvedestino(rset.getString("cvedestino")); + relatorioVendasPacotesBoletosBean.setCveorigen(rset.getString("cveorigem")); + + return relatorioVendasPacotesBoletosBean; + } + + private void processarVendasPacoteCancelados(Connection conexao) { + ResultSet rset = null; + NamedParameterStatement stmt = null; + + try { + stmt = carregarNamedParameterStatement(conexao, true); + rset = stmt.executeQuery(); + + if(lsDadosRelatorio == null) { + lsDadosRelatorio = new ArrayList(); + } + + while (rset.next()) { + RelatorioVendasPacotesBoletosBean relatorioVendasBoletosBean = carregarRelatorioVendasBoletosBean(rset); + Integer idx = carregarIndice(relatorioVendasBoletosBean); + + if(idx != null) { + relatorioVendasBoletosBean = lsDadosRelatorio.get(idx); + } + + relatorioVendasBoletosBean.setRelatorioVendasPacotesBoletosItemBeansCancelados(carregarItens(rset, relatorioVendasBoletosBean, relatorioVendasBoletosBean.getRelatorioVendasPacotesBoletosItemBeansCancelados())); + + if(idx != null) { + lsDadosRelatorio.set(idx, relatorioVendasBoletosBean); + } else { + lsDadosRelatorio.add(relatorioVendasBoletosBean); + } + } + + } catch (Exception e) { + log.error(e.getMessage(), e); + } finally { + try { + if(rset != null) { + rset.close(); + } + if(stmt != null) { + stmt.close(); + } + } catch (SQLException e) { + log.error(e.getMessage(), e); + } + } + + } + + private NamedParameterStatement carregarNamedParameterStatement(Connection conexao, boolean cancelados) throws SQLException { + String sql = getSqlPacotes(cancelados); + log.info(sql); + + NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); + + if(fecInicio != null) { + stmt.setDate("fecInicio", fecInicio); + } + if(fecFinal != null) { + stmt.setDate("fecFinal", fecFinal); + } + if (empresaId != null){ + stmt.setInt("empresaId", empresaId); + } + if(origenId != null) { + stmt.setInt("origenId", origenId); + } + if(destinoId != null) { + stmt.setInt("destinoId", destinoId); + } + + return stmt; + } + + protected String getSqlPacotes(boolean cancelado) { + StringBuilder sQuery = new StringBuilder(); + + sQuery.append("SELECT DES.CVEPARADA AS CVEDESTINO, ORI.CVEPARADA AS CVEORIGEM, ORI.DESCPARADA AS ORIGEM, DES.DESCPARADA AS DESTINO, CAT.DESCCATEGORIA AS DESCCATEGORIA, ") + .append("COUNT(B.BOLETO_ID) AS QTDE, SUM(B.IMPORTETAXAEMBARQUE) AS SIMPORTETAXAEMBARQUE, SUM(B.IMPORTEPEDAGIO) AS SIMPORTEPEDAGIO, ") + .append("SUM(B.IMPORTEOUTROS) AS SIMPORTEOUTROS, SUM(B.IMPORTESEGURO) AS SIMPORTESEGURO, SUM(B.PRECIOBASE) AS SPRECIOBASE, SUM(B.PRECIOBASE - B.PRECIOPAGADO) AS DESCONTO ") + .append("FROM BOLETO B ") + .append("LEFT JOIN PARADA ORI ON ORI.PARADA_ID = B.ORIGEN_ID ") + .append("LEFT JOIN PARADA DES ON DES.PARADA_ID = B.DESTINO_ID ") + .append("LEFT JOIN CATEGORIA CAT ON CAT.CATEGORIA_ID = B.CATEGORIA_ID ") + .append("WHERE B.ACTIVO = 1 "); + + if(!cancelado) { + sQuery.append("AND B.INDSTATUSBOLETO = 'V' ") + .append("AND B.MOTIVOCANCELACION_ID IS NULL "); + } else { + sQuery.append("AND B.MOTIVOCANCELACION_ID IS NOT NULL "); + } + + if(empresaId != null) { + sQuery.append("AND B.EMPRESACORRIDA_ID = :empresaId "); + } + + if(origenId != null) { + sQuery.append("AND B.ORIGEN_ID = :origenId "); + } + + if(destinoId != null) { + sQuery.append("AND B.DESTINO_ID = :destinoId "); + } + + if(fecInicio != null) { + sQuery.append("AND B.FECHORVENTA >= :fecInicio "); + } + + if(fecFinal != null) { + sQuery.append("AND B.FECHORVENTA <= :fecFinal "); + } + + sQuery.append("GROUP BY DES.CVEPARADA, ORI.CVEPARADA, ORI.DESCPARADA, DES.DESCPARADA, CAT.DESCCATEGORIA ") + .append("ORDER BY DES.CVEPARADA, ORI.CVEPARADA, ORI.DESCPARADA, DES.DESCPARADA, CAT.DESCCATEGORIA "); + + return sQuery.toString(); + } + + @Override + protected void processaParametros() throws Exception { + } + + public List getLsDadosRelatorio() { + return lsDadosRelatorio; + } + + public void setLsDadosRelatorio(List lsDadosRelatorio) { + this.setCollectionDataSource(new JRBeanCollectionDataSource(lsDadosRelatorio)); + this.lsDadosRelatorio = lsDadosRelatorio; + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasBoletosItem_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasBoletosItem_es.properties new file mode 100644 index 000000000..e13de24fc --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasBoletosItem_es.properties @@ -0,0 +1,10 @@ +#Labels +label.qtde=Qtde +label.categoria=Categoria +label.spreciobase=Valor Tarifário +label.simporteseguro=Valor Seguro +label.simportetaxaembarque=Taxa Embarque +label.simporteoutros=Valor Serviço +label.spreciopagado=Total c/ Desconto +label.desconto=Desconto +label.spreciototal=Valor Total \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasBoletosItem_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasBoletosItem_pt_BR.properties new file mode 100644 index 000000000..e13de24fc --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasBoletosItem_pt_BR.properties @@ -0,0 +1,10 @@ +#Labels +label.qtde=Qtde +label.categoria=Categoria +label.spreciobase=Valor Tarifário +label.simporteseguro=Valor Seguro +label.simportetaxaembarque=Taxa Embarque +label.simporteoutros=Valor Serviço +label.spreciopagado=Total c/ Desconto +label.desconto=Desconto +label.spreciototal=Valor Total \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasBoletos_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasBoletos_es.properties new file mode 100644 index 000000000..cd1b4b3da --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasBoletos_es.properties @@ -0,0 +1,18 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. + +#Labels cabeçalho +cabecalho.nome=Relatório Vendas de Boletos +cabecalho.relatorio=Relatório: +cabecalho.periodo=Período: +cabecalho.periodoA=à +cabecalho.dataHora=Data/Hora: +cabecalho.impressorPor=Impressor por: +cabecalho.pagina=Página +cabecalho.de=de +cabecalho.filtros=Filtros: +cabecalho.origem=Origem: +cabecalho.destino=Destino: +label.empresa=Empresa: +label.trecho=Trecho: +label.cancelados = - CANCELADOS \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasBoletos_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasBoletos_pt_BR.properties new file mode 100644 index 000000000..272e6fce8 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasBoletos_pt_BR.properties @@ -0,0 +1,18 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. + +#Labels cabeçalho +cabecalho.nome=Relatório Vendas de Boletos +cabecalho.relatorio=Relatório: +cabecalho.periodo=Período: +cabecalho.periodoA=à +cabecalho.dataHora=Data/Hora: +cabecalho.impressorPor=Impressor por: +cabecalho.pagina=Página +cabecalho.de=de +cabecalho.filtros=Filtros: +cabecalho.origem=Origem: +cabecalho.destino=Destino: +label.empresa=Empresa: +label.trecho=Trecho: +label.cancelados=- CANCELADOS \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasBoletos.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasBoletos.jasper new file mode 100644 index 0000000000000000000000000000000000000000..da8e74a11d06ed9456a22071e972b40d7461c869 GIT binary patch literal 29456 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 literal 0 HcmV?d00001 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasBoletos.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasBoletos.jrxml new file mode 100644 index 000000000..cbb7ea38a --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasBoletos.jrxml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="80" splitType="Stretch"> + <textField> + <reportElement x="0" y="0" width="620" height="20" uuid="43b2c28d-4760-4890-b00d-25e931e79c74"/> + <textElement markup="none"> + <font size="14" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{cabecalho.nome}]]></textFieldExpression> + </textField> + <textField pattern="dd/MM/yyyy HH:mm"> + <reportElement x="638" y="0" width="164" height="20" uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5"/> + <textElement textAlignment="Right"> + <font isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> + </textField> + <textField> + <reportElement x="0" y="20" width="620" height="20" uuid="a16eb33b-78ca-4fb4-80c2-f5c85a0d09c3"/> + <textElement> + <font isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{label.empresa} + " " + $P{empresa}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="0" y="40" width="620" height="20" uuid="fd05bd35-30d9-4baf-aa56-f8e5d3c3268b"/> + <textElement> + <font isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{cabecalho.periodo} + " " + $P{fecInicio} + " " + $R{cabecalho.periodoA} + " " + $P{fecFinal}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="0" y="60" width="802" height="20" uuid="bc1ac781-2bb6-40ef-92dd-d4f07f327d18"/> + <textElement> + <font isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{cabecalho.origem} + " " + $P{origem} + " " + $R{cabecalho.destino} + " " + $P{destino}]]></textFieldExpression> + </textField> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasBoletosItem.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasBoletosItem.jasper new file mode 100644 index 0000000000000000000000000000000000000000..4730b7c362e0728e6fd30bfecc372125c85c5b48 GIT binary patch literal 39044 zcmeIbd3@Bx{Xaf48^|UsA>4<82g(s3;S#NK<%GmsCIJ*$;*xC0%4Rq2Zn!*(2i^yY zSJh(G;#H_xZ-pvaZ&A@o)oP2aR;#wvdbCoH@AEY?``-8LzIU?;zsK*dPhjUg$9ra8 z^Lov^Uay&X&Ahk$gY}7o*@U1kS{P|7JjEO7^o7H|&QLfSDf9(b`h&j0DjC@zBbodg z|E6HBYSynM)Y0h=_{zLdZ0n#ojR3%g5l@1#mDM#jmN!%uS2r&%Z)mKnt8HFXSystBD?-s|sH4UkMk6b!ErG6%U}>l;7_B5o zDAd^LZ2@Rj>Joozw0$Yd_pc0w!oGSha(biwP;e<5?2l9gLf&Yp%vTW#MSWp%OJzP%CPQKiW=l3w_>JU${8f8q1aEk2LwC0iVuO$#Mg}wx|NMg!K!B z{k|X&j(U;QDNFFLYzNdi6p%2MAOT2?)`d|tzz@?4v8LukL!GhG^47Hbg0&%{VAHxz zUp32J;cZ#9G7L1dM%fY7zTpxXe2tulYu*Fs=L*^IOqqo}E< zp(|)*C=YgZpd61XN8y3UpJl}8-vtZ&x7N z7+n|eMcI+vWR$NVTi;e+)awsuaQdrIW2~X$yDLS#h;jzCg~A=)Xoa^W8VawA_i&)x z-yz3aqc0j|1JuCiiuwZ>M+CQ<21yqvD+fe1%fsM^QpYjy)UU(q59-E7S$AN?v62+SW?4*2R0LrmF0s2CTZ%Qn%N24T$$vUDdSitE#tp zxU6Xz>l-1`qF0RTu2;l}n;lWZQ-ZOKF4%cD%5R(|Q$AG0z%8+f+7*<6QSI1$Xs8{(t;l-iy#gV|-)O4WO6pSX{+GvH}7qAVNq3MT9{}rLoDv1A8)xOofKnct9 ztp+2NqPxl8;VWSS+JVn-z#m-I1UK-Axv08urI18nlX7%BXb5{!mblB;(G0#P>D&Y4iC&l?0Vx$!|Z6+ds|zfbDM~&3`Tt`ePI;oZi9YFy89Do{6Oj@^QghP@Z0JGBaVJRsVn&s*d&==$n z1zM?wNr25CsYJ#879H;IkJPuem3OT0wYK_VFAb0b-oMJ%)DGdXvR%LHp=f9~t;B_N zTt9zgQ4r)nPm#?>6>_Rz;Clc~9+I)$kD@iMsW_l6o60E(VRqJ?`dF=A1U~yw9z9K> zV$dt{ZBZJ38R(5vq%J3hJ7Sz&om47@1G>NL7aCSfb;912VQ*)9lub-aovH>J^zv1L zw-X2twuGpQ>5?g`!t7LPzGR>=UrwQt@#vB9CL-P8keZ)qjP#F%H9CsY0xY{zgDyei zf~IT+IC)lteF)_u)&ylB1V+@~lHA*eB_(L!W_AzUVtbhqLa?2*YJ*LRCb67@(y^RM zW~rRRF=u440Fh@ zX*#KUn%3ZL-P!tKY=JFGc0&bcSF;heC}O^r#MBiJv?EPdn!y@Cy$#j6a;JF&RRXnU zs5Qlq>Pl%lv`nAW>Lw&k9w^6Ps0(^Vu`VtpGf@}x#KM*fw8*!01l__6*qYYesQ2gw zW_5L;55=UVRQ?xXK?>@-p5zT-T+i|Dg+U0&uUu90K3YMzg61>2^>Ce+ts7{ zUA6CGfq6`4F&d)^jFp-xdn0ZF8LE&$8dbkU&4y49X`7?f9hwQIAD_fLX|XM|w%$j& zBDAWtrKG~3D)5%>CW**ry-gC(N$`^{;FGFlRg$Q6by_LT!j4u1;<=M$P+yWtx{S4w zM48T_0eXpCrA78QMrodz>7uYgT0Ae0t2so6X(*~7Lw(tRp>H~&1>%wpWS7h`!s4i4 z&w2EQjL^&^gVhM?TQZAgC9+Vt-b-yMLeJ>*VFf$mo`DuwZ)^TT-JJ@nwwyUMrqVJS zn{WrZt5si$qnxd!vT9?4)GD~TQ}S-dgv@6#sIftJz>KQQe7cX4n`Fn$q+Bd+WCcS( zA0aC(=d>Zq(o5qNxOZW-AXd52@`MV0a>`zT!5_PKmexw!e-m@sYBkBRx^?ibk*ktHa_&w~muN zVK|tB?tXKm&*osoDDAvf3Zx{xR3X-ocrHjd`)aCO@=D8(WYNj%8%|}{)-CD5V2LXw z@eYtx$%MZZOW7^$UBOjQR;G5hwh=F-l(K+Gc~Zv79R}M(c~CsI!RHNFDRM0^zYE<~ z)|7e|(6(5sYU()Yl|T89zjcw6m}mk=+h=9SOcS7vBS4g}EW&s-9(txL)^_&6#z?@s z!WSrPfr7shb8T;|bD+|JaamrXR#bK$8s6~6jr;!znZGn9^E+vMQ}LYfNvc*IAov`= zWL1lL?>x#$o)Xzn%YOCjtuN$E`}~RMg;nA8uaxeH@wQm`6;gjdpPiWw9kOFNtQ#m~ z7`?VnL*;^nO$3GflTcKuw$#KbC-~&bfOLW?wJ|x>f$genDq(S|949&?#MvIzzKnn) zPf&pwcPX-&^6R#N6cn{WHiXtw2X;|-C45}Q`9bl4isBKhA-4EK#5m&x!YAKzq$DTw zXGY2Mx909X?WL<V5cRJ0 z`Z`v4!>4v-JPzK=m<-p8XCC?T%U9;#KcM;3OY;^yb3kOcnc6FzEe>Q*sSaeYCm3X~ zCm3YV2`R|1rN?9#;y{LkaS-Z?hC>mfx2~e-_c|I4|Bjj z>`h4VYV}20FtyAW_0uv&{k;YI%9hXa9^3!=hpv9TPuXn;g!-2W_0oCK0re`?0rmC- z1NHU<1NAx~1?peyG3tjqpnj0i^`qDm2pHu;_s!JIgC>-q2>xhM%9U>UqJ-tN#!R^| zo3Q+Pp(6cSHYv45RGDeqg>{yr(&@ssY4HNu)$z9^?GyA#2Q#J%ZT^6?(xSC*@@sI@ zudPXNEAX~nQjvRLSQm-1v1!-LF+Y}Tak0g*A##yp7Ij^qctp%f$9l3(>X-TC90{ta zrB7^?7Rp5;zIFIH`Ipb=60A=J>)Qq@w|lYKAZKjVOtfGgc#zu6q}|mP+HX*Mth8h1 zI}V0RZQ+$G*d{|%-(Qrq#}6;P^ir(zP;}y)X6ul)qB+~gzg|;%&HK03 zm0ku*ihpV)8Cgja!bxUfc7=7CjgP&18 zI|eE5K8ozFRS&;>`>bLj1pX%%tAUoe1e9D!( zCcgT}Q8W6UF}7?%DnR~`86cZ_4akPiw|)HhoCVvTob~%(-|~Ik%c%hQJTpM{^%{`t z23=S5_XS7aaQp2CUDZ@ni%GO|hx;lcK*ZEu1G00%9Wy CP+|_Sz|3yX&AdI|K4f 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 literal 0 HcmV?d00001 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasBoletosItem.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasBoletosItem.jrxml new file mode 100644 index 000000000..e3723938e --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasBoletosItem.jrxml @@ -0,0 +1,358 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band splitType="Stretch"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasPacotesBoletosBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasPacotesBoletosBean.java index c908daf83..5a148393c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasPacotesBoletosBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasPacotesBoletosBean.java @@ -41,6 +41,7 @@ public class RelatorioVendasPacotesBoletosBean { private String nomconvenio; private String desctipotarifa; + private String desccategoria; private Long qtde; private BigDecimal simportetaxaembarque; private BigDecimal simportepedagio; @@ -172,6 +173,14 @@ public class RelatorioVendasPacotesBoletosBean { this.spreciobase = spreciobase; } + public String getDesccategoria() { + return desccategoria; + } + + public void setDesccategoria(String desccategoria) { + this.desccategoria = desccategoria; + } + } @Override diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasPacotesBoletosController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasPacotesBoletosController.java index 078e4013c..3218a2bc1 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasPacotesBoletosController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasPacotesBoletosController.java @@ -1,5 +1,6 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; +import java.sql.SQLException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -21,11 +22,13 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Comboitem; import org.zkoss.zul.ComboitemRenderer; import org.zkoss.zul.Datebox; +import org.zkoss.zul.Radio; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Parada; import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote; import com.rjconsultores.ventaboletos.entidad.Usuario; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioVendasBoletos; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioVendasPacotesBoletos; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.service.EmpresaService; @@ -57,6 +60,8 @@ public class RelatorioVendasPacotesBoletosController extends MyGenericForwardCom private Datebox dataFinal; private MyComboboxEstandar cmbEmpresa; private MyComboboxEstandar cmbTipoTarifaPacote; + private Radio rVendaPacotesBoletos; + private Radio rVendaBoletos; private MyComboboxParada cmbParadaOrigem; private MyComboboxParadaCve cmbParadaOrigemCve; @@ -166,13 +171,13 @@ public class RelatorioVendasPacotesBoletosController extends MyGenericForwardCom parametros.put("tipoTarifaPacote", tipoTarifaPacote.getDesctipotarifa()); } - JasperReport subRelatorioVendasPacotesBoletosItens = (JasperReport) JRLoader.loadObject(this.getClass().getResourceAsStream("/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItem.jasper")); - parametros.put("subreporte", subRelatorioVendasPacotesBoletosItens); - - JasperReport subRelatorioVendasPacotesBoletosItensTotais = (JasperReport) JRLoader.loadObject(this.getClass().getResourceAsStream("/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItemTotais.jasper")); - parametros.put("subreporteTotais", subRelatorioVendasPacotesBoletosItensTotais); - - Relatorio relatorio = new RelatorioVendasPacotesBoletos(parametros, dataSourceRead.getConnection(), "RelatorioVendasPacotesBoletosItem", "RelatorioVendasPacotesBoletosItemTotais"); + Relatorio relatorio = null; + + if(rVendaPacotesBoletos.isSelected()) { + relatorio = gerarRelatorioVendaPacotesBoletos(parametros); + } else if(rVendaBoletos.isSelected()) { + relatorio = gerarRelatorioVendaBoletos(parametros); + } Map args = new HashMap(); args.put("relatorio", relatorio); @@ -180,6 +185,23 @@ public class RelatorioVendasPacotesBoletosController extends MyGenericForwardCom openWindow("/component/reportView.zul", Labels.getLabel("relatorioVendasPacotesBoletosController.window.title"), args, MODAL); } + + private Relatorio gerarRelatorioVendaPacotesBoletos(Map parametros) throws SQLException, Exception { + JasperReport subRelatorioVendasPacotesBoletosItens = (JasperReport) JRLoader.loadObject(this.getClass().getResourceAsStream("/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItem.jasper")); + parametros.put("subreporte", subRelatorioVendasPacotesBoletosItens); + + JasperReport subRelatorioVendasPacotesBoletosItensTotais = (JasperReport) JRLoader.loadObject(this.getClass().getResourceAsStream("/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItemTotais.jasper")); + parametros.put("subreporteTotais", subRelatorioVendasPacotesBoletosItensTotais); + + return new RelatorioVendasPacotesBoletos(parametros, dataSourceRead.getConnection(), "RelatorioVendasPacotesBoletosItem", "RelatorioVendasPacotesBoletosItemTotais"); + } + + private Relatorio gerarRelatorioVendaBoletos(Map parametros) throws SQLException, Exception { + JasperReport subRelatorioVendasBoletosItens = (JasperReport) JRLoader.loadObject(this.getClass().getResourceAsStream("/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasBoletosItem.jasper")); + parametros.put("subreporte", subRelatorioVendasBoletosItens); + + return new RelatorioVendasBoletos(parametros, dataSourceRead.getConnection(), "RelatorioVendasBoletosItem"); + } public void onSelect$cmbParadaOrigemCve(Event ev) { if (cmbParadaOrigemCve.getSelectedItem() != null) { diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index c69810028..9d46c17e2 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -5549,6 +5549,9 @@ relatorioVendasPacotesBoletosController.lblPacote.value = Pacote relatorioVendasPacotesBoletosController.lblOrigem.value = Origem relatorioVendasPacotesBoletosController.lblDestino.value = Destino relatorioVendasPacotesBoletosController.lblUsuario.value = Usuário +relatorioVendasPacotesBoletosController.lbTipoRelatorio.value = Tipo Relatório +relatorioVendasPacotesBoletosController.lbVendaPacotesBoletos.value = Vendas de Boletos no Pacote +relatorioVendasPacotesBoletosController.lbVendaBoletos.value = Vendas de Boletos Avulsos # Relatorio Venda Pacote Voucher RelatorioVendaPacoteVoucher.window.title = Voucher Venda Pacote diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index a2c117f10..a9f9c749d 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -5691,6 +5691,10 @@ relatorioVendasPacotesBoletosController.lblPacote.value = Pacote relatorioVendasPacotesBoletosController.lblOrigem.value = Origem relatorioVendasPacotesBoletosController.lblDestino.value = Destino relatorioVendasPacotesBoletosController.lblUsuario.value = Usuário +relatorioVendasPacotesBoletosController.lblUsuario.value = Usuário +relatorioVendasPacotesBoletosController.lbTipoRelatorio.value = Tipo Relatório +relatorioVendasPacotesBoletosController.lbVendaPacotesBoletos.value = Vendas de Boletos no Pacote +relatorioVendasPacotesBoletosController.lbVendaBoletos.value = Vendas de Boletos Avulsos # Relatorio Venda Pacote Voucher RelatorioVendaPacoteVoucher.window.title = Voucher Venda Pacote diff --git a/web/gui/relatorios/filtroRelatorioVendasPacotesBoletos.zul b/web/gui/relatorios/filtroRelatorioVendasPacotesBoletos.zul index 461f674a2..c110265ad 100644 --- a/web/gui/relatorios/filtroRelatorioVendasPacotesBoletos.zul +++ b/web/gui/relatorios/filtroRelatorioVendasPacotesBoletos.zul @@ -79,6 +79,18 @@ format="dd/MM/yyyy" lenient="false" constraint="no empty" maxlength="10" /> + + +