From 324df3ca1fe714aad02594b488c39e2d2b5a9e70 Mon Sep 17 00:00:00 2001 From: wilian Date: Tue, 7 Mar 2017 17:30:06 +0000 Subject: [PATCH] fixes bug #8731 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@66458 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../dao/hibernate/CajaHibernateDAO.java | 4 +++- .../dao/sqlbuilder/impl/SQLBuilderOracle.java | 3 ++- .../ventaboletos/vo/caja/CajaDetalleVO.java | 15 ++++++++++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java index 70b7a1357..071ed448f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java @@ -150,7 +150,9 @@ public class CajaHibernateDAO extends GenericHibernateDAO implemen .addScalar("cveCategoria", StringType.INSTANCE) .addScalar("formaPagoId", IntegerType.INSTANCE) .addScalar("vlrFormaPago", BigDecimalType.INSTANCE) - .addScalar("descMotivo", StringType.INSTANCE); + .addScalar("descMotivo", StringType.INSTANCE) + .addScalar("transacaoId", LongType.INSTANCE) + .addScalar("transacaooriginalId", LongType.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 3e887e67c..e814a515a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java +++ b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java @@ -932,7 +932,8 @@ public class SQLBuilderOracle implements SQLBuilder { sb.append(" cfp.importe as \"vlrFormaPago\", "); sb.append(" ca.CVECATEGORIA as \"cveCategoria\", "); sb.append(" mc.DESCMOTIVO as \"descMotivo\", "); - sb.append(" (case when cfp.formapago_id = 11 then cdp.numdocumento else null end) as \"ordenSevicio\" "); + sb.append(" (case when cfp.formapago_id = 11 then cdp.numdocumento else null end) as \"ordenSevicio\", "); + sb.append(" C.TRANSACAO_ID as \"transacaoId\", C.TRANSACAOORIGINAL_ID as \"transacaooriginalId\" "); sb.append(" "); sb.append(" from "); sb.append(" caja c "); diff --git a/src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java b/src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java index 392ca46e4..cd6a52cd1 100644 --- a/src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java +++ b/src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java @@ -58,7 +58,8 @@ public class CajaDetalleVO { @XmlTransient private BigDecimal vlrFormaPago; private String descMotivo; - + private Long transacaoId; + private Long transacaooriginalId; public Long getCajaId() { return cajaId; @@ -340,5 +341,17 @@ public class CajaDetalleVO { return false; return true; } + public Long getTransacaoId() { + return transacaoId; + } + public void setTransacaoId(Long transacaoId) { + this.transacaoId = transacaoId; + } + public Long getTransacaooriginalId() { + return transacaooriginalId; + } + public void setTransacaooriginalId(Long transacaooriginalId) { + this.transacaooriginalId = transacaooriginalId; + } }