From c499d54b8ca50fbde7c2b1f4cb29cf8721726929 Mon Sep 17 00:00:00 2001 From: "alexandre.lima" Date: Wed, 28 Feb 2018 19:58:38 +0000 Subject: [PATCH] bug#10516 dev:Leo qua:Renato git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@79272 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioBilhetesVendidosNovoLayout.java | 29 ++++----- ...RelatorioBilhetesVendidosNovoLayout.jasper | Bin 40740 -> 40735 bytes .../RelatorioBilhetesVendidosNovoLayout.jrxml | 60 +++++++++--------- ...latorioBilhetesVendidosNovoLayoutBean.java | 6 +- 4 files changed, 46 insertions(+), 49 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java index 323351e7e..2b5fb111c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java @@ -17,7 +17,6 @@ import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.IndStatusBoleto; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioBilhetesVendidosNovoLayoutBean; -import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioVendasPTABean; import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; @@ -47,26 +46,25 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio { StringBuilder sql = new StringBuilder(); - sql.append("SELECT est.cveestado as cveestado, ae.decespecie as especie, "); - sql.append(" a.acfiscal as numaidf,"); - sql.append(" c.fechorventa as datavenda,"); - sql.append(" a.forminicial as forminicial,"); - sql.append(" a.formfinal as formfinal,"); + sql.append("SELECT distinct est.cveestado as cveestado,"); + sql.append(" ae.decespecie as especie, "); + sql.append(" to_char(c.fechorventa, 'dd/mm/yyyy hh24:mi:ss') as datavenda,"); + sql.append(" (select min(NUMFOLIOSISTEMA) as maximo from boleto e where e.NUMOPERACION = c.NUMOPERACION) as forminicial,"); + sql.append(" (select max(NUMFOLIOSISTEMA) as maximo from boleto e where e.NUMOPERACION = c.NUMOPERACION) as formfinal,"); sql.append(" a.serie AS serie,"); - sql.append(" a.subserie as subserie,"); sql.append(" est.icms AS valoraliquiotaicms,"); sql.append(" c.preciopagado as valorcontabil,"); sql.append(" c.preciopagado - (c.preciopagado * coalesce(ei.porcredbaseicms / 100,0))AS valorbasecalculo, "); sql.append(" (c.preciopagado - (c.preciopagado * coalesce(ei.porcredbaseicms / 100,0)) * est.icms) / 100 AS valoricms, "); sql.append(" c.INDSTATUSBOLETO statuspassagem "); sql.append("FROM boleto 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) "); + 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) "); sql.append("join empresa e ON e.empresa_id = c.empresacorrida_id "); sql.append("join parada po ON po.parada_id = c.origen_id "); sql.append("join ciudad co ON co.ciudad_id = po.ciudad_id "); sql.append("join estado est ON est.estado_id = co.estado_id "); - sql.append("INNER join empresa_imposto ei ON ei.empresa_id = e.empresa_id "); + sql.append("join empresa_imposto ei ON ei.empresa_id = e.empresa_id "); sql.append("JOIN PUNTO_VENTA pv on c.PUNTOVENTA_ID = pv.PUNTOVENTA_ID "); sql.append("AND ei.estado_id = est.estado_id "); sql.append(" where "); @@ -84,12 +82,13 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio { if (parametros.get("STATUS").toString().contains("V") && parametros.get("STATUS").toString().contains("C")) { sql.append(" AND ((c.INDSTATUSBOLETO = 'C' AND c.MOTIVOCANCELACION_ID IS NOT NULL) OR (c.INDSTATUSBOLETO = 'V' AND c.MOTIVOCANCELACION_ID IS NULL)) "); } else if (parametros.get("STATUS").toString().contains("C")) { - sql.append(" AND c.INDSTATUSBOLETO = 'C' AND c.MOTIVOCANCELACION_ID IS NOT NULL"); + sql.append(" AND c.INDSTATUSBOLETO = 'C' AND c.MOTIVOCANCELACION_ID IS NOT NULL "); } else if (parametros.get("STATUS").toString().contains("V")) { - sql.append(" AND c.INDSTATUSBOLETO = 'V' AND c.MOTIVOCANCELACION_ID IS NULL"); + sql.append(" AND c.INDSTATUSBOLETO = 'V' AND c.MOTIVOCANCELACION_ID IS NULL "); } } - + sql.append(" ORDER BY cveestado, datavenda "); + NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString()); stmt.setInt("EMPRESA_ID", Integer.valueOf(parametros.get("EMPRESA_ID").toString())); @@ -118,12 +117,10 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio { dataResult.put("statuspassagem", IndStatusBoleto.valueOf(rset.getString("statuspassagem")).getValue()); } - bean.setNumAIDF((String) (rset.getObject("numaidf") == null ? "" : rset.getObject("numaidf"))); - bean.setDataVenda((Date) (rset.getObject("datavenda") == null ? "" : rset.getObject("datavenda"))); + bean.setDataVenda(rset.getString("datavenda") == null ? "" : rset.getString("datavenda")); bean.setFormInicial((String) (rset.getObject("formInicial") == null ? "" : rset.getObject("formInicial"))); bean.setFormFinal((String) (rset.getObject("formfinal") == null ? "" : rset.getObject("formfinal"))); bean.setSerie((String) (rset.getObject("serie") == null ? "" : rset.getObject("serie"))); - bean.setSubSerie((String) (rset.getObject("subserie") == null ? "" : rset.getObject("subserie"))); bean.setValorContabil((BigDecimal) (rset.getObject("valorcontabil") == null ? "" : rset.getObject("valorcontabil"))); bean.setValorBaseCalculo((BigDecimal) (rset.getObject("valorbasecalculo") == null ? "" : rset.getObject("valorbasecalculo"))); bean.setValorAliquiotaICMS((BigDecimal) (rset.getObject("valoraliquiotaicms") == null ? "" : rset.getObject("valoraliquiotaicms"))); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jasper index a6fe43cda94361ddc30b03211d426c3b193b0d82..c762154eb22f7efd4ea6a3fbb7a400192e79b23d 100644 GIT binary patch delta 3452 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 d@ - - + + @@ -37,7 +37,7 @@ - + @@ -152,42 +152,42 @@ - + - + - + - + - + - + @@ -201,35 +201,35 @@ - + - + - + - + - + @@ -240,49 +240,49 @@ - + - + - + - + - + - + - + @@ -295,29 +295,29 @@ - - + + - + - + - + @@ -326,19 +326,19 @@ - + - + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioBilhetesVendidosNovoLayoutBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioBilhetesVendidosNovoLayoutBean.java index 9a38a2dca..718eb8702 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioBilhetesVendidosNovoLayoutBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioBilhetesVendidosNovoLayoutBean.java @@ -19,7 +19,7 @@ public class RelatorioBilhetesVendidosNovoLayoutBean { private Integer estadoId; private String statusPassagem; private String bilhete; - private Date dataVenda; + private String dataVenda; private String codFiscal; public String getCodFiscal() { @@ -142,11 +142,11 @@ public class RelatorioBilhetesVendidosNovoLayoutBean { this.bilhete = bilhete; } - public Date getDataVenda() { + public String getDataVenda() { return dataVenda; } - public void setDataVenda(Date dataVenda) { + public void setDataVenda(String dataVenda) { this.dataVenda = dataVenda; }