From 57ac5273c592e1adc09d4cc3d99cf68990b441ab Mon Sep 17 00:00:00 2001 From: leonardo Date: Mon, 4 Aug 2014 21:28:09 +0000 Subject: [PATCH] OCD - Erro no LOG (fixed bug #5490) git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@37004 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/dao/hibernate/CajaHibernateDAO.java | 1 + .../dao/sqlbuilder/impl/SQLBuilderOracle.java | 2 ++ .../rjconsultores/ventaboletos/vo/caja/UsuarioVO.java | 9 +++++++++ 3 files changed, 12 insertions(+) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java index 49284f137..a92f5c405 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java @@ -114,6 +114,7 @@ public class CajaHibernateDAO extends GenericHibernateDAO implemen .addScalar("usuarioId", IntegerType.INSTANCE) .addScalar("cveusuario", StringType.INSTANCE) .addScalar("puntoVentaId", IntegerType.INSTANCE) + .addScalar("numPuntoVenta", StringType.INSTANCE) .addScalar("fecCorte", DateType.INSTANCE) .addScalar("turnoId", IntegerType.INSTANCE) .addScalar("importeTotal", BigDecimalType.INSTANCE); diff --git a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java index 46cf7f66c..68fa01c5a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java +++ b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java @@ -618,6 +618,7 @@ public class SQLBuilderOracle implements SQLBuilder { sb.append(" u.usuario_id as \"usuarioId\", "); sb.append(" u.cveusuario as \"cveusuario\", "); sb.append(" c.PUNTOVENTA_ID as \"puntoVentaId\", "); + sb.append(" pv.numpuntoventa as \"numPuntoVenta\", "); sb.append(" c.FECCORTE as \"fecCorte\", "); sb.append(" c.TURNO_ID as \"turnoId\", "); sb.append(" (select sum(importe) from conta_corrente_ptovta ccpv where ccpv.puntoventa_id = c.puntoventa_id and ccpv.usuario_id = c.usuario_id and ccpv.feccorte = c.feccorte and ccpv.turno_id = c.turno_id) as \"importeTotal\""); @@ -625,6 +626,7 @@ public class SQLBuilderOracle implements SQLBuilder { sb.append(" from "); sb.append(" caja c "); sb.append(" left join usuario u on c.usuario_id = u.usuario_id "); + sb.append(" left join punto_venta pv on pv.puntoventa_id = c.puntoventa_id "); sb.append(" "); sb.append(" where "); sb.append(" trunc(c.feccorte) = to_date('").append(sdf.format(fecha)).append("','yyyy-MM-dd')"); diff --git a/src/com/rjconsultores/ventaboletos/vo/caja/UsuarioVO.java b/src/com/rjconsultores/ventaboletos/vo/caja/UsuarioVO.java index 4146642a5..716e014f4 100644 --- a/src/com/rjconsultores/ventaboletos/vo/caja/UsuarioVO.java +++ b/src/com/rjconsultores/ventaboletos/vo/caja/UsuarioVO.java @@ -11,6 +11,7 @@ public class UsuarioVO { private Integer usuarioId; private String cveusuario; private Integer puntoVentaId; + private String numPuntoVenta; private Integer turnoId; private Date fecCorte; private BigDecimal importeTotal; @@ -72,4 +73,12 @@ public class UsuarioVO { public void setImporteTotal(BigDecimal importeTotal) { this.importeTotal = importeTotal; } + + public String getNumPuntoVenta() { + return numPuntoVenta; + } + + public void setNumPuntoVenta(String numPuntoVenta) { + this.numPuntoVenta = numPuntoVenta; + } }