From c3cbc66384cbb0226363ade7ad1c159d36653ddf Mon Sep 17 00:00:00 2001 From: alberto Date: Fri, 23 Jun 2017 20:54:16 +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@70530 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../dao/hibernate/FiscalHibernateDAO.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index d5a7a8890..ca84f491c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -2002,7 +2002,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO // sb.append(" b.numfoliopreimpreso as num_formulario,"); sb.append(" b.foliormd as num_bilhete,"); sb.append(" b.foliormd as num_formulario,"); - sb.append(" b.feccreacion as data_emissao,"); + sb.append(" trunc(b.feccreacion) as data_emissao,"); sb.append(" (CASE WHEN b.indstatusboleto like 'C' THEN 'S' ELSE 'N' END) as doc_cancelado,"); sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN (CASE WHEN co.estado_id = cd.estado_id THEN ei.codigocontabilmunicipal ELSE ei.codigocontabilestadual END) ELSE (CASE WHEN cos.estado_id = cds.estado_id THEN ei.codigocontabilmunicipal ELSE ei.codigocontabilestadual END) END) as cod_contabil"); sb.append(" from boleto b"); @@ -2029,6 +2029,16 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sb.append(" and b.empresacorrida_id = ?"); sb.append(" and (b.fechorventa >= to_date(?, 'dd/MM/YYYY hh24:mi:ss') and b.fechorventa <= 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(" group by"); + sb.append(" ei.codestabelecimento,"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN eo.estado_id ELSE eos.estado_id END),"); + sb.append(" a.acfiscal,"); + sb.append(" a.serie,"); + sb.append(" a.subserie,"); + sb.append(" b.foliormd,"); + sb.append(" trunc(b.feccreacion),"); + sb.append(" (CASE WHEN b.indstatusboleto like 'C' THEN 'S' ELSE 'N' END),"); + sb.append(" (CASE WHEN s.aliasorigen_id IS NULL THEN (CASE WHEN co.estado_id = cd.estado_id THEN ei.codigocontabilmunicipal ELSE ei.codigocontabilestadual END) ELSE (CASE WHEN cos.estado_id = cds.estado_id THEN ei.codigocontabilmunicipal ELSE ei.codigocontabilestadual END) END)"); try { PreparedStatement ps = connection.prepareStatement(sb.toString());