fixes bug#11600
fixes bug#10939 dev: julio qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@85992 d1611594-4594-4d17-8e1d-87c2c4800839master
julio
parent
6d6f095cd3
commit
a5cc3fbd8f
|
|
@ -10,6 +10,7 @@ import java.util.Date;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
import com.rjconsultores.ventaboletos.entidad.Empresa;
|
||||
|
|
@ -51,7 +52,7 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
|
|||
ufs = ufs + "," + estado.getEstadoId().toString();
|
||||
}
|
||||
|
||||
String pdvs = (String)parametros.get("agencias");
|
||||
String pdvs = (String) parametros.get("agencias");
|
||||
|
||||
NamedParameterStatement stmt = new NamedParameterStatement(getConexao(), getSql(ufs, pdvs, tipoPuntoVenta == null ? -1 : tipoPuntoVenta.getTipoptovtaId().intValue(), isBpe));
|
||||
stmt.setInt("EMPRESA_ID", empresa.getEmpresaId());
|
||||
|
|
@ -62,12 +63,12 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
|
|||
ResultSet rset = stmt.executeQuery();
|
||||
while (rset.next()) {
|
||||
FinanceiroSintetico fs = new FinanceiroSintetico();
|
||||
fs.setUf(rset.getString("uf"));
|
||||
fs.setCodigoAgencia(rset.getString("codigo"));
|
||||
fs.setUf(getString(rset, new String[] {"uf", "estadoOrigem_rec", "estadoOrigem_dev"}));
|
||||
fs.setCodigoAgencia(getString(rset, new String[] {"codigo", "codigo_rec", "codigo_dev"}));
|
||||
|
||||
fs.setGapVenda(getBigDecimal(rset, "receita_gap"));
|
||||
fs.setGapImpressa(getBigDecimal(rset, "entrega_gap"));
|
||||
|
||||
|
||||
fs.setReceitaBPR(getBigDecimal(rset, "receita_rdi_bpr"));
|
||||
|
||||
BigDecimal totalVendaPassagens = fs.getReceitaBPR().add(fs.getGapVenda());
|
||||
|
|
@ -99,8 +100,8 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
|
|||
fs.setDevolBPR(getBigDecimal(rset, "receita_cancel_rdi_bpr"));
|
||||
fs.setDevolGAP(getBigDecimal(rset, "receita_devol_gap"));
|
||||
fs.setDevolOCD(getBigDecimal(rset, "receita_ocd_dev"));
|
||||
|
||||
BigDecimal totalDevolucao = fs.getDevolBPR().add(fs.getDevolGAP());
|
||||
BigDecimal totalDevolucao = fs.getDevolBPR().add(fs.getDevolGAP()).add(fs.getDevolOCD());
|
||||
|
||||
BigDecimal receitaLiquida = receitaBruta.subtract(totalDevolucao);
|
||||
fs.setReceitaLiquida(receitaLiquida);
|
||||
|
||||
|
|
@ -111,11 +112,11 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
|
|||
BigDecimal cartaoCredito = getBigDecimal(rset, "cartao_credito");
|
||||
cartaoCredito = cartaoCredito.add(getBigDecimal(rset, "cartao_credito_ee"));
|
||||
fs.setCartaoCredito(cartaoCredito);
|
||||
|
||||
|
||||
BigDecimal cartaoDebito = getBigDecimal(rset, "cartao_debito");
|
||||
cartaoDebito = cartaoDebito.add(getBigDecimal(rset, "cartao_debito_ee"));
|
||||
fs.setCartaoDebito(cartaoDebito);
|
||||
|
||||
|
||||
BigDecimal boleto = getBigDecimal(rset, "boleto_bnc");
|
||||
boleto = boleto.add(getBigDecimal(rset, "boleto_bnc_ee"));
|
||||
fs.setBoletoBancario(boleto);
|
||||
|
|
@ -145,6 +146,18 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
|
|||
this.setCollectionDataSource(new JRBeanCollectionDataSource(listdata));
|
||||
}
|
||||
|
||||
static public String getString(ResultSet rs, String... strColName) throws SQLException {
|
||||
String nValue = null;
|
||||
String[] array = strColName;
|
||||
for (int i = 0; i < array.length; i++) {
|
||||
if (StringUtils.isNotBlank(rs.getString(array[i]))) {
|
||||
nValue = rs.getString(array[i]);
|
||||
return nValue;
|
||||
}
|
||||
}
|
||||
return nValue;
|
||||
}
|
||||
|
||||
static public BigDecimal getBigDecimal(ResultSet rs, String strColName) throws SQLException {
|
||||
BigDecimal nValue = rs.getBigDecimal(strColName);
|
||||
return rs.wasNull() ? BigDecimal.ZERO : nValue;
|
||||
|
|
@ -156,7 +169,7 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
|
|||
|
||||
private String getSql(String ufs, String pdvs, Integer tipoptovtaId, boolean isBpe) {
|
||||
|
||||
StringBuilder sql = new StringBuilder(20000);
|
||||
StringBuilder sql = new StringBuilder();
|
||||
sql.append(" SELECT * ");
|
||||
sql.append(" FROM ");
|
||||
sql.append(" (SELECT cdv.estadoOrigem AS uf, ");
|
||||
|
|
@ -229,11 +242,8 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
|
|||
sql.append(" SUM( CASE WHEN (cdc.indstatusboleto IN ('C', 'T') AND cdc.motivocancelacion_id IN (32,10,37)) THEN cdc.valorpago ELSE 0 END) AS receita_devol_bpr, ");
|
||||
sql.append(" SUM( CASE WHEN (cdc.indstatusboleto IN ('C', 'T') AND cdc.motivocancelacion_id IN (31)) THEN cdc.valorpago ELSE 0 END) AS receita_cancel_bpr, ");
|
||||
sql.append(" SUM( CASE WHEN ( (cdc.indstatusboleto = 'C' AND cdc.motivocancelacion_id IN (31,32,10,37) OR (cdc.indstatusboleto = 'T' AND cdc.motivocancelacion_id IS NULL )) AND cdc.numfoliosistema IS NULL AND cdc.tipoventa_id IN (5,12,18,49)) THEN cdc.valorpago ELSE 0 END) AS receita_devol_gap, ");
|
||||
|
||||
sql.append(" SUM( CASE WHEN (trunc(cdc.fecinc) = trunc(cdc.feccorte)) THEN cdc.valor_ocd ELSE 0 END) AS receita_ocd_dev, ");
|
||||
// sql.append(" SUM( CASE WHEN (cdc.fecpago is not null ) THEN cdc.valor_ocd ELSE 0 END) AS receita_ocd_pg ");
|
||||
sql.append(" SUM( CASE WHEN (cdc.fecpago is not null and cdc.fecpago between :DATE_INICIO and :DATE_FIM) THEN cdc.valor_ocd ELSE 0 END) AS receita_ocd_pg ");
|
||||
|
||||
sql.append(" FROM ");
|
||||
sql.append(" ( SELECT DISTINCT c.caja_id AS cajaid, ");
|
||||
sql.append(" e.empresa_id AS empresaId, ");
|
||||
|
|
@ -256,7 +266,7 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
|
|||
sql.append(" c.motivocancelacion_id AS motivocancelacion_id, ");
|
||||
sql.append(" c.tipoventa_id AS tipoventa_id, ");
|
||||
sql.append(" c.indstatusoperacion, ");
|
||||
|
||||
|
||||
sql.append(" c.feccorte, ");
|
||||
sql.append(" ocd.fecinc, ");
|
||||
sql.append(" ocd.fecpago, ");
|
||||
|
|
@ -271,7 +281,7 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
|
|||
sql.append(" JOIN parada po ON po.parada_id = pv.parada_id ");
|
||||
sql.append(" JOIN ciudad co ON co.ciudad_id = po.ciudad_id ");
|
||||
sql.append(" JOIN estado eo ON eo.estado_id = co.estado_id ");
|
||||
sql.append(" LEFT JOIN ocd ocd on ocd.boleto_id = c.transacao_id ");
|
||||
sql.append(" LEFT JOIN ocd ocd on ocd.boleto_id = c.transacao_id ");
|
||||
sql.append(" WHERE (c.motivocancelacion_id IN (31,32,10,37,99,36) ");
|
||||
sql.append(" OR c.motivocancelacion_id IS NULL) ");
|
||||
sql.append(" AND c.feccorte >= :DATE_INICIO ");
|
||||
|
|
@ -329,7 +339,7 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
|
|||
|
||||
sql.append(ufs == null ? "" : " and eo.estado_id in ( " + ufs + " ) ");
|
||||
sql.append(pdvs == null ? "" : "and ccp.puntoventa_id in ( " + pdvs + " ) ");
|
||||
sql.append(tipoptovtaId == -1 ? "" : "and pv.tipoptovta_id = " + tipoptovtaId);
|
||||
sql.append(tipoptovtaId == -1 ? "" : "and pv.tipoptovta_id = " + tipoptovtaId);
|
||||
|
||||
sql.append(" GROUP BY ee.empresa_id, ");
|
||||
sql.append(" cd.puntoventa_id, ");
|
||||
|
|
@ -337,22 +347,21 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
|
|||
sql.append(" ) eed ON agrc.empresaId = eed.empresaId ");
|
||||
sql.append(" AND agrc.puntoventaId = eed.puntoventaId ");
|
||||
sql.append(" AND agrc.estadoId = eed.estadoId ");
|
||||
sql.append(" LEFT JOIN ");
|
||||
|
||||
|
||||
|
||||
//alterar para o BPe
|
||||
sql.append(" (select empresaId, puntoventaId, estadoId, sum(tarifa) receita_rdi_bpr from ( ");
|
||||
sql.append(" FULL JOIN ");
|
||||
sql.append(" (select empresaId, puntoventaId, estadoId, codigo_rec, estadoOrigem_rec, sum(tarifa) receita_rdi_bpr from ( ");
|
||||
sql.append(" SELECT DISTINCT ");
|
||||
sql.append(isBpe ? " c.boleto_id as cajaId, " : " c.caja_id as cajaId, ");
|
||||
sql.append(" e.empresa_id AS empresaId, ");
|
||||
sql.append(" pv.puntoventa_id AS puntoventaId, ");
|
||||
sql.append(" pv.numpuntoventa AS codigo_rec, ");
|
||||
sql.append(" eo.estado_id AS estadoId, ");
|
||||
sql.append(" eo.cveestado AS estadoOrigem_rec, ");
|
||||
sql.append(" COALESCE(c.preciopagado, 0)AS tarifa, ");
|
||||
sql.append(" COALESCE(c.importetaxaembarque, 0) AS taxaEmbarque, ");
|
||||
sql.append(" COALESCE(c.importepedagio, 0) AS pedagio, ");
|
||||
sql.append(" COALESCE(c.importeseguro, 0) AS seguro, ");
|
||||
sql.append(" COALESCE(c.importeoutros, 0) AS outros ");
|
||||
sql.append(" COALESCE(c.importeoutros, 0) AS outros ");
|
||||
sql.append(isBpe ? " from boleto c " : " FROM caja c ");
|
||||
sql.append(isBpe ? " inner join bpe bpe on bpe.boleto_id = c.boleto_id " : "");
|
||||
sql.append(" INNER JOIN marca m ON m.marca_id = c.marca_id AND m.activo = 1 ");
|
||||
|
|
@ -366,22 +375,24 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
|
|||
sql.append(" AND co.activo = 1 ");
|
||||
sql.append(" AND eo.activo = 1 ");
|
||||
sql.append(" AND c.serieimpfiscal IS NOT NULL ");
|
||||
sql.append(isBpe ? " and bpe.bpe_id is not null " : " and c.num_bpe is null ");
|
||||
sql.append(isBpe ? " and bpe.bpe_id is not null " : " and c.num_bpe is null ");
|
||||
sql.append(" AND ((c.indreimpresion = 0 AND c.motivocancelacion_id IS NULL ");
|
||||
sql.append(" AND c.numfoliosistema IS NOT NULL) OR (c.indstatusboleto = 'E' AND c.indreimpresion = 1)) ");
|
||||
sql.append(" AND (COALESCE(c.preciopagado,0) + COALESCE(c.importetaxaembarque,0) + COALESCE(c.importeseguro,0) + COALESCE(c.importepedagio,0) + COALESCE(c.importeoutros,0)) > 0 ");
|
||||
sql.append(" AND c.feccreacion >= :DATE_INICIO AND c.feccreacion <= :DATE_FIM ");
|
||||
sql.append(" AND e.empresa_id = :EMPRESA_ID ");
|
||||
|
||||
|
||||
sql.append(ufs == null ? "" : " and eo.estado_id in ( " + ufs + " ) ");
|
||||
sql.append(pdvs == null ? "" : "and pv.puntoventa_id in ( " + pdvs + " ) ");
|
||||
sql.append(tipoptovtaId == -1 ? "" : "and pv.tipoptovta_id = " + tipoptovtaId);
|
||||
|
||||
sql.append(tipoptovtaId == -1 ? "" : "and pv.tipoptovta_id = " + tipoptovtaId);
|
||||
|
||||
sql.append(" UNION ALL ");
|
||||
sql.append(" SELECT DISTINCT c.caja_id AS cajaId, ");
|
||||
sql.append(" e.empresa_id AS empresaId, ");
|
||||
sql.append(" pv.puntoventa_id AS puntoventaId, ");
|
||||
sql.append(" pv.numpuntoventa AS codigo_rec, ");
|
||||
sql.append(" eo.estado_id AS estadoId, ");
|
||||
sql.append(" eo.cveestado AS estadoOrigem_rec, ");
|
||||
sql.append(" COALESCE(c.preciopagado, 0) AS tarifa, ");
|
||||
sql.append(" COALESCE(c.importetaxaembarque, 0) AS taxaEmbarque, ");
|
||||
sql.append(" COALESCE(c.importepedagio, 0) AS pedagio, ");
|
||||
|
|
@ -407,62 +418,73 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
|
|||
sql.append(isBpe ? " " : " AND c.num_bpe is null ");
|
||||
sql.append(" AND e.empresa_id = :EMPRESA_ID ");
|
||||
sql.append(" AND c.feccreacion BETWEEN :DATE_INICIO AND :DATE_FIM ");
|
||||
|
||||
sql.append(ufs == null ? "" : " and eo.estado_id in ( " + ufs + " ) ");
|
||||
sql.append(pdvs == null ? "" : "and pv.puntoventa_id in ( " + pdvs + " ) ");
|
||||
sql.append(tipoptovtaId == -1 ? "" : "and pv.tipoptovta_id = " + tipoptovtaId);
|
||||
|
||||
sql.append(tipoptovtaId == -1 ? "" : "and pv.tipoptovta_id = " + tipoptovtaId);
|
||||
sql.append(" ) rbl ");
|
||||
sql.append(" GROUP BY rbl.estadoId, ");
|
||||
sql.append(" rbl.puntoventaId, ");
|
||||
sql.append(" rbl.empresaId ");
|
||||
sql.append(" GROUP BY rbl.estadoId, rbl.puntoventaId, rbl.empresaId, rbl.codigo_rec, rbl.estadoOrigem_rec ");
|
||||
sql.append(" )rbpr ON agrc.empresaId = rbpr.empresaId ");
|
||||
sql.append(" AND agrc.puntoventaId = rbpr.puntoventaId ");
|
||||
sql.append(" AND agrc.estadoId = rbpr.estadoId ");
|
||||
sql.append(" AND agrc.puntoventaId = rbpr.puntoventaId ");
|
||||
sql.append(" AND agrc.estadoId = rbpr.estadoId ");
|
||||
|
||||
// alterar para o BPe deve ser validado pelo xml
|
||||
|
||||
sql.append(" LEFT JOIN ");
|
||||
sql.append(" ( select empresaId, puntoventaId, estadoId, sum(tarifa) receita_cancel_rdi_bpr from ( ");
|
||||
sql.append(" SELECT DISTINCT b.boleto_id AS cajaId, ");
|
||||
sql.append(" e.empresa_id AS empresaId, ");
|
||||
sql.append(" pv.puntoventa_id AS puntoventaId, ");
|
||||
sql.append(" eo.estado_id AS estadoId, ");
|
||||
sql.append(" COALESCE(b.preciopagado, 0) AS tarifa, ");
|
||||
sql.append(" COALESCE(b.importetaxaembarque, 0) AS taxaEmbarque, ");
|
||||
sql.append(" COALESCE(b.importepedagio, 0) AS pedagio, ");
|
||||
sql.append(" COALESCE(b.importeseguro, 0) AS seguro, ");
|
||||
sql.append(" COALESCE(b.importeoutros, 0) AS outros ");
|
||||
sql.append(" FROM boleto b ");
|
||||
sql.append(" INNER JOIN marca m ON m.marca_id = b.marca_id AND m.activo = 1 ");
|
||||
sql.append(" INNER JOIN empresa e ON e.empresa_id = m.empresa_id ");
|
||||
sql.append(" INNER JOIN punto_venta pv ON pv.puntoventa_id = b.puntoventa_id ");
|
||||
sql.append(" INNER JOIN parada p ON pv.parada_id = p.parada_id ");
|
||||
sql.append(" INNER JOIN ciudad co ON co.ciudad_id = p.ciudad_id ");
|
||||
sql.append(" INNER JOIN estado eo ON eo.estado_id = co.estado_id ");
|
||||
sql.append(" WHERE b.motivocancelacion_id IN (31,32,10,37,99,36) ");
|
||||
sql.append(" AND b.indstatusboleto = 'C' ");
|
||||
sql.append(" AND b.indcancelacion = 1 ");
|
||||
sql.append(" AND b.numfoliopreimpreso IS NOT NULL ");
|
||||
sql.append(isBpe ? " " : " AND b.num_bpe is null ");
|
||||
sql.append(" AND e.empresa_id = :EMPRESA_ID ");
|
||||
sql.append(" AND b.fechorventa >= :DATE_INICIO ");
|
||||
sql.append(" AND b.fechorventa <= :DATE_FIM ");
|
||||
|
||||
sql.append(ufs == null ? "" : " and eo.estado_id in ( " + ufs + " ) ");
|
||||
sql.append(pdvs == null ? "" : "and pv.puntoventa_id in ( " + pdvs + " ) ");
|
||||
sql.append(tipoptovtaId == -1 ? "" : "and pv.tipoptovta_id = " + tipoptovtaId);
|
||||
|
||||
sql.append(" AND b.categoria_id NOT IN (SELECT valorconstante FROM constante WHERE nombconstante = 'GRATUIDADE_CRIANCA') ");
|
||||
sql.append(" ) cbl ");
|
||||
sql.append(" GROUP BY cbl.estadoId, ");
|
||||
sql.append(" cbl.puntoventaId, ");
|
||||
sql.append(" cbl.empresaId ");
|
||||
sql.append(" FULL JOIN ");
|
||||
sql.append(" ( select empresaId, puntoventaId, estadoId, codigo_dev, estadoOrigem_dev, sum(tarifa) receita_cancel_rdi_bpr from ( ");
|
||||
sql.append(" SELECT DISTINCT b.boleto_id AS cajaId, ");
|
||||
sql.append(" e.empresa_id AS empresaId, ");
|
||||
sql.append(" PTVO.PUNTOVENTA_ID AS puntoventaId, ");
|
||||
sql.append(" PTVO.NUMPUNTOVENTA AS codigo_dev, ");
|
||||
sql.append(" COALESCE(ESAIDF.ESTADO_ID, EOS.ESTADO_ID, EST.ESTADO_ID) AS estadoId, ");
|
||||
sql.append(" COALESCE(ESAIDF.CVEESTADO, EOS.CVEESTADO, EST.CVEESTADO) AS estadoOrigem_dev, ");
|
||||
sql.append(" COALESCE(b.preciopagado, 0) AS tarifa, ");
|
||||
sql.append(" COALESCE(b.importetaxaembarque, 0) AS taxaEmbarque, ");
|
||||
sql.append(" COALESCE(b.importepedagio, 0) AS pedagio, ");
|
||||
sql.append(" COALESCE(b.importeseguro, 0) AS seguro, ");
|
||||
sql.append(" COALESCE(b.importeoutros, 0) AS outros ");
|
||||
sql.append(" FROM BOLETO B ");
|
||||
sql.append(" INNER JOIN MARCA M ON M.MARCA_ID = B.MARCA_ID AND M.ACTIVO = 1 ");
|
||||
sql.append(" INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ");
|
||||
sql.append(" INNER JOIN PUNTO_VENTA PTV ON PTV.PUNTOVENTA_ID = B.PUNTOVENTA_ID ");
|
||||
sql.append(" INNER JOIN PARADA ORI ON (B.ORIGEN_ID = ORI.PARADA_ID ) ");
|
||||
sql.append(" INNER JOIN PARADA DES ON (B.DESTINO_ID = DES.PARADA_ID ) ");
|
||||
sql.append(" INNER JOIN CIUDAD CO ON (CO.CIUDAD_ID = ORI.CIUDAD_ID ) ");
|
||||
sql.append(" INNER JOIN CIUDAD CD ON (CD.CIUDAD_ID = DES.CIUDAD_ID ) ");
|
||||
sql.append(" INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID ");
|
||||
sql.append(" LEFT JOIN PUNTO_VENTA PTVO ON PTVO.PUNTOVENTA_ID = B.PTOVTAVENTA_ID ");
|
||||
sql.append(" LEFT JOIN ALIAS_SERVICO S ON S.ORIGEN_ID = B.ORIGEN_ID ");
|
||||
sql.append(" AND S.DESTINO_ID = B.DESTINO_ID AND (S.CORRIDA_ID = B.CORRIDA_ID OR S.CORRIDA_ID IS NULL) ");
|
||||
sql.append(" AND S.RUTA_ID = B.RUTA_ID AND S.ACTIVO = 1 ");
|
||||
sql.append(" LEFT JOIN PARADA POS ON POS.PARADA_ID = S.ALIASORIGEN_ID ");
|
||||
sql.append(" LEFT JOIN CIUDAD COS ON COS.CIUDAD_ID = POS.CIUDAD_ID ");
|
||||
sql.append(" LEFT JOIN ESTADO EOS ON EOS.ESTADO_ID = COS.ESTADO_ID ");
|
||||
sql.append(" LEFT JOIN PARADA PDS ON PDS.PARADA_ID = S.ALIASDESTINO_ID ");
|
||||
sql.append(" LEFT JOIN CIUDAD CDS ON CDS.CIUDAD_ID = PDS.CIUDAD_ID ");
|
||||
sql.append(" LEFT JOIN ESTADO EDS ON EDS.ESTADO_ID = CDS.ESTADO_ID ");
|
||||
sql.append(" JOIN INSCRICAO_ESTADUAL IE ON E.EMPRESA_ID = IE.EMPRESA_ID ");
|
||||
sql.append(" AND IE.ESTADO_ID = COALESCE(EOS.ESTADO_ID, EST.ESTADO_ID) AND IE.ACTIVO = 1 ");
|
||||
sql.append(" JOIN EMPRESA_IMPOSTO EI ON EI.EMPRESA_ID = E.EMPRESA_ID ");
|
||||
sql.append(" AND EI.ESTADO_ID = COALESCE(EOS.ESTADO_ID, EST.ESTADO_ID) AND EI.ACTIVO = 1 ");
|
||||
sql.append(" LEFT JOIN AIDF AIDF ON AIDF.AIDF_ID = B.AIDF_ID AND B.TIPOVENTA_ID = 3 ");
|
||||
sql.append(" LEFT JOIN ESTADO ESAIDF ON ESAIDF.ESTADO_ID = AIDF.ESTADO_ID ");
|
||||
sql.append(" LEFT JOIN BOLETO BORI ON BORI.BOLETO_ID = B.BOLETOORIGINAL_ID ");
|
||||
sql.append(" WHERE B.MOTIVOCANCELACION_ID IN (31,32,10,37,99,36) ");
|
||||
sql.append(" AND B.INDSTATUSBOLETO = 'C' AND B.INDCANCELACION = 1 ");
|
||||
sql.append(" AND BORI.FECHORVENTA >= :DATE_INICIO ");
|
||||
sql.append(" AND BORI.FECHORVENTA <= :DATE_FIM ");
|
||||
sql.append(" AND B.FECHORVENTA >= :DATE_INICIO ");
|
||||
sql.append(" AND B.FECHORVENTA <= :DATE_FIM ");
|
||||
sql.append(ufs == null ? "" : " AND COALESCE(ESAIDF.ESTADO_ID, EOS.ESTADO_ID, EST.ESTADO_ID) IN ( " + ufs + " ) ");
|
||||
sql.append(pdvs == null ? "" : " AND PTVO.PUNTOVENTA_ID IN ( " + pdvs + " ) ");
|
||||
sql.append(tipoptovtaId == -1 ? "" : " AND PTVO.TIPOPTOVTA_ID = " + tipoptovtaId);
|
||||
sql.append(" AND E.EMPRESA_ID = :EMPRESA_ID ");
|
||||
sql.append(" AND B.CATEGORIA_ID NOT IN (SELECT VALORCONSTANTE FROM CONSTANTE WHERE NOMBCONSTANTE = 'GRATUIDADE_CRIANCA') ");
|
||||
sql.append(" AND B.NUM_BPE IS NULL ");
|
||||
sql.append(" ) cbl ");
|
||||
sql.append(" GROUP BY cbl.estadoId, cbl.puntoventaId, cbl.empresaId, cbl.codigo_dev, cbl.estadoOrigem_dev ");
|
||||
sql.append(" ) cbpr ");
|
||||
sql.append(" ON agrc.empresaId = cbpr.empresaId ");
|
||||
sql.append(" AND agrc.puntoventaId = cbpr.puntoventaId ");
|
||||
sql.append(" AND agrc.estadoId = cbpr.estadoId ");
|
||||
|
||||
|
||||
return sql.toString();
|
||||
}
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioFinanceiroSintetico" pageWidth="2140" pageHeight="595" orientation="Landscape" columnWidth="2140" leftMargin="0" rightMargin="0" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="1a307341-ad36-4306-8e8d-c8b55fb6bcc6">
|
||||
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioFinanceiroSintetico" pageWidth="2055" pageHeight="595" orientation="Landscape" columnWidth="2055" leftMargin="0" rightMargin="0" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="1a307341-ad36-4306-8e8d-c8b55fb6bcc6">
|
||||
<property name="ireport.zoom" value="1.4641000000000155"/>
|
||||
<property name="ireport.x" value="1512"/>
|
||||
<property name="ireport.x" value="2058"/>
|
||||
<property name="ireport.y" value="0"/>
|
||||
<parameter name="nombempresa" class="java.lang.String"/>
|
||||
<parameter name="inicio" class="java.util.Date"/>
|
||||
|
|
@ -396,7 +396,7 @@
|
|||
<textFieldExpression><![CDATA["Cartão Débito (-)"]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1976" y="84" width="82" height="25" backcolor="#FFFF00" uuid="88c99bfb-ea13-41ff-962b-6dd97af41b16"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="1976" y="84" width="79" height="25" backcolor="#FFFF00" uuid="88c99bfb-ea13-41ff-962b-6dd97af41b16"/>
|
||||
<box>
|
||||
<topPen lineWidth="0.25" lineStyle="Dashed"/>
|
||||
<bottomPen lineWidth="0.0" lineStyle="Dashed"/>
|
||||
|
|
@ -406,17 +406,6 @@
|
|||
</textElement>
|
||||
<textFieldExpression><![CDATA["Boleto (-)"]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="2058" y="84" width="82" height="25" backcolor="#FFFF00" uuid="fc2efc7c-e18e-4309-b0d1-a586e1255b4f"/>
|
||||
<box>
|
||||
<topPen lineWidth="0.25" lineStyle="Dashed"/>
|
||||
<rightPen lineWidth="0.25" lineStyle="Dashed"/>
|
||||
</box>
|
||||
<textElement textAlignment="Center" markup="none">
|
||||
<font size="7" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Total Detalhamento"]]></textFieldExpression>
|
||||
</textField>
|
||||
<staticText>
|
||||
<reportElement x="86" y="63" width="328" height="20" uuid="75726801-8433-4d31-8712-1cd6364e6c68"/>
|
||||
<box>
|
||||
|
|
@ -486,7 +475,7 @@
|
|||
<text><![CDATA[Receita Liquida]]></text>
|
||||
</staticText>
|
||||
<staticText>
|
||||
<reportElement x="1566" y="63" width="574" height="20" uuid="fd4acb36-3047-4fbf-b292-4cd5048ddbad"/>
|
||||
<reportElement x="1566" y="64" width="489" height="20" uuid="fd4acb36-3047-4fbf-b292-4cd5048ddbad"/>
|
||||
<box>
|
||||
<topPen lineWidth="1.0"/>
|
||||
</box>
|
||||
|
|
@ -546,25 +535,25 @@
|
|||
<textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" evaluationTime="Report">
|
||||
<reportElement x="2110" y="20" width="22" height="20" uuid="1fac34da-fee2-40c5-a373-ba0e09ffaf2d"/>
|
||||
<reportElement x="2033" y="20" width="22" height="20" uuid="1fac34da-fee2-40c5-a373-ba0e09ffaf2d"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement x="2034" y="20" width="42" height="20" uuid="4540849f-7bb1-42d6-aa8b-f0024986f3d7"/>
|
||||
<reportElement x="1957" y="20" width="42" height="20" uuid="4540849f-7bb1-42d6-aa8b-f0024986f3d7"/>
|
||||
<textFieldExpression><![CDATA["Página"]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement x="2078" y="20" width="32" height="20" uuid="b847ea58-a801-4106-9f23-597ff9c0169d"/>
|
||||
<reportElement x="2001" y="20" width="32" height="20" uuid="b847ea58-a801-4106-9f23-597ff9c0169d"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement x="1978" y="0" width="56" height="20" uuid="3b59c734-1e23-48c1-831c-ffb0f5f6c8de"/>
|
||||
<reportElement x="1901" y="0" width="56" height="20" uuid="3b59c734-1e23-48c1-831c-ffb0f5f6c8de"/>
|
||||
<textFieldExpression><![CDATA["Data/Hora"]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy HH:mm">
|
||||
<reportElement x="2034" y="0" width="98" height="20" uuid="916bc4cb-73e2-4c18-8d80-ab88380ecde5"/>
|
||||
<reportElement x="1957" y="0" width="98" height="20" uuid="916bc4cb-73e2-4c18-8d80-ab88380ecde5"/>
|
||||
<textElement textAlignment="Left"/>
|
||||
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
|
||||
</textField>
|
||||
|
|
@ -812,7 +801,7 @@
|
|||
<textFieldExpression><![CDATA[$F{cartaoDebito}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="1976" y="0" width="82" height="15" uuid="4b5fc7bc-a2bc-47ae-8baa-3f5a1e4f45f2"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="1976" y="0" width="79" height="15" uuid="4b5fc7bc-a2bc-47ae-8baa-3f5a1e4f45f2"/>
|
||||
<box>
|
||||
<topPen lineWidth="0.25" lineStyle="Dashed"/>
|
||||
</box>
|
||||
|
|
@ -821,17 +810,6 @@
|
|||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{boletoBancario}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="2058" y="0" width="82" height="15" backcolor="#FFFF00" uuid="cf19637a-d07d-46a4-8510-b4e7fd6b5e23"/>
|
||||
<box>
|
||||
<topPen lineWidth="0.25" lineStyle="Dashed"/>
|
||||
<rightPen lineWidth="0.25" lineStyle="Dashed"/>
|
||||
</box>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="7"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{totalDetalhamento}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="168" y="0" width="82" height="15" uuid="6bd836cc-534f-4d65-8bff-ffc318adbc2f"/>
|
||||
<box>
|
||||
|
|
@ -888,7 +866,7 @@
|
|||
<columnFooter>
|
||||
<band height="15" splitType="Stretch">
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="1976" y="0" width="82" height="15" isPrintWhenDetailOverflows="true" uuid="3bb307d1-503a-41b4-96a6-9185c16534fb"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="1976" y="0" width="79" height="15" isPrintWhenDetailOverflows="true" uuid="3bb307d1-503a-41b4-96a6-9185c16534fb"/>
|
||||
<box>
|
||||
<topPen lineWidth="0.25" lineStyle="Dashed"/>
|
||||
</box>
|
||||
|
|
@ -1058,16 +1036,6 @@
|
|||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{somaGapVenda}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="2058" y="0" width="82" height="15" isPrintWhenDetailOverflows="true" backcolor="#FFFF00" uuid="8e8a8960-6e08-4ebb-a1fc-61af0f98b916"/>
|
||||
<box>
|
||||
<topPen lineWidth="0.25" lineStyle="Dashed"/>
|
||||
</box>
|
||||
<textElement textAlignment="Right">
|
||||
<font size="7" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{somaTotalDetalhamento}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="742" y="0" width="82" height="15" isPrintWhenDetailOverflows="true" backcolor="#FFFF00" uuid="869f51ff-5a72-4ef9-9add-bca1e85b02e4"/>
|
||||
<box>
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@ public class BusquedaRelatorioFinanceiroController extends MyGenericForwardCompo
|
|||
args.put("relatorio", relatorio);
|
||||
|
||||
openWindow("/component/reportView.zul",
|
||||
Labels.getLabel("indexController.mnRelatorioRDI.label"), args, MODAL);
|
||||
Labels.getLabel("indexController.mnRelatoriosFinanceiros.label"), args, MODAL);
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error("", e);
|
||||
|
|
|
|||
Loading…
Reference in New Issue