From 09a5421b5599a8583217555247cac6ba36b91b02 Mon Sep 17 00:00:00 2001 From: julio Date: Mon, 11 Sep 2017 18:32:10 +0000 Subject: [PATCH] fixes bug #9608 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@73667 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../dao/hibernate/FiscalHibernateDAO.java | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index eae765c52..6f06d23e0 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -3971,10 +3971,10 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" coalesce(b.importeoutros, 0) as outros, "); sql.append(" coalesce(r2.numserie20, imp.numserie20) as ecf, "); sql.append(" to_char(b.feccreacion, 'YYYYMMDD') as datamov, "); - sql.append(" case when r2.numserie20 is null then '1' else r2.coo end as coo, "); + sql.append(" case when r2.numserie20 is null then '000001' else r2.coo end as coo, "); sql.append(" '000000' as ccf, "); sql.append(" null as totalFiscal, "); - sql.append(" case when r2.numserie20 is null then '1' else r2.coo end as cooredz, "); + sql.append(" case when r2.numserie20 is null then '000001' else r2.coo end as cooredz, "); sql.append(" epv.cveestado as estadoImpressora "); sql.append("from caja b "); sql.append(" join fiscal_impressora imp on imp.numserie = b.serieimpfiscal "); @@ -4012,6 +4012,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" left join aidf a on a.aidf_id = b.aidf_id "); sql.append("where b.tipoventa_id <> 3 "); sql.append(" and b.rmd_id is null "); + sql.append(" and b.preciopagado > 0 "); sql.append(" and b.serieimpfiscal is not null and r4.caja_id is null "); sql.append(" and ((b.indreimpresion = 0 and b.motivocancelacion_id is null and b.numfoliosistema is not null) "); sql.append(" or (b.indstatusboleto = 'E' and b.indreimpresion = 1)) "); @@ -4120,10 +4121,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO ufs = ufs + ",'" + estado.getCveestado() + "'"; } - List list = montaRelatorioRDI(connection, inicio, fim, empresaId, ufs, false); - - list.addAll(montaRelatorioRDI(connection, inicio, fim, empresaId, ufs, true)); - + List list = montaRelatorioRDI(connection, inicio, fim, empresaId, ufs); List rdis = calcularRelatorioRDI(list, isReceitaTerceiros); return agrupaRdi(rdis); } @@ -4300,19 +4298,17 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO return total; } - private List montaRelatorioRDI(Connection connection, Date inicio, Date fim, Integer empresaId, - String ufs, boolean isCancelados) { + private List montaRelatorioRDI(Connection connection, Date inicio, Date fim, Integer empresaId, String ufs) { List list = new ArrayList(); try { - String sql = null; - if (isCancelados) - sql = sqlRelatorioRDICancelados(ufs); - else - sql = sqlRelatorioRDIVendidos(ufs); + StringBuilder sql = new StringBuilder(); + sql.append(sqlRelatorioRDIVendidos(ufs)); + sql.append(" union "); + sql.append(sqlRelatorioRDICancelados(ufs)); - NamedParameterStatement ps = new NamedParameterStatement(connection, sql); + NamedParameterStatement ps = new NamedParameterStatement(connection, sql.toString()); ps.setLong("EMPRESA_ID", Long.valueOf(empresaId)); ps.setTimestamp("DATE_INICIO", new java.sql.Timestamp(DateUtil.inicioFecha(inicio).getTime())); @@ -4426,10 +4422,11 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" and ei.estado_id = coalesce(eos.estado_id, eo.estado_id) and ei.activo = 1 "); sql.append("where ((b.serieimpfiscal is not null and b.tipoventa_id <> 3) or b.tipoventa_id = 3 ) "); sql.append(" and b.indcancelacion = 0 "); + sql.append(" and b.motivocancelacion_id is null "); + sql.append(" and b.numseriepreimpresa is not null "); sql.append(" and e.empresa_id = :EMPRESA_ID "); sql.append(" and b.feccreacion between :DATE_INICIO and :DATE_FIM "); sql.append(" and coalesce(eos.cveestado, eo.cveestado) in ( ").append(ufs).append(" ) "); - sql.append("order by estadoId, isInterEstadual "); return sql.toString(); }