From 928ce38901e7b7341be69f469a88ba4acf584ae3 Mon Sep 17 00:00:00 2001 From: walace Date: Tue, 16 Mar 2021 09:56:40 +0000 Subject: [PATCH] fixes bug#21486 qua: dev: Houve um problema na worskpace da ADM, ocorreu um pequeno atraso na entrega do mantis. git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@105780 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioResumoVendaOrgaoConcedente.java | 39 ++++++++-------- ...RelatorioResumoVendaOrgaoConcedente.jasper | Bin 47417 -> 45072 bytes .../RelatorioResumoVendaOrgaoConcedente.jrxml | 42 ++++-------------- 3 files changed, 29 insertions(+), 52 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java index f60c0226c..e3467476a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoVendaOrgaoConcedente.java @@ -51,34 +51,36 @@ public class RelatorioResumoVendaOrgaoConcedente extends Relatorio { StringBuilder sb = new StringBuilder(); sb.append("SELECT "); - sb.append(" CAJA.PONTOVENTA,"); - sb.append(" COALESCE(SUM(CASE WHEN CAJA.ORGAOCONCEDENTEID IN(3) THEN CAJA.IMPORTE END), 0) AS ANTT,"); - sb.append(" COALESCE(SUM(CASE WHEN CAJA.ORGAOCONCEDENTEID IN(27) THEN CAJA.IMPORTE END), 0) AS AGERBA, "); - sb.append(" COALESCE(SUM(CASE WHEN CAJA.FORMAPAGO IN(2) THEN CAJA.IMPORTE END), 0) AS CARTAO,"); - sb.append(" COALESCE(SUM(CASE WHEN CAJA.ORGAOCONCEDENTEID IN(27, 3) THEN CAJA.IMPORTE END), 0) AS VALORBASECALCULO, "); - sb.append(" COALESCE(SUM(CASE WHEN CAJA.INDTRIBTARIFA IN(1) THEN CAJA.IMPORTE END), 0) AS ISENTO, "); - sb.append(" CAJA.NOMECLASSE AS NOMECLASSE, "); - sb.append(" CAJA.NOMEESTADO AS NOMEESTADO "); + sb.append(" BOLETO.PONTOVENTA,"); + sb.append(" COALESCE(SUM(CASE WHEN BOLETO.ORGAOCONCEDENTEID IN(3) THEN BOLETO.IMPORTE END), 0) AS ANTT,"); + sb.append(" COALESCE(SUM(CASE WHEN BOLETO.ORGAOCONCEDENTEID IN(27) THEN BOLETO.IMPORTE END), 0) AS AGERBA, "); + sb.append(" COALESCE(SUM(CASE WHEN BOLETO.FORMAPAGO IN(2) THEN BOLETO.IMPORTE END), 0) AS CARTAO,"); + sb.append(" COALESCE(SUM(CASE WHEN BOLETO.ORGAOCONCEDENTEID IN(27, 3) THEN BOLETO.IMPORTE END), 0) AS VALORBASECALCULO, "); + sb.append(" COALESCE(SUM(CASE WHEN BOLETO.INDTRIBTARIFA IN(1) THEN BOLETO.IMPORTE END), 0) AS ISENTO, "); + sb.append(" BOLETO.NOMEESTADO AS NOMEESTADO "); sb.append("FROM "); sb.append(" (SELECT PV.NOMBPUNTOVENTA AS PONTOVENTA,"); sb.append(" OC.DESCORGAO AS ORGAO,"); sb.append(" OC.ORGAOCONCEDENTE_ID AS ORGAOCONCEDENTEID,"); - sb.append(" CASE WHEN C.MOTIVOCANCELACION_ID IS NULL THEN CFP.IMPORTE ELSE 0 END AS IMPORTE, "); + sb.append(" CASE WHEN C.MOTIVOCANCELACION_ID IS NULL AND C.INDSTATUSBOLETO not IN ('T') THEN CFP.IMPORTE ELSE 0 END AS IMPORTE, "); sb.append(" FP.FORMAPAGO_ID AS FORMAPAGO,"); sb.append(" EI.porcredbaseicms,"); - sb.append(" EST.NOMBESTADO AS NOMEESTADO, "); + sb.append(" EST_PUNTOVENTA.NOMBESTADO AS NOMEESTADO, "); sb.append(" CS.DESCCLASE AS NOMECLASSE, "); sb.append(" R.INDTRIBTARIFA AS INDTRIBTARIFA "); sb.append(" "); - sb.append(" FROM CAJA C"); - sb.append(" INNER JOIN CAJA_FORMAPAGO CFP ON (C.CAJA_ID = CFP.CAJA_ID AND CFP.ACTIVO = 1)"); + sb.append(" FROM BOLETO C"); + sb.append(" INNER JOIN BOLETO_FORMAPAGO CFP ON (C.BOLETO_ID = CFP.BOLETO_ID AND CFP.ACTIVO = 1)"); sb.append(" INNER JOIN FORMA_PAGO FP ON (FP.FORMAPAGO_ID = CFP.FORMAPAGO_ID)"); sb.append(" INNER JOIN PUNTO_VENTA PV ON C.PUNTOVENTA_ID = PV.PUNTOVENTA_ID and pv.activo = 1"); sb.append(" INNER JOIN RUTA R ON (C.RUTA_ID = R.RUTA_ID)"); sb.append(" INNER JOIN ORGAO_CONCEDENTE OC ON (R.ORGAOCONCEDENTE_ID = OC.ORGAOCONCEDENTE_ID)"); sb.append(" INNER JOIN PARADA ORI ON C.ORIGEN_ID = ORI.PARADA_ID"); - sb.append(" INNER JOIN CIUDAD CO ON CO.CIUDAD_ID = ORI.CIUDAD_ID"); + sb.append(" INNER JOIN CIUDAD CO ON CO.CIUDAD_ID = ORI.CIUDAD_ID"); sb.append(" INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID and EST.activo = 1"); + sb.append(" INNER JOIN PARADA ORI_PUNTOVENTA ON PV.PARADA_ID = ORI_PUNTOVENTA.PARADA_ID"); + sb.append(" INNER JOIN CIUDAD CO_PUNTOVENTA ON CO_PUNTOVENTA.CIUDAD_ID = ORI_PUNTOVENTA.CIUDAD_ID"); + sb.append(" INNER JOIN ESTADO EST_PUNTOVENTA ON EST_PUNTOVENTA.ESTADO_ID = CO_PUNTOVENTA.ESTADO_ID and EST_PUNTOVENTA.activo = 1"); sb.append(" INNER JOIN empresa_imposto ei on ei.empresa_id = c.empresacorrida_id and ei.estado_id = EST.ESTADO_ID and ei.activo = 1"); sb.append(" INNER JOIN CLASE_SERVICIO CS ON (C.CLASESERVICIO_ID = CS.CLASESERVICIO_ID ) "); sb.append(" WHERE C.ACTIVO = 1"); @@ -99,9 +101,9 @@ public class RelatorioResumoVendaOrgaoConcedente extends Relatorio { if (parametros.get("CLASESERVICIO_ID") != null && !parametros.get("CLASESERVICIO_ID").toString().equals("-1")) { sb.append(" AND C.CLASESERVICIO_ID = " + parametros.get("CLASESERVICIO_ID").toString() + " "); } - sb.append(" ) CAJA "); - sb.append(" GROUP BY CAJA.PONTOVENTA, CAJA.NOMEESTADO, CAJA.NOMECLASSE "); - sb.append(" ORDER BY CAJA.NOMEESTADO, CAJA.PONTOVENTA, CAJA.NOMECLASSE "); + sb.append(" ) BOLETO "); + sb.append(" GROUP BY BOLETO.PONTOVENTA, BOLETO.NOMEESTADO "); + sb.append(" ORDER BY BOLETO.NOMEESTADO, BOLETO.PONTOVENTA "); NamedParameterStatement stmt = new NamedParameterStatement(conexao, sb.toString()); @@ -128,11 +130,12 @@ public class RelatorioResumoVendaOrgaoConcedente extends Relatorio { bean.setAGERBA(getValor("AGERBA", rset)); bean.setCartao(getValor("CARTAO", rset)); aVISTA = MoneyHelper.somar(bean.getANTT(), bean.getAGERBA()).subtract(bean.getCartao()); + if(MoneyHelper.isIgual(aVISTA, BigDecimal.ZERO)) { + continue; + } bean.setAVista(aVISTA); - bean.setIsento(getValor("ISENTO", rset)); bean.setValorBaseCalculo(getValor("VALORBASECALCULO", rset)); bean.setNomeEstado(StringUtils.defaultString(rset.getString("NOMEESTADO"))); - bean.setNomeClasse(StringUtils.defaultString(rset.getString("NOMECLASSE"))); lsDadosRelatorio.add(bean); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoVendaOrgaoConcedente.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoVendaOrgaoConcedente.jasper index 9f06ebfc984effd4b5b0e94a2c7f16e15f0edb8b..56a151beccda8f75399632b3d56582f26c5508be 100644 GIT binary patch delta 11136 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 GkNzLfjV%}e diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoVendaOrgaoConcedente.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoVendaOrgaoConcedente.jrxml index a72dffb92..29c901e88 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoVendaOrgaoConcedente.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoVendaOrgaoConcedente.jrxml @@ -1,6 +1,6 @@ - +