From a95664ae4f9c4fc2563b18464e96e2c897c39257 Mon Sep 17 00:00:00 2001 From: alberto Date: Tue, 9 May 2017 17:37:35 +0000 Subject: [PATCH] =?UTF-8?q?Exporta=C3=A7=C3=A3o=20Fiscal=20:=20ECF=20e=20R?= =?UTF-8?q?MD=20(issue=208120)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@68642 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../dao/hibernate/FiscalHibernateDAO.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index fc1191545..d3b783e27 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -52,6 +52,7 @@ import com.rjconsultores.ventaboletos.vo.impressaofiscal.SituacaoTributaria; @Repository("fiscalDAO") public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO { private static final String DATE_FORMAT_FISCAL = "yyyyMMdd"; + private static final String DATE_FORMAT_DMYHMS = "dd/MM/yyyy hh:mm:ss"; private static Logger log = Logger.getLogger(FiscalHibernateDAO.class); @@ -2009,7 +2010,8 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sb.append(" join ciudad cd on cd.ciudad_id = po.ciudad_id"); sb.append(" left join parada pds on pds.parada_id = s.aliasdestino_id"); sb.append(" left join ciudad cds on cds.ciudad_id = pds.ciudad_id"); - sb.append(" join aidf a on a.serie = substr(b.numseriepreimpresa, 1, 3) and a.estado_id = (CASE WHEN s.aliasorigen_id IS NULL THEN eo.estado_id ELSE eos.estado_id END)"); +// sb.append(" join aidf a on a.serie = substr(b.numseriepreimpresa, 1, 3) and a.estado_id = (CASE WHEN s.aliasorigen_id IS NULL THEN eo.estado_id ELSE eos.estado_id END)"); + sb.append(" join aidf a on a.aidf_id = b.aidf_id"); sb.append(" join empresa_imposto ei on ei.empresa_id = b.empresacorrida_id and ei.estado_id = co.estado_id"); sb.append(" left join empresa_imposto eis on eis.empresa_id = b.empresacorrida_id and eis.estado_id = cos.estado_id"); sb.append(" where"); @@ -2018,14 +2020,14 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sb.append(" and (CASE WHEN s.aliasorigen_id IS NULL THEN ei.activo ELSE eis.activo END) = 1"); sb.append(" and (b.indstatusboleto like 'V' or b.indstatusboleto like 'C')"); sb.append(" and b.empresacorrida_id = ?"); - sb.append(" and (b.feccorrida >= ? and b.feccorrida <= ?)"); + sb.append(" and (b.feccorrida >= to_date(?, 'dd/MM/YYYY hh24:mi:ss') and b.feccorrida <= to_date(?, 'dd/MM/YYYY hh24:mi:ss'))"); sb.append(" and (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) like ?"); try { PreparedStatement ps = connection.prepareStatement(sb.toString()); ps.setLong(1, Long.valueOf(empresaId)); - ps.setDate(2, new java.sql.Date(inicio.getTime())); - ps.setDate(3, new java.sql.Date(fim.getTime())); + ps.setString(2, DateUtil.getStringDate(inicio, DATE_FORMAT_DMYHMS)); + ps.setString(3, DateUtil.getStringDate(fim, DATE_FORMAT_DMYHMS)); ps.setString(4, cveestado); ResultSet rs = ps.executeQuery(); @@ -2089,22 +2091,23 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sb.append(" left join parada pos on pos.parada_id = s.aliasorigen_id"); sb.append(" left join ciudad cos on cos.ciudad_id = pos.ciudad_id"); sb.append(" left join estado eos on eos.estado_id = cos.estado_id"); - sb.append(" join aidf a on a.serie = substr(b.numseriepreimpresa, 1, 3) and a.estado_id = (CASE WHEN s.aliasorigen_id IS NULL THEN eo.estado_id ELSE eos.estado_id END)"); +// sb.append(" join aidf a on a.serie = substr(b.numseriepreimpresa, 1, 3) and a.estado_id = (CASE WHEN s.aliasorigen_id IS NULL THEN eo.estado_id ELSE eos.estado_id END)"); + sb.append(" join aidf a on a.aidf_id = b.aidf_id"); sb.append(" join aidf r on r.aidf_id = b.rmd_id"); sb.append(" where"); sb.append(" b.activo = 1"); sb.append(" and b.tipoventa_id = 3"); sb.append(" and (b.indstatusboleto like 'V' or b.indstatusboleto like 'C')"); sb.append(" and b.empresacorrida_id = ?"); - sb.append(" and (b.feccorrida >= ? and b.feccorrida <= ?)"); + sb.append(" and (b.feccorrida >= to_date(?, 'dd/MM/YYYY hh24:mi:ss') and b.feccorrida <= to_date(?, 'dd/MM/YYYY hh24:mi:ss'))"); sb.append(" and (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) like ?"); sb.append(" order by b.feccreacion,a.acfiscal,b.numfoliopreimpreso"); try { PreparedStatement ps = connection.prepareStatement(sb.toString()); ps.setLong(1, Long.valueOf(empresaId)); - ps.setDate(2, new java.sql.Date(inicio.getTime())); - ps.setDate(3, new java.sql.Date(fim.getTime())); + ps.setString(2, DateUtil.getStringDate(inicio, DATE_FORMAT_DMYHMS)); + ps.setString(3, DateUtil.getStringDate(fim, DATE_FORMAT_DMYHMS)); ps.setString(4, cveestado); ResultSet rs = ps.executeQuery(); @@ -2232,14 +2235,14 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sb.append(" and (b.indstatusboleto like 'V' or b.indstatusboleto like 'C')"); sb.append(" and (CASE WHEN s.aliasorigen_id IS NULL THEN ei.activo ELSE eis.activo END) = 1"); sb.append(" and b.empresacorrida_id = ?"); - sb.append(" and (b.feccorrida >= ? and b.feccorrida <= ?)"); + sb.append(" and (b.feccorrida >= to_date(?, 'dd/MM/YYYY hh24:mi:ss') and b.feccorrida <= to_date(?, 'dd/MM/YYYY hh24:mi:ss'))"); sb.append(" and (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) like ?"); try { PreparedStatement ps = connection.prepareStatement(sb.toString()); ps.setLong(1, Long.valueOf(empresaId)); - ps.setDate(2, new java.sql.Date(inicio.getTime())); - ps.setDate(3, new java.sql.Date(fim.getTime())); + ps.setString(2, DateUtil.getStringDate(inicio, DATE_FORMAT_DMYHMS)); + ps.setString(3, DateUtil.getStringDate(fim, DATE_FORMAT_DMYHMS)); ps.setString(4, cveestado); ResultSet rs = ps.executeQuery();