From 3496c97bc59788dc6900524eafcd2ae4fa8ceef3 Mon Sep 17 00:00:00 2001 From: wilian Date: Thu, 13 Apr 2017 19:18:06 +0000 Subject: [PATCH] bug #8755 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@68028 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../dao/hibernate/CajaHibernateDAO.java | 4 +++- .../dao/sqlbuilder/impl/SQLBuilderOracle.java | 6 +++++- .../ventaboletos/vo/caja/CajaDetalleVO.java | 15 +++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java index 5eb6414ae..ce72a33ae 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java @@ -180,7 +180,9 @@ public class CajaHibernateDAO extends GenericHibernateDAO implemen .addScalar("operadoracartao", StringType.INSTANCE) .addScalar("cvesecretaria", StringType.INSTANCE) .addScalar("tipoPago", IntegerType.INSTANCE) - .addScalar("indEncargoVenta", BooleanType.INSTANCE); + .addScalar("indEncargoVenta", BooleanType.INSTANCE) + .addScalar("descconvenio", StringType.INSTANCE) + .addScalar("cveconvenio", StringType.INSTANCE); sql.setResultTransformer(new AliasToBeanResultTransformer(CajaDetalleVO.class)); diff --git a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java index 5d0cde5d4..5b72d8951 100644 --- a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java +++ b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java @@ -946,7 +946,9 @@ public class SQLBuilderOracle implements SQLBuilder { sb.append(" ct.descoperadoracartao as \"operadoracartao\", "); sb.append(" sec.cvesecretaria as \"cvesecretaria\", "); sb.append(" fp.tipo_pago as \"tipoPago\", "); - sb.append(" c.INDENCARGOVENTA as \"indEncargoVenta\" "); + sb.append(" NVL(c.INDENCARGOVENTA,0) as \"indEncargoVenta\", "); + sb.append(" con.cveconvenio as \"cveconvenio\", "); + sb.append(" con.descconvenio as \"descconvenio\" "); sb.append(" from "); sb.append(" caja c "); sb.append(" left join corrida co on co.corrida_id = c.corrida_id and co.feccorrida = c.feccorrida "); @@ -960,6 +962,8 @@ public class SQLBuilderOracle implements SQLBuilder { sb.append(" left join tarifa_venda_pacote tvp on tvp.boleto_id = c.transacao_id "); sb.append(" left join ocd ocd on ocd.ocd_id = cdp.ocd_id "); sb.append(" left join secretaria sec on sec.secretaria_id = cdp.opcional1 "); + sb.append(" left join convenio_det cDet on cDet.conveniodet_id = c.conveniodet_id "); + sb.append(" left join convenio con on con.convenio_id = cDet.convenio_id "); sb.append(" "); sb.append(" where "); sb.append(" trunc(fechorventa) between to_date('").append(sdf.format(fechaDesde)).append("','yyyy-MM-dd') and ").append(" to_date('").append(sdf.format(fechaHasta)).append("','yyyy-MM-dd')"); diff --git a/src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java b/src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java index 63ce0e9b0..ef360e588 100644 --- a/src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java +++ b/src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java @@ -78,6 +78,9 @@ public class CajaDetalleVO { private String cvesecretaria; private Boolean indEncargoVenta; + private String descconvenio; + private String cveconvenio; + private Integer tipoPago; public Long getCajaId() { @@ -487,5 +490,17 @@ public class CajaDetalleVO { public void setIndEncargoVenta(Boolean indEncargoVenta) { this.indEncargoVenta = indEncargoVenta; } + public String getDescconvenio() { + return descconvenio; + } + public void setDescconvenio(String descconvenio) { + this.descconvenio = descconvenio; + } + public String getCveconvenio() { + return cveconvenio; + } + public void setCveconvenio(String cveconvenio) { + this.cveconvenio = cveconvenio; + } }