diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index 160e64184..2d84ed478 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -4138,9 +4138,6 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO ps.setTimestamp("DATE_INICIO", new java.sql.Timestamp(DateUtil.inicioFecha(inicio).getTime())); ps.setTimestamp("DATE_FIM", new java.sql.Timestamp(DateUtil.fimFecha(fim).getTime())); - ps.setString("DATE_INICIO_STR", DateUtil.getStringDate(inicio, DATE_FORMAT_FISCAL)); - ps.setString("DATE_FIM_STR", DateUtil.getStringDate(fim, DATE_FORMAT_FISCAL)); - ResultSet rs = ps.executeQuery(); while (rs.next()) { @@ -4263,9 +4260,9 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" and c.serieimpfiscal is not null "); sql.append(" and ((c.indreimpresion = 0 and c.motivocancelacion_id is null and c.numfoliosistema is not null) or (c.indstatusboleto = 'E' and c.indreimpresion = 1)) "); sql.append(" and (coalesce(c.preciopagado,0) + coalesce(c.importetaxaembarque,0) + coalesce(c.importeseguro,0) + coalesce(c.importepedagio,0) + coalesce(c.importeoutros,0)) > 0 "); - sql.append(" and c.feccreacion >= :DATE_INICIO and :DATE_FIM "); + sql.append(" and c.feccreacion >= :DATE_INICIO and c.feccreacion <= :DATE_FIM "); sql.append(" and c.empresacorrida_id = :EMPRESA_ID "); - sql.append(" and ((case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) in ( ").append(ufs).append(" ) "); + sql.append(" and ((case when s.aliasorigen_id is null then eo.cveestado else eos.cveestado end) in ( ").append(ufs).append(" )) "); sql.append(" "); sql.append("union "); sql.append(" "); @@ -4277,7 +4274,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" coalesce(eos.estado_id, eo.estado_id) as estadoId, "); sql.append(" ei.icms as icmsInterestadual, "); sql.append(" ei.icmsim as icmsIntermunicipal, "); - sql.append(" coalesce(eos.cveestado, eo.cveestado) as estadoOrigem, "); + sql.append(" coalesce(ae.cveestado, eos.cveestado) as estadoOrigem, "); sql.append(" coalesce(eds.cveestado, ed.cveestado) as estadoDestino, "); sql.append(" coalesce(cos.codibge, co.codibge) as municipioOrigem, "); sql.append(" case when((coalesce(eos.cveestado, eo.cveestado)) = "); @@ -4335,7 +4332,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" c.tipoventa_id = 3 "); sql.append(" and c.indstatusboleto = 'V' and c.indreimpresion = 0 "); sql.append(" and c.empresacorrida_id = :EMPRESA_ID "); - sql.append(" and c.feccreacion >= DATE_INICIO and c.feccreacion <= :DATE_FIM "); + sql.append(" and c.feccreacion >= :DATE_INICIO and c.feccreacion <= :DATE_FIM "); sql.append(" and coalesce(ae.cveestado, eos.cveestado) in ( ").append(ufs).append(" ) "); return sql.toString(); } @@ -4351,7 +4348,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" coalesce(eos.estado_id, eo.estado_id) as estadoId, "); sql.append(" coalesce(eis.icms, ei.icms) as icmsInterestadual, "); sql.append(" coalesce(eis.icmsim, ei.icmsim) as icmsIntermunicipal, "); - sql.append(" coalesce(eos.cveestado, eo.cveestado) as estadoOrigem, "); + sql.append(" coalesce(esaidf.cveestado, eos.cveestado, eo.cveestado) as estadoOrigem, "); sql.append(" coalesce(eds.cveestado, ed.cveestado) as estadoDestino, "); sql.append(" coalesce(cos.codibge, co.codibge) as municipioOrigem, "); sql.append(" case when((coalesce(eos.cveestado, eo.cveestado)) = "); @@ -4415,7 +4412,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" and b.motivocancelacion_id in (31,32,10,37,99,36) "); sql.append(" and b.feccreacion between :DATE_INICIO and :DATE_FIM "); sql.append(" and nvl(case when s.aliasorigen_id is null then ei.activo else eis.activo end, 0) = 1 "); - sql.append(" and coalesce(esaidf.estado_id, eos.estado_id, est.estado_id) in ( ").append(ufs).append(" ) "); + sql.append(" and coalesce(esaidf.cveestado, eos.cveestado, eo.cveestado) in ( ").append(ufs).append(" ) "); sql.append("order by estadoId, isInterEstadual ");