diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java index 51cf32c78..e5045ad6b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java @@ -80,7 +80,7 @@ public class RelatorioVendasCartoes extends Relatorio { RelatorioVendasCartoesBean bean = new RelatorioVendasCartoesBean(); - bean.setDataVenda(rset.getString("dataVenda") != null ? DateUtil.getDateFromString(rset.getString("dataVenda"), "ddMMyy") : null); + bean.setDataVenda(rset.getDate("dataVenda")); bean.setDataOperacao(rset.getString("dataOperacao") != null ? DateUtil.getDateFromString(rset.getString("dataOperacao"), "ddMMyy") : null); bean.setDescPagamento(rset.getString("descPagamento") != null ? rset.getString("descPagamento") : null); bean.setValor(rset.getBigDecimal("valor") != null ? rset.getBigDecimal("valor") : null); @@ -123,10 +123,10 @@ public class RelatorioVendasCartoes extends Relatorio { StringBuilder sb = new StringBuilder(); sb.append("SELECT caja.descpago as descPagamento,"); - sb.append(" to_char(caja.dataoperacao, 'ddMMyy') as dataOperacao,"); + sb.append(" to_char(caja.dataoperacao, 'ddMMyyyy') as dataOperacao,"); sb.append(" caja.autorizacao as autorizacao,"); - sb.append(" coalesce(caja.qtdparcelas, 1) as qtdParcelas ,"); - sb.append(" to_char(caja.datavenda, 'ddMMyy') as dataVenda, "); + sb.append(" coalesce(caja.qtdparcelas, 1) as qtdParcelas ,"); + sb.append(" trunc(caja.datavenda) as dataVenda, "); sb.append(" sum(caja.preco) as valor "); sb.append("FROM"); sb.append(" (SELECT fp.descpago AS descpago,"); @@ -134,7 +134,7 @@ public class RelatorioVendasCartoes extends Relatorio { sb.append(" ct.numautorizacion AS autorizacao,"); sb.append(" ct.cantparcelas AS qtdparcelas,"); sb.append(" c.fechorventa AS datavenda,"); - sb.append(" cfp.importe AS preco"); + sb.append(" case when c.motivocancelacion_id is null then cfp.importe else cfp.importe * -1 end AS preco"); 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(" INNER JOIN marca ma on ma.marca_id = c.marca_id "); @@ -179,11 +179,11 @@ public class RelatorioVendasCartoes extends Relatorio { sb.append(" AND fp.formapago_id IN(2,3)"); sb.append(" AND c.activo = 1) caja "); sb.append("GROUP BY caja.descpago,"); - sb.append(" to_char(caja.dataoperacao, 'ddMMyy'),"); + sb.append(" to_char(caja.dataoperacao, 'ddMMyyyy'),"); sb.append(" caja.autorizacao,"); sb.append(" caja.qtdparcelas,"); - sb.append(" to_char(caja.datavenda, 'ddMMyy') "); - sb.append("ORDER BY caja.descpago, to_char(caja.datavenda, 'ddMMyy')"); + sb.append(" trunc(caja.datavenda) "); + sb.append("ORDER BY caja.descpago, trunc(caja.datavenda), caja.autorizacao"); return sb.toString(); }