From 6d79a7f97225415c14a4afb12d5370a068fa4dd2 Mon Sep 17 00:00:00 2001 From: walace Date: Thu, 19 Apr 2018 20:33:21 +0000 Subject: [PATCH] =?UTF-8?q?Conforme=20solicita=C3=A7=C3=A3o=20do=20cliente?= =?UTF-8?q?,=20foi=20retirado=20o=20agrupamento=20dos=20bilhetes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes bug#10842 dev:julio qua:renato git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@81196 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioBilhetesVendidosNovoLayout.java | 29 +++++-------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java index ad7dc867d..aced64e3c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java @@ -53,29 +53,23 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio { sql.append(" t.forminicial,"); sql.append(" t.formfinal,"); sql.append(" t.serie,"); - sql.append(" sum(t.preciopagado) AS valorcontabil,"); - sql.append(" sum(t.preciopagado - (t.preciopagado * coalesce(t.porcredbaseicms / 100,0)))AS valorbasecalculo,"); + sql.append(" t.preciopagado AS valorcontabil,"); + sql.append(" t.preciopagado - (t.preciopagado * coalesce(t.porcredbaseicms / 100,0))AS valorbasecalculo,"); sql.append(" t.valoraliquiotaicms,"); - sql.append(" sum( ((t.preciopagado - (t.preciopagado * coalesce(t.porcredbaseicms / 100,0))) * t.icms) / 100) AS valoricms "); + sql.append(" ((t.preciopagado - (t.preciopagado * coalesce(t.porcredbaseicms / 100,0))) * t.icms) / 100 AS valoricms "); sql.append("from"); sql.append(" (select distinct est.icms,"); + sql.append(" c.preciopagado,"); sql.append(" est.cveestado as cveestado,"); sql.append(" ei.porcredbaseicms,"); sql.append(" c.fechorventa as datavenda,"); sql.append(" c.indstatusboleto statuspassagem,"); sql.append(" ae.decespecie as especie,"); - sql.append(" (select min(numfoliosistema) as maximo"); - sql.append(" from boleto e"); - sql.append(" where e.numoperacion = c.numoperacion) as forminicial,"); - sql.append(" (select max(numfoliosistema) as maximo"); - sql.append(" from boleto e"); - sql.append(" where e.numoperacion = c.numoperacion) as formfinal,"); + sql.append(" c.numfoliosistema as forminicial,"); + sql.append(" c.numfoliosistema as formfinal,"); sql.append(" c.numseriepreimpresa as serie,"); sql.append(" c.preciopagado as valorcontabil,"); - sql.append(" est.icms as valoraliquiotaicms,"); - sql.append(" (select sum(c.preciopagado) as preciopagado"); - sql.append(" from caja e"); - sql.append(" where e.numoperacion = c.numoperacion and e.fechorventa between :DATA_INICIAL AND :DATA_FINAL ) as preciopagado"); + sql.append(" est.icms as valoraliquiotaicms"); sql.append(" from caja c"); sql.append(" left join aidf a on a.aidf_id = c.aidf_id"); sql.append(" left join aidf_especie ae on (a.aidfesp_id = ae.aidfesp_id)"); @@ -107,15 +101,6 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio { } } sql.append(") t "); - sql.append("group by "); - sql.append("t.cveestado, "); - sql.append("to_char(t.dataVenda, 'dd/MM/yy'), "); - sql.append("t.statuspassagem, "); - sql.append("t.especie, "); - sql.append("t.forminicial, "); - sql.append("t.formfinal, "); - sql.append("t.serie, "); - sql.append("t.valoraliquiotaicms "); sql.append("order by t.cveestado, to_char(t.dataVenda, 'dd/MM/yy') "); NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString());