diff --git a/pom.xml b/pom.xml index 646fd926f..f4f17890d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.34.14 + 1.35.14 war - 1.25.1 - 1.21.1 + 1.26.1 + 1.22.1 UTF-8 UTF-8 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java index 469658e8d..c2c9ebbca 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java @@ -1,62 +1,36 @@ -/** - * - */ package com.rjconsultores.ventaboletos.relatorios.impl; import java.math.BigDecimal; import java.sql.Connection; import java.sql.ResultSet; import java.sql.Timestamp; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Objects; -import java.util.Set; import org.apache.log4j.Logger; - -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.relatorios.negocio.CalculoImposto; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; -import com.rjconsultores.ventaboletos.relatorios.utilitarios.ExceptionConfiguracao; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioComissaoSinteticoBean; import com.rjconsultores.ventaboletos.utilerias.DateUtil; -import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioComissaoSintetico extends Relatorio { - -private static final Logger log = Logger.getLogger(RelatorioComissaoSintetico.class);; -private List lsDadosRelatorio; -private LinkedHashMap> mapCacheConfigComissao; -private Set pontoVendaConfiguracao; - - - + private List lsDadosRelatorio; public RelatorioComissaoSintetico(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); - - CalculoImposto.limpaCache(); - this.mapCacheConfigComissao = new LinkedHashMap>(); - this.setCustomDataSource(new DataSource(this) { @Override public void initDados() throws Exception { Connection conexao = this.relatorio.getConexao(); - Map parametros = this.relatorio.getParametros(); String empresaID = parametros.get("EMPRESA_ID") != null ? parametros.get("EMPRESA_ID").toString() : ""; String puntoVentaID = parametros.get("NUMPUNTOVENTA").equals("-1") ? "" : parametros.get("NUMPUNTOVENTA").toString(); @@ -64,462 +38,142 @@ private Set pontoVendaConfiguracao; NamedParameterStatement stmt = new NamedParameterStatement(conexao, sqlTotaisVendas); - stmt.setTimestamp("DATA_INICIAL", new Timestamp(DateUtil.inicioFecha((Date) parametros.get("DATA_INICIAL")).getTime())); stmt.setTimestamp("DATA_FINAL", new Timestamp(DateUtil.fimFecha((Date) parametros.get("DATA_FINAL")).getTime())); if(empresaID != null && !empresaID.equals("")){ stmt.setInt("EMPRESA_ID", Integer.parseInt(empresaID)); } - pontoVendaConfiguracao = new HashSet(); + ResultSet rset = stmt.executeQuery(); lsDadosRelatorio = new ArrayList(); while (rset.next()) { - // Busca as configurações de comissão - LinkedHashMap configComissao = getConfigComissao(rset.getInt("puntoventa_id"), rset.getInt("empresa_id")); - Integer agenciaID = rset.getInt("puntoventa_id"); + + Integer comissaoID = rset.getInt("comissao_id"); + Date dataEvento = rset.getDate("data_evento"); + Integer agenciaID = rset.getInt("agencia_id"); Integer retEmpresaID = rset.getInt("empresa_id"); - Integer estadoId = rset.getInt("estado_id"); - Date fecCorrida = rset.getDate("feccorrida"); - BigDecimal totalPassgens = rset.getBigDecimal("total_passagem") == null ? BigDecimal.ZERO : rset.getBigDecimal("total_passagem"); - BigDecimal totalImpPost = rset.getBigDecimal("total_imp_posterior") == null ? BigDecimal.ZERO : rset.getBigDecimal("total_imp_posterior"); - BigDecimal totalVendaImpPost = rset.getBigDecimal("total_venda_imp_posterior") == null ? BigDecimal.ZERO : rset.getBigDecimal("total_venda_imp_posterior"); - BigDecimal totalSeguro = rset.getBigDecimal("total_seguro") == null ? BigDecimal.ZERO : rset.getBigDecimal("total_seguro"); - BigDecimal totalVenda = rset.getBigDecimal("total_venda") == null ? BigDecimal.ZERO : rset.getBigDecimal("total_venda"); - RelatorioComissaoSinteticoBean existingBean = findExistingBean(lsDadosRelatorio, agenciaID, retEmpresaID); - if (existingBean != null) { - // Registro já existe, adicionar os valores aos existentes - existingBean.setTotalTarifa(existingBean.getTotalTarifa().add(totalPassgens)); - existingBean.setTotalImpPosterior(existingBean.getTotalImpPosterior().add(totalImpPost)); - existingBean.setTotalVendaImpPosterior(existingBean.getTotalVendaImpPosterior().add(totalVendaImpPost)); - existingBean.setTotalSeguro(existingBean.getTotalSeguro().add(totalSeguro)); - existingBean.setTotalPagado(existingBean.getTotalPagado().add(totalVenda)); - //aplica comissão dos totais - if (configComissao != null) { - comissaoCalc(configComissao, retEmpresaID, estadoId, fecCorrida, totalPassgens, totalImpPost, totalVendaImpPost, totalSeguro, - null, existingBean, false); - } - } else { - // Registro não existe, criar um novo objeto e adicioná-lo à lista + String puntoVenta = rset.getString("punto_venta"); + + BigDecimal totalPassgens = trataCampoNull (rset.getBigDecimal("total_venda")) ; + BigDecimal comissaoBPR = trataCampoNull (rset.getBigDecimal("comissao_venda")); + BigDecimal totalvendaGap = trataCampoNull (rset.getBigDecimal("total_imp_posterior")); + BigDecimal comissaoGAP = trataCampoNull (rset.getBigDecimal("comissao_gap")); + BigDecimal totalImpressa = trataCampoNull (rset.getBigDecimal("total_entrega_passagems")); + BigDecimal comissaoImpressa = trataCampoNull (rset.getBigDecimal("comissao_impressao")); + BigDecimal totalExBagagem = trataCampoNull (rset.getBigDecimal("total_excesso_bagagem")); + BigDecimal comissaoExcBagem = trataCampoNull (rset.getBigDecimal("comissao_excesso_bagagem")); + BigDecimal totalOutros = trataCampoNull (rset.getBigDecimal("total_outros")); + BigDecimal comissaoOutros = trataCampoNull (rset.getBigDecimal("comissao_outros")); + BigDecimal totalSeguroOP = trataCampoNull (rset.getBigDecimal("total_seguro_opcional")); + BigDecimal comissaoSeguroOP = trataCampoNull (rset.getBigDecimal("comissao_seguro_opcional")); + BigDecimal totalRecarga = trataCampoNull (rset.getBigDecimal("total_recarga_celular")); + BigDecimal comissaoRecarga = trataCampoNull (rset.getBigDecimal("comissao_regarga_celular")); + BigDecimal totalVendaBruta = trataCampoNull (rset.getBigDecimal("total_venda_bruta")); + BigDecimal comissaoFinal = trataCampoNull (rset.getBigDecimal("comissao_registrada_CC")); + RelatorioComissaoSinteticoBean comissaoBean = new RelatorioComissaoSinteticoBean(); + comissaoBean.setComissaoID(comissaoID); + comissaoBean.setDataEvento(dataEvento); comissaoBean.setPontoVendaID(agenciaID); comissaoBean.setEmpresaID(retEmpresaID); - comissaoBean.setPontoVenda(rset.getString("nombpuntoventa")); + comissaoBean.setPontoVenda(puntoVenta); comissaoBean.setTotalTarifa(totalPassgens); - comissaoBean.setTotalImpPosterior(totalImpPost); - comissaoBean.setTotalVendaImpPosterior(totalVendaImpPost); - comissaoBean.setTotalOutros(BigDecimal.ZERO); - comissaoBean.setTotalExcBagagem(BigDecimal.ZERO); - comissaoBean.setTotalSeguro(totalSeguro); - comissaoBean.setTotalPagado(totalVenda); - comissaoBean.setComissaoTarifa(BigDecimal.ZERO); - comissaoBean.setComissaoVendaImpPosterior(BigDecimal.ZERO); - comissaoBean.setComissaoImpPosterior(BigDecimal.ZERO); - comissaoBean.setComissaoExcBagagem(BigDecimal.ZERO); - comissaoBean.setComissaoOutros(BigDecimal.ZERO); - - //aplica comissão dos totais - if (configComissao != null) { - comissaoCalc(configComissao, retEmpresaID, estadoId, fecCorrida, totalPassgens, totalImpPost, totalVendaImpPost, totalSeguro, - null, comissaoBean, false); - } + comissaoBean.setComissaoTarifa(comissaoBPR); + comissaoBean.setTotalVendaGAP(totalvendaGap); + comissaoBean.setComissaoGAP(comissaoGAP); + comissaoBean.setTotalImpGAP(totalImpressa); + comissaoBean.setComissaoImpGAP(comissaoImpressa); + comissaoBean.setTotalExcBagagem(totalExBagagem); + comissaoBean.setComissaoExcBagagem(comissaoExcBagem); + comissaoBean.setTotalOutros(totalOutros); + comissaoBean.setComissaoOutros(comissaoOutros); + comissaoBean.setTotalSegOpcional(totalSeguroOP); + comissaoBean.setComissaoSegOpcional(comissaoSeguroOP); + comissaoBean.setTotalRecargaCell(totalRecarga); + comissaoBean.setComissaoRecargaCell(comissaoRecarga); + comissaoBean.setTotalReceitaBruta(totalVendaBruta); + comissaoBean.setComissaoTotal(comissaoFinal); lsDadosRelatorio.add(comissaoBean); } - } - if (lsDadosRelatorio.size() > 0) { - String sqlTotaisEeventos = getSqlDadosTotaisEvento(empresaID,puntoVentaID); - NamedParameterStatement stmtEventos = new NamedParameterStatement(conexao, sqlTotaisEeventos); - stmtEventos.setTimestamp("DATA_INICIAL", new Timestamp(DateUtil.inicioFecha((Date) parametros.get("DATA_INICIAL")).getTime())); - stmtEventos.setTimestamp("DATA_FINAL", new Timestamp(DateUtil.inicioFecha((Date) parametros.get("DATA_INICIAL")).getTime())); - if(empresaID != null && !empresaID.equals("")){ - stmtEventos.setInt("EMPRESA_ID", Integer.parseInt(empresaID)); - } - ResultSet rsetEventos = stmtEventos.executeQuery(); - - while(rsetEventos.next()) { - LinkedHashMap configComissao = getConfigComissao(rset.getInt("puntoventa_id"), rset.getInt("empresa_id")); - Integer agenciaID = rsetEventos.getInt("puntoventa_id"); - Integer retEmpresaID = rsetEventos.getInt("empresa_id"); - if(empresaID != null && !empresaID.equals("")){ - stmt.setInt("EMPRESA_ID", Integer.parseInt(empresaID)); - } - Integer estadoId = rsetEventos.getInt("estado_id"); - Date fecCorrida = rset.getDate("feccorrida"); - Boolean isOutros = rsetEventos.getString("desctipoevento") == "EXCESSO BAGAGEM" ? false : true; - BigDecimal totalEvento = rsetEventos.getBigDecimal("total_evento"); - - - RelatorioComissaoSinteticoBean existingBean = findExistingBean(lsDadosRelatorio, agenciaID, retEmpresaID); - if (existingBean != null) { - if(isOutros) { - existingBean.setTotalOutros(totalEvento); - } else { - existingBean.setTotalExcBagagem(totalEvento); - } - //aplica comissão dos totais - if (configComissao != null) { - comissaoCalc(configComissao, retEmpresaID, estadoId, fecCorrida, null, null, null, null, totalEvento, existingBean, isOutros); - } - } - } - caulcaComissaoTotal(lsDadosRelatorio); - - setLsDadosRelatorio(lsDadosRelatorio); + setLsDadosRelatorio(lsDadosRelatorio); } - } + }); + } + + + private String getSqlDadosTotaisdeVenda(String empresa, String agencia) { + + StringBuilder sql = new StringBuilder(3400); + + sql.append("SELECT "); + sql.append(" cm.comissao_id, "); + sql.append(" cm.datamovimento as data_evento, "); + sql.append(" cm.puntoventa_id as agencia_id, "); + sql.append(" cm.empresa_id as empresa_id, "); + sql.append(" pv.nombpuntoventa as punto_venta, "); + sql.append(" cm.receita_BPR as total_venda, "); + sql.append(" cm.comissao_BPR as comissao_venda, "); + sql.append(" cm.receita_gap as total_imp_posterior, "); + sql.append(" cm.comissao_gap as comissao_gap, "); + sql.append(" cm.tarifa_entregas_passagem as total_entrega_passagems, "); + sql.append(" cm.entregas_passagem as comissao_impressao, "); + sql.append(" cm.receita_bruta_excessobagagem as total_excesso_bagagem, "); + sql.append(" cm.receita_excessobagagem as comissao_excesso_bagagem, "); + sql.append(" cm.receita_bruta_outros as total_outros, "); + sql.append(" cm.receita_outros as comissao_outros, "); + sql.append(" cm.receita_bruta_seguroopcional as total_seguro_opcional, "); + sql.append(" cm.receita_seguroopcional as comissao_seguro_opcional, "); + sql.append(" cm.receita_bruta_recargacelular as total_recarga_celular, "); + sql.append(" cm.receita_recargacelular as comissao_regarga_celular, "); + sql.append(" cm.receita_bruta_tarifa as total_venda_bruta, "); + sql.append(" cc.importe as comissao_registrada_CC "); - private void comissaoCalc(LinkedHashMap configComissao, Integer retEmpresaID, Integer estadoId, Date fecCorrida, - BigDecimal baseCalculoTarifa, BigDecimal baseCalculoImpPost, BigDecimal baseCalculoVendaImpPost, BigDecimal baseCalculoSeguro, BigDecimal TotalEventos, - RelatorioComissaoSinteticoBean comissaoBean, Boolean isEventoOutros) throws Exception { - - BigDecimal percComissaoTarifa = BigDecimal.ZERO; - BigDecimal percComissaoSeguro = BigDecimal.ZERO; - BigDecimal percComissaoImpPost = BigDecimal.ZERO; - BigDecimal percComissaoVendaImpPost = BigDecimal.ZERO; - BigDecimal percComissaoOutros = BigDecimal.ZERO; - - BigDecimal valorComissaoSeguro = BigDecimal.ZERO; - BigDecimal valorComissaoTarifa = BigDecimal.ZERO; - BigDecimal valorComissaoImpPost = BigDecimal.ZERO; - BigDecimal valorComissaoVendaImpPost = BigDecimal.ZERO; - BigDecimal valorComissaoExcBagagem = BigDecimal.ZERO; - BigDecimal valorComissaoOutros = BigDecimal.ZERO; - Boolean isAltaTemporada = false; - - if(fecCorrida != null) { - String mes = new SimpleDateFormat("M").format(fecCorrida); - HashMap configImposto = getConfigImposto((Integer) retEmpresaID, estadoId); - isAltaTemporada = ((mes.equals("1") && (Boolean) configImposto.get("INDJANEIRO")) || (mes.equals("2") && (Boolean) configImposto.get("INDFEVEREIRO")) - || (mes.equals("3") && (Boolean) configImposto.get("INDMARCO")) || (mes.equals("4") && (Boolean) configImposto.get("INDABRIL")) - || (mes.equals("5") && (Boolean) configImposto.get("INDMAIO")) || (mes.equals("6") && (Boolean) configImposto.get("INDJUNHO")) - || (mes.equals("7") && (Boolean) configImposto.get("INDJULHO")) || (mes.equals("8") && (Boolean) configImposto.get("INDAGOSTO")) - || (mes.equals("9") && (Boolean) configImposto.get("INDSETEMBRO")) || (mes.equals("10") && (Boolean) configImposto.get("INDOUTUBRO")) - || (mes.equals("11") && (Boolean) configImposto.get("INDNOVEMBRO")) || (mes.equals("12") && (Boolean) configImposto.get("INDDEZEMBRO"))) ? true : false; - } - if (!isEventoOutros) { - percComissaoTarifa = isAltaTemporada ? (BigDecimal) configComissao.get("PASSAGEMALTA") : (BigDecimal) configComissao.get("PASSAGEMBAIXA"); - percComissaoSeguro = isAltaTemporada ? (BigDecimal) configComissao.get("SEGUROALTA") : (BigDecimal) configComissao.get("SEGUROBAIXA"); - percComissaoImpPost = isAltaTemporada ? (BigDecimal) configComissao.get("VENDAIMPGAPALTA") : (BigDecimal) configComissao.get("VENDAIMPGAPBAIXA"); - percComissaoVendaImpPost = isAltaTemporada ? (BigDecimal) configComissao.get("VENDAGAPALTA") : (BigDecimal) configComissao.get("VENDAGAPBAIXA"); - - if (percComissaoTarifa == null) { - percComissaoTarifa = BigDecimal.ZERO; - } - if (percComissaoSeguro == null) { - percComissaoSeguro = BigDecimal.ZERO; - } - - if (percComissaoImpPost == null) { - percComissaoImpPost = BigDecimal.ZERO; - } - if (percComissaoVendaImpPost == null) { - percComissaoVendaImpPost = BigDecimal.ZERO; - } - - // VALOR COMISSAO = BASE DE CALCULO * (PERCENTUAL COMISSAO / 100) - valorComissaoTarifa = baseCalculoTarifa.multiply(MoneyHelper.dividir(percComissaoTarifa, MoneyHelper.HUNDRED, 4)); - valorComissaoSeguro = baseCalculoSeguro.multiply(MoneyHelper.dividir(percComissaoSeguro, MoneyHelper.HUNDRED, 4)); - valorComissaoImpPost = baseCalculoImpPost.multiply(MoneyHelper.dividir(percComissaoImpPost, MoneyHelper.HUNDRED, 4)); - valorComissaoVendaImpPost = baseCalculoVendaImpPost.multiply(MoneyHelper.dividir(percComissaoVendaImpPost, MoneyHelper.HUNDRED, 4));; - - if(comissaoBean.getComissaoTarifa() == null) { - comissaoBean.setComissaoTarifa(valorComissaoTarifa); - } else { - comissaoBean.setComissaoTarifa(comissaoBean.getComissaoTarifa().add(valorComissaoTarifa)); - } - if(comissaoBean.getComissaoSeguro() == null) { - comissaoBean.setComissaoSeguro(valorComissaoSeguro); - } else { - comissaoBean.setComissaoSeguro(comissaoBean.getComissaoSeguro().add(valorComissaoSeguro)); - } - if(comissaoBean.getComissaoImpPosterior() == null) { - comissaoBean.setComissaoImpPosterior(valorComissaoImpPost); - } else { - comissaoBean.setComissaoImpPosterior(comissaoBean.getComissaoImpPosterior().add(valorComissaoImpPost)); - } - if(comissaoBean.getComissaoVendaImpPosterior() == null) { - comissaoBean.setComissaoVendaImpPosterior(valorComissaoVendaImpPost); - } else { - comissaoBean.setComissaoVendaImpPosterior(comissaoBean.getComissaoVendaImpPosterior().add(valorComissaoVendaImpPost)); - } - - } else { - percComissaoOutros = isEventoOutros ? (isAltaTemporada ? (BigDecimal) configComissao.get("OUTROSALTA") : (BigDecimal) configComissao.get("OUTROSBAIXA") ) - :(isAltaTemporada ? (BigDecimal) configComissao.get("EXCESSOALTA") : (BigDecimal) configComissao.get("EXCESSOBAIXA")); - if(percComissaoOutros == null) { - percComissaoOutros = BigDecimal.ZERO; - } - if(isEventoOutros) { - // VALOR COMISSAO = BASE DE CALCULO * (PERCENTUAL COMISSAO / 100) - valorComissaoOutros = comissaoBean.getTotalOutros().multiply(MoneyHelper.dividir(percComissaoSeguro, MoneyHelper.HUNDRED, 4)); - if(comissaoBean.getComissaoOutros() == null) { - comissaoBean.setComissaoOutros(valorComissaoOutros); - } else { - comissaoBean.setComissaoOutros(comissaoBean.getComissaoOutros().add(valorComissaoOutros)); - } - comissaoBean.setComissaoOutros(comissaoBean.getComissaoOutros().add(valorComissaoOutros)); - } else { - valorComissaoExcBagagem = comissaoBean.getTotalExcBagagem().multiply(MoneyHelper.dividir(percComissaoOutros, MoneyHelper.HUNDRED, 4)); - if(comissaoBean.getComissaoExcBagagem() == null) { - comissaoBean.setComissaoExcBagagem(valorComissaoExcBagagem); - } else { - comissaoBean.setComissaoExcBagagem(comissaoBean.getComissaoExcBagagem().add(valorComissaoExcBagagem)); - - } - } - } - } - }); + sql.append(" FROM "); + sql.append(" comissao cm "); + sql.append(" LEFT JOIN punto_venta pv ON ( cm.puntoventa_id = pv.puntoventa_id AND pv.activo = 1 ) "); + sql.append(" LEFT JOIN (SELECT importe, puntoventa_id, empresa_id FROM conta_corrente_ptovta "); + sql.append(" WHERE feccorte BETWEEN :DATA_INICIAL AND :DATA_FINAL "); + if (!agencia.isEmpty()) { + sql.append(" AND puntoventa_id in ("+agencia+") "); + } + if (!empresa.isEmpty()) { + sql.append(" AND empresa_id = :EMPRESA_ID "); + } + sql.append(" AND tipooperacioncc_id = 5) cc on (cc.empresa_id = cm.empresa_id "); + sql.append(" and cc.puntoventa_id = pv.puntoventa_id "); + sql.append(" and importe is not null) "); + sql.append(" WHERE "); + sql.append(" cm.datamovimento BETWEEN :DATA_INICIAL AND :DATA_FINAL "); + if (!agencia.isEmpty()) { + sql.append(" AND cm.puntoventa_id in ("+agencia+") "); + } + if (!empresa.isEmpty()) { + sql.append(" AND cm.empresa_id = :EMPRESA_ID "); + } + sql.append(" ORDER BY pv.nombpuntoventa, cm.datamovimento "); + + return sql.toString(); } public void setLsDadosRelatorio(List lsDadosRelatorio) { this.setCollectionDataSource(new JRBeanCollectionDataSource(lsDadosRelatorio)); this.lsDadosRelatorio = lsDadosRelatorio; } - - private void caulcaComissaoTotal(List lsDadosRelatorio) { - if(lsDadosRelatorio!=null && !lsDadosRelatorio.isEmpty()) { - for (RelatorioComissaoSinteticoBean bean : lsDadosRelatorio) { - try { - BigDecimal totalComissoes = bean.getComissaoTarifa() - .add(bean.getComissaoImpPosterior()!=null ? bean.getComissaoImpPosterior() : BigDecimal.ZERO) - .add(bean.getComissaoVendaImpPosterior()!=null ?bean.getComissaoVendaImpPosterior(): BigDecimal.ZERO) - .add(bean.getComissaoExcBagagem()!=null ? bean.getComissaoExcBagagem(): BigDecimal.ZERO) - .add(bean.getComissaoOutros()!=null ? bean.getComissaoOutros(): BigDecimal.ZERO); - bean.setComissaoTotal(totalComissoes); - }catch(ArrayIndexOutOfBoundsException | NullPointerException e) { - log.error("Erro a gerar relatorio Comissao sintetico", e); - } - } - } - } - public HashMap getConfigImposto(Integer empresaId, Integer estadoId) throws Exception { - HashMap cacheConfig = null; - - try { - cacheConfig = (HashMap) CalculoImposto.getConfigImpostoByEstadoOrigem(this.getConexao(), estadoId, empresaId); - } catch (Exception e) { - if (e instanceof ExceptionConfiguracao) - this.addInfoMsg(e.getMessage()); - else - throw e; + private BigDecimal trataCampoNull(BigDecimal campo) { + if (campo == null) { + return BigDecimal.ZERO; } - - return cacheConfig; + return campo; } - private static RelatorioComissaoSinteticoBean findExistingBean(List list, Integer agenciaID, Integer empresaID) { - for (RelatorioComissaoSinteticoBean bean : list) { - if (Objects.equals(bean.getPontoVendaID(), agenciaID) && Objects.equals(bean.getEmpresaID(), empresaID)) { - return bean; - } - } - return null; - } - @Override protected void processaParametros() throws Exception { } - private String getSqlDadosTotaisdeVenda(String empresa, String agencia) { - - StringBuilder sql = new StringBuilder(3400); - - sql.append(" SELECT pv.nombpuntoventa, "); - sql.append(" b.puntoventa_id, "); - sql.append(" ep.empresa_id, "); - sql.append(" ci.estado_id, "); - sql.append(" b.feccorrida, "); - sql.append(" Count(*), "); - sql.append(" SUM(CASE WHEN (b.indreimpresion = 1 AND b.tipoventa_id = 18 or (b.indreimpresion = 0 AND b.tipoventa_id = 18)) "); - sql.append(" THEN 0 ELSE b.preciobase END) AS total_passagem, "); - sql.append(" SUM(CASE WHEN b.indreimpresion = 1 AND b.tipoventa_id = 18 THEN b.preciobase ELSE 0 END) AS total_imp_posterior, "); - sql.append(" SUM(CASE WHEN b.indreimpresion = 0 AND b.tipoventa_id = 18 THEN b.preciobase ELSE 0 END) AS total_venda_imp_posterior, "); - sql.append(" SUM(b.importeseguro) AS total_seguro, "); - sql.append(" SUM(b.importetaxaembarque) AS total_tax_emb, "); - sql.append(" SUM(b.importepedagio) AS total_pedagio, "); - sql.append(" SUM(b.importeoutros) AS total_outros, "); - sql.append(" SUM(b.preciopagado) AS total_venda "); - sql.append(" FROM boleto b "); - sql.append(" LEFT JOIN punto_venta pv ON (b.puntoventa_id = pv.puntoventa_id) "); - sql.append(" LEFT JOIN marca mc ON (b.marca_id = mc.marca_id) "); - sql.append(" LEFT JOIN empresa ep ON (mc.empresa_id = ep.empresa_id) "); - sql.append(" LEFT JOIN ciudad ci ON (ep.ciudad_id = ci.ciudad_id) "); - sql.append(" WHERE (b.motivocancelacion_id IS NULL or (b.motivocancelacion_id = 16 and b.tipoventa_id =18 )) "); - sql.append(" AND b.motivoreimpresion_id IS NULL "); - sql.append(" AND (b.boletooriginal_id IS NULL or ( b.indreimpresion = 1 AND b.tipoventa_id =18) ) "); - sql.append(" AND b.activo = 1 "); - sql.append(" AND b.fechorventa BETWEEN :DATA_INICIAL AND :DATA_FINAL "); - if (!agencia.isEmpty()) { - sql.append(" AND b.puntoventa_id in ("+agencia+") "); - } - if (!empresa.isEmpty()) { - sql.append(" AND ep.empresa_id = :EMPRESA_ID "); - } - sql.append(" GROUP BY pv.nombpuntoventa, b.puntoventa_id, ep.empresa_id, ci.estado_id, b.feccorrida "); - sql.append(" ORDER BY pv.nombpuntoventa, b.puntoventa_id, ci.estado_id "); - - return sql.toString(); - } - - private String getSqlDadosTotaisEvento(String empresa, String agencia ) { - - StringBuilder sql = new StringBuilder(3400); - - sql.append("SELECT "); - sql.append(" tee.desctipoevento, "); - sql.append(" ee.puntoventa_id, "); - sql.append(" pv.nombpuntoventa, "); - sql.append(" ee.empresa_id, "); - sql.append(" ci.estado_id, "); - sql.append(" bo.fechorventa, "); - sql.append(" SUM(ee.impingreso) AS total_evento "); - sql.append("FROM "); - sql.append(" evento_extra ee "); - sql.append(" INNER JOIN tipo_evento_extra tee ON ee.tipoeventoextra_id = tee.tipoeventoextra_id "); - sql.append(" LEFT JOIN punto_venta pv ON ( ee.puntoventa_id = pv.puntoventa_id ) "); - sql.append(" LEFT JOIN empresa emp ON (emp.empresa_id = ee.empresa_id) "); - sql.append(" LEFT JOIN ciudad ci ON (emp.ciudad_id = ci.ciudad_id) "); - sql.append(" LEFT JOIN boleto bo ON (ee.boleto_id = bo.boleto_id) "); - sql.append("WHERE "); - sql.append(" ee.activo = 1 "); - sql.append(" AND tee.desctipoevento IN ('EXCESSO BAGAGEM', 'ANIMAL 50%' ) "); - sql.append(" AND ee.fechoringreso BETWEEN :DATA_INICIAL AND :DATA_FINAL "); - - if (!agencia.isEmpty()) { - sql.append(" AND ee.puntoventa_id IN ("+agencia+") "); - } - if (!empresa.isEmpty()) { - sql.append(" AND ee.empresa_id = :EMPRESA_ID "); - } - - sql.append("GROUP BY "); - sql.append(" tee.desctipoevento, "); - sql.append(" ee.puntoventa_id, "); - sql.append(" pv.nombpuntoventa, "); - sql.append(" ee.empresa_id, "); - sql.append(" ci.estado_id, "); - sql.append(" bo.fechorventa "); - sql.append("ORDER BY "); - sql.append(" tee.desctipoevento, "); - sql.append(" ee.puntoventa_id, "); - sql.append(" pv.nombpuntoventa, "); - sql.append(" ee.empresa_id "); - - return sql.toString(); - } - - - public LinkedHashMap getConfigComissao(Integer puntoVentaId, Integer empresaId) throws Exception { - - LinkedHashMap cacheConfig = null; - - // Verifica se existe configuração na memoria, caso não exista, realiza busca no banco - if (mapCacheConfigComissao == null || !mapCacheConfigComissao.containsKey(puntoVentaId.toString() + "_" + empresaId.toString())) { - StringBuilder sql = new StringBuilder(); - - sql.append(" SELECT PC.ISSRETIDO, PC.ROYALTIES, PC.ENVIARRECIBO, PC.RECEITA, PC.CODAG, PC.PASSAGEMALTA, PC.PASSAGEMBAIXA, "); - sql.append(" PC.SEGUROALTA, PC.SEGUROBAIXA, PC.OUTROSBAIXA, PC.OUTROSALTA, PC.EXCESSOALTA, PC.EXCESSOBAIXA, "); - sql.append(" PC.TARIFARECEITA, PC.SEGURORECEITA, PC.TAXARECEITA, PC.PEDAGIORECEITA, TP.DESCTIPO AS TIPO_AGENCIA, "); - sql.append(" PC.TARIFADEV, PC.SEGURO_DEV, PC.TAXADEV, PC.PEDAGIODEV, PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, "); - sql.append(" ES.CVEESTADO, ES.ESTADO_ID, PC.SEGUROOBRIGATORIOALTA, PC.SEGUROOBRIGATORIOBAIXA, "); - sql.append(" CASE WHEN pc.valor_imp_gap_alta_comp IS NULL THEN pc.valor_impressao_gap_alta ELSE pc.valor_imp_gap_alta_comp END AS VALOR_IMPRESSAO_ALTA, "); - sql.append(" CASE WHEN pc.valor_imp_gap_comp IS NULL THEN pc.valor_impressao_gap ELSE pc.valor_imp_gap_comp END AS VALOR_IMPRESSAO_BAIXA, "); - sql.append(" CASE WHEN pc.valor_venda_gap_alta_comp IS NULL THEN pc.passagemalta ELSE pc.valor_venda_gap_alta_comp END AS VALOR_VENDA_IMP_ALTA, "); - sql.append(" CASE WHEN pc.valor_venda_gap_comp IS NULL THEN pc.passagembaixa ELSE pc.valor_venda_gap_comp END AS VALOR_VENDA_IMP_BAIXA "); - sql.append(" FROM PTOVTA_COMISSAO PC "); - sql.append(" INNER JOIN PUNTO_VENTA PV ON PV.PUNTOVENTA_ID = PC.PUNTOVENTA_ID AND PC.PTOVTADESCOMISSAO_ID = PV.PUNTOVENTA_ID "); - sql.append(" INNER JOIN PARADA PR ON PR.PARADA_ID = PV.PARADA_ID "); - sql.append(" INNER JOIN CIUDAD CD ON CD.CIUDAD_ID = PR.CIUDAD_ID "); - sql.append(" INNER JOIN ESTADO ES ON ES.ESTADO_ID = CD.ESTADO_ID "); - sql.append(" INNER JOIN TIPO_PTOVTA TP ON TP.TIPOPTOVTA_ID = PV.TIPOPTOVTA_ID"); - sql.append(" WHERE PC.EMPRESA_ID = :EMPRESA_ID "); - sql.append(" AND PC.PUNTOVENTA_ID = :PUNTOVENTA_ID "); - sql.append(" AND PC.ACTIVO = 1 "); - - NamedParameterStatement stmt = new NamedParameterStatement(this.getConexao(), sql.toString()); - stmt.setInt("EMPRESA_ID", empresaId); - stmt.setInt("PUNTOVENTA_ID", puntoVentaId); - ResultSet rs = stmt.executeQuery(); - - if (rs.next()) { - cacheConfig = new LinkedHashMap(); - - cacheConfig.put("ISSRETIDO", rs.getBigDecimal("ISSRETIDO")); - cacheConfig.put("ROYALTIES", rs.getBigDecimal("ROYALTIES")); - cacheConfig.put("PASSAGEMALTA", rs.getBigDecimal("PASSAGEMALTA")); - cacheConfig.put("PASSAGEMBAIXA", rs.getBigDecimal("PASSAGEMBAIXA")); - cacheConfig.put("SEGUROALTA", rs.getBigDecimal("SEGUROALTA")); - cacheConfig.put("SEGUROBAIXA", rs.getBigDecimal("SEGUROBAIXA")); - cacheConfig.put("OUTROSALTA", rs.getBigDecimal("OUTROSALTA")); - cacheConfig.put("OUTROSBAIXA", rs.getBigDecimal("OUTROSBAIXA")); - cacheConfig.put("EXCESSOALTA", rs.getBigDecimal("EXCESSOALTA")); - cacheConfig.put("EXCESSOBAIXA", rs.getBigDecimal("EXCESSOBAIXA")); - cacheConfig.put("SEGUROOBRIGATORIOBAIXA", rs.getBigDecimal("SEGUROOBRIGATORIOBAIXA")); - cacheConfig.put("SEGUROOBRIGATORIOALTA", rs.getBigDecimal("SEGUROOBRIGATORIOALTA")); - cacheConfig.put("VENDAIMPGAPALTA", rs.getBigDecimal("VALOR_IMPRESSAO_ALTA")); - cacheConfig.put("VENDAIMPGAPBAIXA", rs.getBigDecimal("VALOR_IMPRESSAO_BAIXA")); - cacheConfig.put("VENDAGAPALTA", rs.getBigDecimal("VALOR_VENDA_IMP_ALTA")); - cacheConfig.put("VENDAGAPBAIXA", rs.getBigDecimal("VALOR_VENDA_IMP_BAIXA")); - - cacheConfig.put("TARIFARECEITA", rs.getBoolean("TARIFARECEITA")); - cacheConfig.put("SEGURORECEITA", rs.getBoolean("SEGURORECEITA")); - cacheConfig.put("TAXARECEITA", rs.getBoolean("TAXARECEITA")); - cacheConfig.put("PEDAGIORECEITA", rs.getBoolean("PEDAGIORECEITA")); - cacheConfig.put("TARIFADEV", rs.getBoolean("TARIFADEV")); - cacheConfig.put("SEGURO_DEV", rs.getBoolean("SEGURO_DEV")); - cacheConfig.put("TAXADEV", rs.getBoolean("TAXADEV")); - cacheConfig.put("PEDAGIODEV", rs.getBoolean("PEDAGIODEV")); - - - - cacheConfig.put("RECEITA", rs.getString("RECEITA")); - cacheConfig.put("TIPO_AGENCIA", rs.getString("TIPO_AGENCIA")); - cacheConfig.put("NUMPUNTOVENTA", rs.getString("NUMPUNTOVENTA")); - cacheConfig.put("NOMBPUNTOVENTA", rs.getString("NOMBPUNTOVENTA")); - cacheConfig.put("CVEESTADO", rs.getString("CVEESTADO")); - - cacheConfig.put("ESTADO_ID", rs.getInt("ESTADO_ID")); - cacheConfig.put("PUNTOVENTA_ID", rs.getInt("PUNTOVENTA_ID")); - - mapCacheConfigComissao.put(puntoVentaId.toString() + "_" + empresaId.toString(), cacheConfig); - - } else { - StringBuilder sqlParam = new StringBuilder(); - - sqlParam.append(" SELECT EM.NOMBEMPRESA, PV.NOMBPUNTOVENTA, PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA "); - sqlParam.append(" FROM EMPRESA EM, "); - sqlParam.append(" PUNTO_VENTA PV "); - sqlParam.append(" WHERE EM.EMPRESA_ID = :EMPRESA_ID "); - sqlParam.append(" AND PV.PUNTOVENTA_ID = :PUNTOVENTA_ID "); - - NamedParameterStatement stmtParam = new NamedParameterStatement(this.getConexao(), sqlParam.toString()); - stmtParam.setInt("PUNTOVENTA_ID", puntoVentaId); - stmtParam.setInt("EMPRESA_ID", empresaId); - - ResultSet rsParam = stmtParam.executeQuery(); - - if (rsParam.next()){ - pontoVendaConfiguracao.add(new PuntoVenta(new Integer (rsParam.getString("PUNTOVENTA_ID")), rsParam.getString("NOMBPUNTOVENTA"), rsParam.getString("NUMPUNTOVENTA"))); - } - rsParam.close(); - stmtParam.close(); - } - - rs.close(); - stmt.close(); - - } - else - cacheConfig = mapCacheConfigComissao.get(puntoVentaId.toString() + "_" + empresaId.toString()); - - return cacheConfig; - - } - } \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioComissaoSintetico_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioComissaoSintetico_es.properties index c74a50d3a..a416c6771 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioComissaoSintetico_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioComissaoSintetico_es.properties @@ -17,16 +17,21 @@ header.pagina=Pagina: #Labels HEADER label.agencia=Agencia -label.total.passagem=Total Venta de Boletos -label.comissao.passagem=Comisión Venta de Boletos +label.data=Fecha de Cierre +label.total.passagem=Total Facturación de Boletos +label.comissao.passagem=Comisión Boletos label.total.venda.imp=Total Venda Imp. Posterior label.comissao.v.imp=Comisión Venda Imp. Posterior label.total.imp=Total Imp. Posterior label.comissao.imp=Comisión Imp. Posterior label.total.excesso=Total Exceso de Equipaje label.comissao.excesso=Comisión Exceso de Equipaje -label.total.outros=Total Otros (Animal 50%) +label.total.outros=Total Otros label.comissao.outros=Comisión Otros -label.faturamento.total=Facturación Total (Venta) +label.total.seguro=Total Seguro +label.comissao.seguro=Comisión Seguro +label.total.recarga=Total Recarga +label.comissao.recarga=Comisión Recarga +label.faturamento.total=Facturación Total (Venta Boletos) label.comissão.total=Valor Total de Comisión label.total.geral=Total Geral \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioComissaoSintetico_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioComissaoSintetico_pt_BR.properties index 4e86681cd..e5bdd043d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioComissaoSintetico_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioComissaoSintetico_pt_BR.properties @@ -17,16 +17,21 @@ header.pagina=Pagina: #Labels HEADER label.agencia=Agencia -label.total.passagem=Total Venda Passagem -label.comissao.passagem=Comissão Venda Passagem +label.data=Data Fechamento +label.total.passagem=Total Receita Passagem +label.comissao.passagem=Comissão Passagem label.total.venda.imp=Total Venda Imp. Posterior label.comissao.v.imp=Comissão Venda Imp. Posterior label.total.imp=Total Imp. Posterior label.comissao.imp=Comissão Imp. Posterior label.total.excesso=Total Excesso Bagagem label.comissao.excesso=Comissão Excesso Bagagem -label.total.outros=Total Outros (Animal 50%) +label.total.outros=Total Outros label.comissao.outros=Comissão Outros -label.faturamento.total=Faturamento Total (Venda) +label.total.seguro=Total Seguro +label.comissao.seguro=Comissão Seguro +label.total.recarga=Total Recarga +label.comissao.recarga=Comissão Recarga +label.faturamento.total=Receita Total (Venda Passagem) label.comissão.total=Valor Total Comissão label.total.geral=Total Geral \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioComissaoSintetico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioComissaoSintetico.jasper index 3c44b4ea8..38775f5b9 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioComissaoSintetico.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioComissaoSintetico.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioComissaoSintetico.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioComissaoSintetico.jrxml index 0ac2fb16d..d90c1ac78 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioComissaoSintetico.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioComissaoSintetico.jrxml @@ -1,7 +1,7 @@ - - - + + + @@ -15,45 +15,45 @@ + + + - - + + - - - - + + + + - + + + + + - - - - - - - - - + + - - + + - - + + - - + + @@ -67,8 +67,20 @@ + + + + + + + + + + + + - + @@ -76,7 +88,7 @@ <band height="69"> <textField pattern="" isBlankWhenNull="false"> - <reportElement uuid="7d6110a7-d2cc-43d4-85f4-748b1dfef63f" mode="Transparent" x="0" y="1" width="455" height="46" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="0" y="1" width="455" height="46" forecolor="#000000" backcolor="#FFFFFF" uuid="7d6110a7-d2cc-43d4-85f4-748b1dfef63f"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="16" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> @@ -84,7 +96,7 @@ <textFieldExpression><![CDATA[$R{header.titulo}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false"> - <reportElement uuid="af7a6042-c9c4-4d13-ae07-24c189ead5fa" mode="Transparent" x="741" y="1" width="80" height="15" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="848" y="1" width="80" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="af7a6042-c9c4-4d13-ae07-24c189ead5fa"/> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> @@ -92,14 +104,14 @@ <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField> - <reportElement uuid="54e92cd2-863e-4030-819d-6708b15288d4" x="525" y="1" width="216" height="15"/> + <reportElement x="631" y="1" width="216" height="15" uuid="54e92cd2-863e-4030-819d-6708b15288d4"/> <textElement textAlignment="Right"> <font size="9" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="false"> - <reportElement uuid="b2356913-1078-4115-9eb1-3cd8f39871cf" mode="Transparent" x="525" y="16" width="270" height="16" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="631" y="16" width="270" height="16" forecolor="#000000" backcolor="#FFFFFF" uuid="b2356913-1078-4115-9eb1-3cd8f39871cf"/> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> @@ -107,7 +119,7 @@ <textFieldExpression><![CDATA[$R{header.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{header.de}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="false"> - <reportElement uuid="6778dcc2-1b22-4309-9b98-2c394396ec0b" stretchType="RelativeToBandHeight" mode="Transparent" x="525" y="32" width="296" height="15" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement stretchType="RelativeToBandHeight" mode="Transparent" x="633" y="32" width="296" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="6778dcc2-1b22-4309-9b98-2c394396ec0b"/> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> @@ -115,7 +127,7 @@ <textFieldExpression><![CDATA[$R{header.impressorPor}+" "+$P{USUARIO}+" - "+$P{USUARIO_NOME}]]></textFieldExpression> </textField> <textField evaluationTime="Report" pattern="" isBlankWhenNull="false"> - <reportElement uuid="f47919d9-1e34-4ca4-990b-f0167628068e" mode="Transparent" x="795" y="16" width="26" height="16" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement mode="Transparent" x="902" y="16" width="26" height="16" forecolor="#000000" backcolor="#FFFFFF" uuid="f47919d9-1e34-4ca4-990b-f0167628068e"/> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> @@ -123,7 +135,7 @@ <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="99f553a0-2256-4eb5-81bf-215b7ba57fd1" x="0" y="47" width="819" height="21"/> + <reportElement x="0" y="47" width="930" height="21" uuid="99f553a0-2256-4eb5-81bf-215b7ba57fd1"/> <box leftPadding="2"> <topPen lineWidth="0.75"/> <bottomPen lineWidth="0.75"/> @@ -138,7 +150,7 @@ <columnHeader> <band height="17"> <textField isStretchWithOverflow="true"> - <reportElement uuid="a8630efd-6599-4fff-964c-32a8fa6d44be" stretchType="RelativeToBandHeight" x="0" y="0" width="93" height="15"/> + <reportElement stretchType="RelativeToBandHeight" x="0" y="0" width="69" height="15" uuid="a8630efd-6599-4fff-964c-32a8fa6d44be"/> <box> <topPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/> @@ -146,12 +158,12 @@ <rightPen lineWidth="0.5"/> </box> <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> - <font fontName="SansSerif" size="9" isBold="true"/> + <font fontName="SansSerif" size="8" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.agencia}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="b7de9705-89ba-4b32-96b6-c576a8c837c9" stretchType="RelativeToBandHeight" x="93" y="0" width="68" height="15" backcolor="#FFFFFF"/> + <reportElement stretchType="RelativeToBandHeight" x="173" y="0" width="50" height="15" backcolor="#D0D0D0" uuid="9f26b982-6b13-4453-96b1-ca4d117dd01e"/> <box> <topPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/> @@ -159,25 +171,12 @@ <rightPen lineWidth="0.5"/> </box> <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> - <font fontName="SansSerif" size="9" isBold="true"/> - </textElement> - <textFieldExpression><![CDATA[$R{label.total.passagem}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true"> - <reportElement uuid="9f26b982-6b13-4453-96b1-ca4d117dd01e" stretchType="RelativeToBandHeight" x="161" y="0" width="60" height="15" backcolor="#D0D0D0"/> - <box> - <topPen lineWidth="0.5"/> - <leftPen lineWidth="0.5"/> - <bottomPen lineWidth="0.5"/> - <rightPen lineWidth="0.5"/> - </box> - <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> - <font fontName="SansSerif" size="9" isBold="true"/> + <font fontName="SansSerif" size="7" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.comissao.passagem}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="3c63f463-1b5e-4669-ab70-951cfa86df61" stretchType="RelativeToBandHeight" x="341" y="0" width="60" height="15"/> + <reportElement stretchType="RelativeToBandHeight" x="323" y="0" width="55" height="15" uuid="3c63f463-1b5e-4669-ab70-951cfa86df61"/> <box> <topPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/> @@ -185,12 +184,12 @@ <rightPen lineWidth="0.5"/> </box> <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> - <font fontName="SansSerif" size="9" isBold="true"/> + <font fontName="SansSerif" size="7" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.total.imp}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="e8df569a-2fae-4c3e-8e54-826f96b2a3b3" stretchType="RelativeToBandHeight" x="401" y="0" width="60" height="15" backcolor="#D0D0D0"/> + <reportElement stretchType="RelativeToBandHeight" x="378" y="0" width="54" height="15" backcolor="#D0D0D0" uuid="e8df569a-2fae-4c3e-8e54-826f96b2a3b3"/> <box> <topPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/> @@ -198,77 +197,12 @@ <rightPen lineWidth="0.5"/> </box> <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> - <font fontName="SansSerif" size="9" isBold="true"/> + <font fontName="SansSerif" size="7" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.comissao.imp}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="c43f5d68-7ede-499f-b41e-7bea4c2633ba" stretchType="RelativeToBandHeight" x="461" y="0" width="60" height="15"/> - <box> - <topPen lineWidth="0.5"/> - <leftPen lineWidth="0.5"/> - <bottomPen lineWidth="0.5"/> - <rightPen lineWidth="0.5"/> - </box> - <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> - <font fontName="SansSerif" size="9" isBold="true"/> - </textElement> - <textFieldExpression><![CDATA[$R{label.total.excesso}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true"> - <reportElement uuid="f53eb468-e59a-4d52-912f-d74d6f3b5b55" stretchType="RelativeToBandHeight" x="521" y="0" width="60" height="15" backcolor="#D0D0D0"/> - <box> - <topPen lineWidth="0.5"/> - <leftPen lineWidth="0.5"/> - <bottomPen lineWidth="0.5"/> - <rightPen lineWidth="0.5"/> - </box> - <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> - <font fontName="SansSerif" size="9" isBold="true"/> - </textElement> - <textFieldExpression><![CDATA[$R{label.comissao.excesso}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true"> - <reportElement uuid="f4d17e8b-9174-4eb9-a636-4cccffcc326c" stretchType="RelativeToBandHeight" x="581" y="0" width="60" height="15"/> - <box> - <topPen lineWidth="0.5"/> - <leftPen lineWidth="0.5"/> - <bottomPen lineWidth="0.5"/> - <rightPen lineWidth="0.5"/> - </box> - <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> - <font fontName="SansSerif" size="9" isBold="true"/> - </textElement> - <textFieldExpression><![CDATA[$R{label.total.outros}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true"> - <reportElement uuid="ab5e35b3-ad08-4264-b5a3-311d394cd505" stretchType="RelativeToBandHeight" x="641" y="0" width="60" height="15" backcolor="#D0D0D0"/> - <box> - <topPen lineWidth="0.5"/> - <leftPen lineWidth="0.5"/> - <bottomPen lineWidth="0.5"/> - <rightPen lineWidth="0.5"/> - </box> - <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> - <font fontName="SansSerif" size="9" isBold="true"/> - </textElement> - <textFieldExpression><![CDATA[$R{label.comissao.outros}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true"> - <reportElement uuid="baa3fc3e-8161-4723-b203-53e5aec20236" stretchType="RelativeToBandHeight" x="701" y="0" width="60" height="15"/> - <box> - <topPen lineWidth="0.5"/> - <leftPen lineWidth="0.5"/> - <bottomPen lineWidth="0.5"/> - <rightPen lineWidth="0.5"/> - </box> - <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> - <font fontName="SansSerif" size="9" isBold="true"/> - </textElement> - <textFieldExpression><![CDATA[$R{label.faturamento.total}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true"> - <reportElement uuid="702500a1-67d5-4b1f-afed-f5cf7ef46f7a" stretchType="RelativeToBandHeight" x="761" y="0" width="60" height="15" backcolor="#D0D0D0"/> + <reportElement stretchType="RelativeToBandHeight" x="882" y="0" width="47" height="15" backcolor="#D0D0D0" uuid="702500a1-67d5-4b1f-afed-f5cf7ef46f7a"/> <box> <topPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/> @@ -276,12 +210,12 @@ <rightPen lineWidth="0.5"/> </box> <textElement textAlignment="Center" verticalAlignment="Top" markup="styled"> - <font fontName="SansSerif" size="9" isBold="true"/> + <font fontName="SansSerif" size="7" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.comissão.total}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="ec3f23c3-4ed8-4ed9-a444-be0d183d7b2f" stretchType="RelativeToBandHeight" x="221" y="0" width="60" height="15" backcolor="#FFFFFF"/> + <reportElement stretchType="RelativeToBandHeight" x="273" y="0" width="50" height="15" backcolor="#D0D0D0" uuid="4011e3b5-50a3-4558-9451-dde1eaba6475"/> <box> <topPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/> @@ -289,12 +223,51 @@ <rightPen lineWidth="0.5"/> </box> <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> - <font fontName="SansSerif" size="9" isBold="true"/> + <font fontName="SansSerif" size="7" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{label.comissao.v.imp}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement stretchType="RelativeToBandHeight" x="432" y="0" width="50" height="15" uuid="c43f5d68-7ede-499f-b41e-7bea4c2633ba"/> + <box> + <topPen lineWidth="0.5"/> + <leftPen lineWidth="0.5"/> + <bottomPen lineWidth="0.5"/> + <rightPen lineWidth="0.5"/> + </box> + <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> + <font fontName="SansSerif" size="7" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{label.total.excesso}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement stretchType="RelativeToBandHeight" x="482" y="0" width="50" height="15" backcolor="#D0D0D0" uuid="f53eb468-e59a-4d52-912f-d74d6f3b5b55"/> + <box> + <topPen lineWidth="0.5"/> + <leftPen lineWidth="0.5"/> + <bottomPen lineWidth="0.5"/> + <rightPen lineWidth="0.5"/> + </box> + <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> + <font fontName="SansSerif" size="7" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{label.comissao.excesso}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement stretchType="RelativeToBandHeight" x="223" y="0" width="50" height="15" backcolor="#FFFFFF" uuid="ec3f23c3-4ed8-4ed9-a444-be0d183d7b2f"/> + <box> + <topPen lineWidth="0.5"/> + <leftPen lineWidth="0.5"/> + <bottomPen lineWidth="0.5"/> + <rightPen lineWidth="0.5"/> + </box> + <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> + <font fontName="SansSerif" size="7" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.total.venda.imp}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="4011e3b5-50a3-4558-9451-dde1eaba6475" stretchType="RelativeToBandHeight" x="281" y="0" width="60" height="15" backcolor="#D0D0D0"/> + <reportElement stretchType="RelativeToBandHeight" x="123" y="0" width="50" height="15" backcolor="#FFFFFF" uuid="b7de9705-89ba-4b32-96b6-c576a8c837c9"/> <box> <topPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/> @@ -302,27 +275,131 @@ <rightPen lineWidth="0.5"/> </box> <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> - <font fontName="SansSerif" size="9" isBold="true"/> + <font fontName="SansSerif" size="7" isBold="true"/> </textElement> - <textFieldExpression><![CDATA[$R{label.comissao.v.imp}]]></textFieldExpression> + <textFieldExpression><![CDATA[$R{label.total.passagem}]]></textFieldExpression> + </textField> + <textField> + <reportElement stretchType="RelativeToBandHeight" x="69" y="0" width="53" height="15" backcolor="#D0D0D0" uuid="6c254964-9d2e-4627-94d9-dfde4d1fc187"/> + <box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0"> + <topPen lineWidth="0.5"/> + <leftPen lineWidth="0.5"/> + <bottomPen lineWidth="0.5"/> + <rightPen lineWidth="0.5"/> + </box> + <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> + <font size="7" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{label.data}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement stretchType="RelativeToBandHeight" x="532" y="0" width="50" height="15" uuid="f4d17e8b-9174-4eb9-a636-4cccffcc326c"/> + <box> + <topPen lineWidth="0.5"/> + <leftPen lineWidth="0.5"/> + <bottomPen lineWidth="0.5"/> + <rightPen lineWidth="0.5"/> + </box> + <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> + <font fontName="SansSerif" size="7" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{label.total.outros}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement stretchType="RelativeToBandHeight" x="582" y="0" width="50" height="15" backcolor="#D0D0D0" uuid="ab5e35b3-ad08-4264-b5a3-311d394cd505"/> + <box> + <topPen lineWidth="0.5"/> + <leftPen lineWidth="0.5"/> + <bottomPen lineWidth="0.5"/> + <rightPen lineWidth="0.5"/> + </box> + <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> + <font fontName="SansSerif" size="7" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{label.comissao.outros}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement stretchType="RelativeToBandHeight" x="632" y="0" width="50" height="15" backcolor="#D0D0D0" uuid="f3658cab-9a95-4456-bbe5-1243edc747ca"/> + <box bottomPadding="1"> + <topPen lineWidth="0.5"/> + <leftPen lineWidth="0.5"/> + <bottomPen lineWidth="0.5"/> + <rightPen lineWidth="0.5"/> + </box> + <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> + <font size="7" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{label.total.seguro}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement stretchType="RelativeToBandHeight" x="782" y="0" width="50" height="15" backcolor="#D0D0D0" uuid="d08894e1-d34c-4037-b5bb-aa41c53a7576"/> + <box bottomPadding="1"> + <topPen lineWidth="0.5"/> + <leftPen lineWidth="0.5"/> + <bottomPen lineWidth="0.5"/> + <rightPen lineWidth="0.5"/> + </box> + <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> + <font size="7" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{label.comissao.recarga}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement stretchType="RelativeToBandHeight" x="732" y="0" width="50" height="15" backcolor="#D0D0D0" uuid="c269410a-18f2-4578-bde5-f4c9db87690c"/> + <box bottomPadding="1"> + <topPen lineWidth="0.5"/> + <leftPen lineWidth="0.5"/> + <bottomPen lineWidth="0.5"/> + <rightPen lineWidth="0.5"/> + </box> + <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> + <font size="7" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{label.total.recarga}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement stretchType="RelativeToBandHeight" x="832" y="0" width="50" height="15" uuid="baa3fc3e-8161-4723-b203-53e5aec20236"/> + <box> + <topPen lineWidth="0.5"/> + <leftPen lineWidth="0.5"/> + <bottomPen lineWidth="0.5"/> + <rightPen lineWidth="0.5"/> + </box> + <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> + <font fontName="SansSerif" size="7" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{label.faturamento.total}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement stretchType="RelativeToBandHeight" x="682" y="0" width="50" height="15" backcolor="#D0D0D0" uuid="da460832-f636-4821-99ce-b5fcb0870051"/> + <box bottomPadding="1"> + <topPen lineWidth="0.5"/> + <leftPen lineWidth="0.5"/> + <bottomPen lineWidth="0.5"/> + <rightPen lineWidth="0.5"/> + </box> + <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> + <font size="7" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{label.comissao.seguro}]]></textFieldExpression> </textField> </band> </columnHeader> <detail> <band height="17" splitType="Prevent"> <textField> - <reportElement uuid="37f5c197-8660-4330-ac3b-b157a0f8e6c1" x="0" y="0" width="93" height="15"/> + <reportElement x="0" y="0" width="69" height="15" uuid="37f5c197-8660-4330-ac3b-b157a0f8e6c1"/> <box> <leftPen lineWidth="0.5"/> <bottomPen lineWidth="0.5"/> </box> <textElement verticalAlignment="Middle"> - <font size="8"/> + <font size="7"/> </textElement> <textFieldExpression><![CDATA[$F{pontoVenda}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00"> - <reportElement uuid="d4925633-14a7-4e0a-9ba1-72c9898f01a2" x="93" y="0" width="68" height="15"/> + <reportElement x="122" y="0" width="50" height="15" uuid="d4925633-14a7-4e0a-9ba1-72c9898f01a2"/> <box> <bottomPen lineWidth="0.5"/> </box> @@ -332,8 +409,8 @@ <textFieldExpression><![CDATA[$F{totalTarifa}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00"> - <reportElement uuid="6740083a-5616-40b5-ad6e-474a9ff42a95" x="161" y="0" width="60" height="15" backcolor="#D0D0D0"/> - <box> + <reportElement x="172" y="0" width="50" height="15" backcolor="#D0D0D0" uuid="6740083a-5616-40b5-ad6e-474a9ff42a95"/> + <box rightPadding="2"> <bottomPen lineWidth="0.5"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> @@ -342,28 +419,28 @@ <textFieldExpression><![CDATA[$F{comissaoTarifa}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00"> - <reportElement uuid="ba43930c-8783-4551-89d4-72310c5fcc0b" x="341" y="0" width="60" height="15"/> - <box> + <reportElement x="323" y="0" width="55" height="15" uuid="ba43930c-8783-4551-89d4-72310c5fcc0b"/> + <box rightPadding="2"> <bottomPen lineWidth="0.5"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="7"/> </textElement> - <textFieldExpression><![CDATA[$F{totalImpPosterior}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{totalImpGAP}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00"> - <reportElement uuid="70f4eefa-dc33-4308-bfd5-b6c131309473" x="401" y="0" width="60" height="15" backcolor="#D0D0D0"/> - <box> + <reportElement x="378" y="0" width="54" height="15" backcolor="#D0D0D0" uuid="70f4eefa-dc33-4308-bfd5-b6c131309473"/> + <box rightPadding="2"> <bottomPen lineWidth="0.5"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="7"/> </textElement> - <textFieldExpression><![CDATA[$F{comissaoImpPosterior}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{comissaoImpGAP}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00"> - <reportElement uuid="a4559a53-c150-40c0-87ed-c311960f5138" x="461" y="0" width="60" height="15"/> - <box> + <reportElement x="432" y="0" width="50" height="15" uuid="a4559a53-c150-40c0-87ed-c311960f5138"/> + <box rightPadding="2"> <bottomPen lineWidth="0.5"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> @@ -372,8 +449,8 @@ <textFieldExpression><![CDATA[$F{totalExcBagagem}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00"> - <reportElement uuid="e4dadd17-b2c3-4136-aaa3-90b26167d3ed" x="521" y="0" width="60" height="15" backcolor="#D0D0D0"/> - <box> + <reportElement x="482" y="0" width="50" height="15" backcolor="#D0D0D0" uuid="e4dadd17-b2c3-4136-aaa3-90b26167d3ed"/> + <box rightPadding="2"> <bottomPen lineWidth="0.5"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> @@ -382,18 +459,8 @@ <textFieldExpression><![CDATA[$F{comissaoExcBagagem}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00"> - <reportElement uuid="86df5436-569d-48f2-a94c-3175a75332a2" x="581" y="0" width="60" height="15"/> - <box> - <bottomPen lineWidth="0.5"/> - </box> - <textElement textAlignment="Right" verticalAlignment="Middle"> - <font size="7"/> - </textElement> - <textFieldExpression><![CDATA[$F{totalOutros}]]></textFieldExpression> - </textField> - <textField pattern="¤ #,##0.00"> - <reportElement uuid="b2c68c6a-164f-4dd9-be3e-44bbcefe8c01" x="641" y="0" width="60" height="15" backcolor="#D0D0D0"/> - <box> + <reportElement x="582" y="0" width="50" height="15" backcolor="#D0D0D0" uuid="b2c68c6a-164f-4dd9-be3e-44bbcefe8c01"/> + <box rightPadding="2"> <bottomPen lineWidth="0.5"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> @@ -402,18 +469,18 @@ <textFieldExpression><![CDATA[$F{comissaoOutros}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00"> - <reportElement uuid="c5274583-1165-41f6-a551-ce4afc5ebd96" x="701" y="0" width="60" height="15"/> - <box> + <reportElement x="832" y="0" width="50" height="15" uuid="c5274583-1165-41f6-a551-ce4afc5ebd96"/> + <box rightPadding="2"> <bottomPen lineWidth="0.5"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="7"/> </textElement> - <textFieldExpression><![CDATA[$F{totalPagado}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{totalReceitaBruta}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00"> - <reportElement uuid="964c06b9-0092-4b22-b48f-09a7e12223ea" x="761" y="0" width="60" height="15" backcolor="#D0D0D0"/> - <box> + <reportElement x="882" y="0" width="46" height="15" backcolor="#D0D0D0" uuid="964c06b9-0092-4b22-b48f-09a7e12223ea"/> + <box rightPadding="2"> <bottomPen lineWidth="0.5"/> <rightPen lineWidth="0.5"/> </box> @@ -424,126 +491,214 @@ <textFieldExpression><![CDATA[$F{comissaoTotal}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00"> - <reportElement uuid="7ddb5de3-1cc2-4d54-b687-8d3373200d44" x="221" y="0" width="60" height="15"/> - <box> + <reportElement x="223" y="0" width="50" height="15" uuid="7ddb5de3-1cc2-4d54-b687-8d3373200d44"/> + <box rightPadding="2"> <bottomPen lineWidth="0.5"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="7"/> </textElement> - <textFieldExpression><![CDATA[$F{totalVendaImpPosterior}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{totalVendaGAP}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00"> - <reportElement uuid="3ccff4d1-442a-4076-97d3-b0df4fc380c9" x="281" y="0" width="60" height="15" backcolor="#D0D0D0"/> - <box> + <reportElement x="273" y="0" width="50" height="15" backcolor="#D0D0D0" uuid="3ccff4d1-442a-4076-97d3-b0df4fc380c9"/> + <box rightPadding="2"> <bottomPen lineWidth="0.5"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="7"/> </textElement> - <textFieldExpression><![CDATA[$F{comissaoVendaImpPosterior}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{comissaoGAP}]]></textFieldExpression> + </textField> + <textField pattern="¤ #,##0.00"> + <reportElement x="532" y="0" width="50" height="15" uuid="86df5436-569d-48f2-a94c-3175a75332a2"/> + <box rightPadding="2"> + <bottomPen lineWidth="0.5"/> + </box> + <textElement textAlignment="Right" verticalAlignment="Middle"> + <font size="7"/> + </textElement> + <textFieldExpression><![CDATA[$F{totalOutros}]]></textFieldExpression> + </textField> + <textField pattern="¤ #,##0.00"> + <reportElement x="632" y="0" width="50" height="15" backcolor="#D0D0D0" uuid="fecb8375-e166-4b9d-b64b-6c44f150a1e7"/> + <box rightPadding="2"> + <bottomPen lineWidth="0.5"/> + </box> + <textElement textAlignment="Right" verticalAlignment="Middle"> + <font size="7"/> + </textElement> + <textFieldExpression><![CDATA[$F{totalSegOpcional}]]></textFieldExpression> + </textField> + <textField pattern="¤ #,##0.00"> + <reportElement x="682" y="0" width="50" height="15" backcolor="#D0D0D0" uuid="f2ecfb02-0059-4a65-af6d-378706bc1575"/> + <box rightPadding="2"> + <bottomPen lineWidth="0.5"/> + </box> + <textElement textAlignment="Right" verticalAlignment="Middle"> + <font size="7"/> + </textElement> + <textFieldExpression><![CDATA[$F{comissaoSegOpcional}]]></textFieldExpression> + </textField> + <textField pattern="¤ #,##0.00"> + <reportElement x="732" y="0" width="50" height="15" backcolor="#D0D0D0" uuid="cb52762b-283d-4ddc-9b81-48ed07ce32c9"/> + <box rightPadding="2"> + <bottomPen lineWidth="0.5"/> + </box> + <textElement textAlignment="Right" verticalAlignment="Middle"> + <font size="7"/> + </textElement> + <textFieldExpression><![CDATA[$F{totalRecargaCell}]]></textFieldExpression> + </textField> + <textField pattern="¤ #,##0.00"> + <reportElement x="782" y="0" width="50" height="15" backcolor="#D0D0D0" uuid="356e80c0-5d22-4c30-a6c7-f23ddafd416c"/> + <box rightPadding="2"> + <bottomPen lineWidth="0.5"/> + </box> + <textElement textAlignment="Right" verticalAlignment="Middle"> + <font size="7"/> + </textElement> + <textFieldExpression><![CDATA[$F{comissaoRecargaCell}]]></textFieldExpression> + </textField> + <textField pattern="dd/MM/yyyy" isBlankWhenNull="true"> + <reportElement x="69" y="0" width="53" height="15" uuid="943835da-e8a8-401c-9abd-3c0b81767f7f"/> + <box> + <bottomPen lineWidth="0.5"/> + </box> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="7"/> + </textElement> + <textFieldExpression><![CDATA[$F{dataEvento}]]></textFieldExpression> </textField> </band> </detail> <summary> <band height="21"> <textField> - <reportElement uuid="254c9278-71b2-4ffa-926c-5b0055e02cda" x="0" y="4" width="95" height="15"/> + <reportElement x="0" y="4" width="70" height="15" uuid="254c9278-71b2-4ffa-926c-5b0055e02cda"/> <textElement verticalAlignment="Middle"> <font size="9"/> </textElement> <textFieldExpression><![CDATA[$R{label.total.geral}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00" isBlankWhenNull="true"> - <reportElement uuid="f73d0e76-f4b7-4f0d-9829-1e2e0ac136e2" x="95" y="4" width="66" height="15"/> + <reportElement x="123" y="4" width="49" height="15" uuid="f73d0e76-f4b7-4f0d-9829-1e2e0ac136e2"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="8"/> </textElement> <textFieldExpression><![CDATA[$V{totalVendaPassagens}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00" isBlankWhenNull="true"> - <reportElement uuid="8d5c13c7-22b3-4d98-aa90-2f29c66b27df" x="161" y="4" width="60" height="15"/> + <reportElement x="173" y="4" width="48" height="15" uuid="8d5c13c7-22b3-4d98-aa90-2f29c66b27df"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="8"/> </textElement> <textFieldExpression><![CDATA[$V{totalComissaoVenda}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00" isBlankWhenNull="true"> - <reportElement uuid="5283241a-48aa-4a14-9055-fa4556740285" x="221" y="4" width="60" height="15"/> + <reportElement x="221" y="4" width="52" height="15" uuid="5283241a-48aa-4a14-9055-fa4556740285"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="8"/> </textElement> - <textFieldExpression><![CDATA[$V{totalVendaImpPosterior}]]></textFieldExpression> + <textFieldExpression><![CDATA[$V{totalVendaGAP}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00" isBlankWhenNull="true"> - <reportElement uuid="1e757c53-6a63-4631-8cf1-1947ef2e5655" x="281" y="4" width="60" height="15"/> + <reportElement x="273" y="4" width="50" height="15" uuid="1e757c53-6a63-4631-8cf1-1947ef2e5655"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="8"/> </textElement> - <textFieldExpression><![CDATA[$V{totalComissaoVendaImpPos}]]></textFieldExpression> + <textFieldExpression><![CDATA[$V{totalComissaoGAP}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00" isBlankWhenNull="true"> - <reportElement uuid="28d68769-ee18-4e75-876f-3831440e4d6d" x="341" y="4" width="60" height="15"/> + <reportElement x="323" y="4" width="55" height="15" uuid="28d68769-ee18-4e75-876f-3831440e4d6d"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="8"/> </textElement> - <textFieldExpression><![CDATA[$V{totalVendaImpPosterior}]]></textFieldExpression> + <textFieldExpression><![CDATA[$V{totalImpGAP}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00" isBlankWhenNull="true"> - <reportElement uuid="6a225efc-3b35-4d11-88a6-b91bcc0f46c4" x="401" y="4" width="60" height="15"/> + <reportElement x="378" y="4" width="54" height="15" uuid="6a225efc-3b35-4d11-88a6-b91bcc0f46c4"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="8"/> </textElement> - <textFieldExpression><![CDATA[$V{totalComissaoImpPosterior}]]></textFieldExpression> + <textFieldExpression><![CDATA[$V{totalComissaoImpGAP}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00" isBlankWhenNull="true"> - <reportElement uuid="692797f2-804c-475c-8850-3298c8929bff" x="461" y="4" width="60" height="15"/> + <reportElement x="432" y="4" width="50" height="15" uuid="692797f2-804c-475c-8850-3298c8929bff"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="8"/> </textElement> <textFieldExpression><![CDATA[$V{totalExcBagagem}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00" isBlankWhenNull="true"> - <reportElement uuid="0bc22fcd-08c9-4aa6-ba57-86c622d4ab25" x="521" y="4" width="60" height="15"/> + <reportElement x="482" y="4" width="50" height="15" uuid="0bc22fcd-08c9-4aa6-ba57-86c622d4ab25"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="8"/> </textElement> <textFieldExpression><![CDATA[$V{totalComissaoExcBagagem}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00" isBlankWhenNull="true"> - <reportElement uuid="f36968b3-9d63-4a93-8b83-76aa7a7efac0" x="581" y="4" width="60" height="15"/> + <reportElement x="532" y="4" width="50" height="15" uuid="f36968b3-9d63-4a93-8b83-76aa7a7efac0"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="8"/> </textElement> <textFieldExpression><![CDATA[$V{totalOutros}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00" isBlankWhenNull="true"> - <reportElement uuid="13303515-a3f8-4c98-9faf-8cfc7fbf4fbb" x="641" y="4" width="60" height="15"/> + <reportElement x="582" y="4" width="49" height="15" uuid="13303515-a3f8-4c98-9faf-8cfc7fbf4fbb"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="8"/> </textElement> <textFieldExpression><![CDATA[$V{totalComissaoOutros}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00" isBlankWhenNull="true"> - <reportElement uuid="d13a8054-8d65-44f0-ab07-528d86eccabd" x="702" y="4" width="60" height="15"/> + <reportElement x="832" y="4" width="50" height="15" uuid="d13a8054-8d65-44f0-ab07-528d86eccabd"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="8"/> </textElement> <textFieldExpression><![CDATA[$V{totalPagado}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00" isBlankWhenNull="true"> - <reportElement uuid="9e75f6e6-ff85-4065-bc46-b1362f9294e1" x="762" y="4" width="60" height="15"/> + <reportElement x="882" y="4" width="46" height="15" uuid="9e75f6e6-ff85-4065-bc46-b1362f9294e1"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="8"/> </textElement> <textFieldExpression><![CDATA[$V{totalComissaoTotal}]]></textFieldExpression> </textField> <line> - <reportElement uuid="4a56d4c0-e2dc-4b24-bac3-fd5dd76b986c" x="0" y="1" width="822" height="1"/> + <reportElement x="0" y="1" width="930" height="1" uuid="4a56d4c0-e2dc-4b24-bac3-fd5dd76b986c"/> </line> + <textField pattern="¤ #,##0.00" isBlankWhenNull="true"> + <reportElement x="631" y="4" width="51" height="15" uuid="c936f073-ae83-4289-a1af-e91f783587e0"/> + <textElement textAlignment="Right" verticalAlignment="Middle"> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$V{totalSeguroOpcional}]]></textFieldExpression> + </textField> + <textField pattern="¤ #,##0.00" isBlankWhenNull="true"> + <reportElement x="682" y="4" width="50" height="15" uuid="963b70d9-d3c5-4990-868f-d431db28c214"/> + <textElement textAlignment="Right" verticalAlignment="Middle"> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$V{totalComissaoSeguroOpcional}]]></textFieldExpression> + </textField> + <textField pattern="¤ #,##0.00" isBlankWhenNull="true"> + <reportElement x="732" y="4" width="50" height="15" uuid="22dd543d-6f8f-445b-9aec-85d9abb2613f"/> + <textElement textAlignment="Right" verticalAlignment="Middle"> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$V{totalRecarga}]]></textFieldExpression> + </textField> + <textField pattern="¤ #,##0.00" isBlankWhenNull="true"> + <reportElement x="782" y="4" width="50" height="15" uuid="2c25e5c6-15c2-49f0-b187-59048c339b31"/> + <textElement textAlignment="Right" verticalAlignment="Middle"> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$V{totalComissaoRecarga}]]></textFieldExpression> + </textField> </band> </summary> <noData> - <band height="22"/> + <band height="23"/> </noData> </jasperReport> diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioComissaoSinteticoBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioComissaoSinteticoBean.java index 5e9fac826..0445f76d1 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioComissaoSinteticoBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioComissaoSinteticoBean.java @@ -1,28 +1,57 @@ package com.rjconsultores.ventaboletos.relatorios.utilitarios; import java.math.BigDecimal; +import java.util.Date; import java.util.Objects; public class RelatorioComissaoSinteticoBean { + private Integer comissaoID; + private Date dataEvento; private String pontoVenda; private Integer pontoVendaID; private Integer empresaID; + private BigDecimal totalTarifa; private BigDecimal comissaoTarifa; - private BigDecimal totalImpPosterior; - private BigDecimal comissaoImpPosterior; - private BigDecimal totalVendaImpPosterior; - private BigDecimal comissaoVendaImpPosterior; + private BigDecimal totalVendaGAP; + private BigDecimal comissaoGAP; + private BigDecimal totalImpGAP; + private BigDecimal comissaoImpGAP; private BigDecimal totalExcBagagem; private BigDecimal comissaoExcBagagem; private BigDecimal totalOutros; private BigDecimal comissaoOutros; - private BigDecimal totalPagado; + private BigDecimal totalSegOpcional; + private BigDecimal comissaoSegOpcional; + private BigDecimal totalRecargaCell; + private BigDecimal comissaoRecargaCell; + private BigDecimal totalReceitaBruta; private BigDecimal comissaoTotal; - private BigDecimal totalSeguro; - private BigDecimal totalPedagio; - private BigDecimal totalTaxaEmb; - private BigDecimal comissaoSeguro; + + + public Integer getComissaoID() { + return comissaoID; + } + + public void setComissaoID(Integer comissaoID) { + this.comissaoID = comissaoID; + } + + public Date getDataEvento() { + return dataEvento; + } + + public void setDataEvento(Date dataEvento) { + this.dataEvento = dataEvento; + } + + public String getPontoVenda() { + return pontoVenda; + } + + public void setPontoVenda(String pontoVenda) { + this.pontoVenda = pontoVenda; + } public Integer getPontoVendaID() { return pontoVendaID; @@ -40,38 +69,6 @@ public class RelatorioComissaoSinteticoBean { this.empresaID = empresaID; } - public String getPontoVenda() { - return pontoVenda; - } - - public void setPontoVenda(String pontoVenda) { - this.pontoVenda = pontoVenda; - } - - public BigDecimal getTotalSeguro() { - return totalSeguro; - } - - public void setTotalSeguro(BigDecimal totalSeguro) { - this.totalSeguro = totalSeguro; - } - - public BigDecimal getTotalTaxaEmb() { - return totalTaxaEmb; - } - - public void setTotalTaxaEmb(BigDecimal totalTaxaEmb) { - this.totalTaxaEmb = totalTaxaEmb; - } - - public BigDecimal getTotalPegadio() { - return totalPedagio; - } - - public void setTotalPegadio(BigDecimal totalPegadio) { - this.totalPedagio = totalPegadio; - } - public BigDecimal getTotalTarifa() { return totalTarifa; } @@ -88,36 +85,36 @@ public class RelatorioComissaoSinteticoBean { this.comissaoTarifa = comissaoTarifa; } - public BigDecimal getTotalImpPosterior() { - return totalImpPosterior; + public BigDecimal getTotalVendaGAP() { + return totalVendaGAP; } - public void setTotalImpPosterior(BigDecimal totalImpPosterior) { - this.totalImpPosterior = totalImpPosterior; + public void setTotalVendaGAP(BigDecimal totalVendaGAP) { + this.totalVendaGAP = totalVendaGAP; } - public BigDecimal getComissaoImpPosterior() { - return comissaoImpPosterior; + public BigDecimal getComissaoGAP() { + return comissaoGAP; } - public BigDecimal getTotalVendaImpPosterior() { - return totalVendaImpPosterior; + public void setComissaoGAP(BigDecimal comissaoGAP) { + this.comissaoGAP = comissaoGAP; } - public void setTotalVendaImpPosterior(BigDecimal totalVendaImpPosterior) { - this.totalVendaImpPosterior = totalVendaImpPosterior; + public BigDecimal getTotalImpGAP() { + return totalImpGAP; } - public BigDecimal getComissaoVendaImpPosterior() { - return comissaoVendaImpPosterior; + public void setTotalImpGAP(BigDecimal totalImpGAP) { + this.totalImpGAP = totalImpGAP; } - public void setComissaoVendaImpPosterior(BigDecimal comissaoVendaImpPosterior) { - this.comissaoVendaImpPosterior = comissaoVendaImpPosterior; + public BigDecimal getComissaoImpGAP() { + return comissaoImpGAP; } - public void setComissaoImpPosterior(BigDecimal comissaoImpPosterior) { - this.comissaoImpPosterior = comissaoImpPosterior; + public void setComissaoImpGAP(BigDecimal comissaoImpGAP) { + this.comissaoImpGAP = comissaoImpGAP; } public BigDecimal getTotalExcBagagem() { @@ -152,12 +149,44 @@ public class RelatorioComissaoSinteticoBean { this.comissaoOutros = comissaoOutros; } - public BigDecimal getTotalPagado() { - return totalPagado; + public BigDecimal getTotalSegOpcional() { + return totalSegOpcional; } - public void setTotalPagado(BigDecimal totalPagado) { - this.totalPagado = totalPagado; + public void setTotalSegOpcional(BigDecimal totalSegOpcional) { + this.totalSegOpcional = totalSegOpcional; + } + + public BigDecimal getComissaoSegOpcional() { + return comissaoSegOpcional; + } + + public void setComissaoSegOpcional(BigDecimal comissaoSegOpcional) { + this.comissaoSegOpcional = comissaoSegOpcional; + } + + public BigDecimal getTotalRecargaCell() { + return totalRecargaCell; + } + + public void setTotalRecargaCell(BigDecimal totalRecargaCell) { + this.totalRecargaCell = totalRecargaCell; + } + + public BigDecimal getComissaoRecargaCell() { + return comissaoRecargaCell; + } + + public void setComissaoRecargaCell(BigDecimal comissaoRecargaCell) { + this.comissaoRecargaCell = comissaoRecargaCell; + } + + public BigDecimal getTotalReceitaBruta() { + return totalReceitaBruta; + } + + public void setTotalReceitaBruta(BigDecimal totalReceitaBruta) { + this.totalReceitaBruta = totalReceitaBruta; } public BigDecimal getComissaoTotal() { @@ -168,17 +197,9 @@ public class RelatorioComissaoSinteticoBean { this.comissaoTotal = comissaoTotal; } - public BigDecimal getComissaoSeguro() { - return comissaoSeguro; - } - - public void setComissaoSeguro(BigDecimal comissaoSeguro) { - this.comissaoSeguro = comissaoSeguro; - } - @Override public int hashCode() { - return Objects.hash(empresaID, pontoVendaID); + return Objects.hash(comissaoID); } @Override diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioComissaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioComissaoController.java index 04f00d1ef..2434467a2 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioComissaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioComissaoController.java @@ -6,6 +6,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import javax.sql.DataSource; @@ -21,6 +22,7 @@ import org.zkoss.zul.Comboitem; import org.zkoss.zul.Paging; import org.zkoss.zul.Radiogroup; +import com.rjconsultores.ventaboletos.dao.ComissaoDAO; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioComissaoSintetico; @@ -50,7 +52,10 @@ public class RelatorioComissaoController extends MyGenericForwardComposer { private DataSource dataSourceRead; @Autowired private EmpresaService empresaService; + @Autowired + private ComissaoDAO comissaoDAO; private List<Empresa> lsEmpresa; + private List<PuntoVenta> lsPuntoVenta; private MyDatebox datInicial; private MyDatebox datFinal; private MyTextbox txtNombrePuntoVenta; @@ -64,6 +69,7 @@ public class RelatorioComissaoController extends MyGenericForwardComposer { @Override public void doAfterCompose(Component comp) throws Exception { lsEmpresa = empresaService.obtenerTodos(); + lsPuntoVenta = comissaoDAO.buscaPuntoVentasComComissaoParametrizada(); super.doAfterCompose(comp); puntoVentaList.setItemRenderer(new RenderRelatorioTaxasLinhaPuntoVenta()); puntoVentaSelList.setItemRenderer(new RenderRelatorioTaxasLinhaPuntoVentaSelecionados()); @@ -71,16 +77,15 @@ public class RelatorioComissaoController extends MyGenericForwardComposer { private void executarPesquisa() { HibernateSearchObject<PuntoVenta> puntoVentaBusqueda = new HibernateSearchObject<PuntoVenta>(PuntoVenta.class, pagingPuntoVenta.getPageSize()); - + puntoVentaBusqueda.addFilterILike("nombpuntoventa", "%" + txtNombrePuntoVenta.getValue() + "%"); puntoVentaBusqueda.addFilterEqual("activo", Boolean.TRUE); - puntoVentaBusqueda.addSortAsc("nombpuntoventa"); - puntoVentaBusqueda.addFilterEqual("activo", Boolean.TRUE); plwPuntoVenta.init(puntoVentaBusqueda, puntoVentaList, pagingPuntoVenta); + if (puntoVentaList.getData().length == 0) { try { Messagebox.show(Labels.getLabel("MSG.ningunRegistro"), @@ -88,6 +93,12 @@ public class RelatorioComissaoController extends MyGenericForwardComposer { Messagebox.OK, Messagebox.INFORMATION); } catch (InterruptedException ex) { } + } else { + for (Object item : puntoVentaList.getData()) { + if (!lsPuntoVenta.contains((PuntoVenta) item)) { + puntoVentaList.removeItem(item); + } + } } }