From 728170450678e178cedc6919ca85bbff6c1039a3 Mon Sep 17 00:00:00 2001 From: wilian Date: Wed, 15 Mar 2017 12:48:01 +0000 Subject: [PATCH] fixes bug #8753 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@66858 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/dao/hibernate/CajaHibernateDAO.java | 4 +++- .../dao/sqlbuilder/impl/SQLBuilderOracle.java | 4 +++- .../ventaboletos/vo/caja/CajaDetalleVO.java | 8 ++++++++ .../ventaboletos/vo/caja/PagamentoVO.java | 11 ++++++++++- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java index d6087983f..1f2fdf716 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java @@ -169,7 +169,8 @@ public class CajaHibernateDAO extends GenericHibernateDAO implemen .addScalar("ocdId", LongType.INSTANCE) .addScalar("numoperacionOcd", StringType.INSTANCE) .addScalar("notacreditovendapacoteId", LongType.INSTANCE) - .addScalar("operadoracartao", StringType.INSTANCE); + .addScalar("operadoracartao", StringType.INSTANCE) + .addScalar("cvesecretaria", StringType.INSTANCE); sql.setResultTransformer(new AliasToBeanResultTransformer(CajaDetalleVO.class)); @@ -198,6 +199,7 @@ public class CajaHibernateDAO extends GenericHibernateDAO implemen pagamentoVO.setFormapagamento(cd.getDescPago()); pagamentoVO.setMoeda("R$"); pagamentoVO.setValor(cd.getVlrFormaPago()); + pagamentoVO.setIdentificacaoEmpresa(cd.getCvesecretaria()); if(cd.getNotacreditovendapacoteId() != null) { NotaCreditoVendaPacoteVO notacredito = new NotaCreditoVendaPacoteVO(); diff --git a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java index 7824e6c0e..59f9132d7 100644 --- a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java +++ b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java @@ -943,7 +943,8 @@ public class SQLBuilderOracle implements SQLBuilder { sb.append(" C.DESCTIPODOC2 as \"desctipodoc2\", C.DESCTELEFONO as \"desctelefono\", "); sb.append(" ocd.ocd_id as \"ocdId\", ocd.numoperacion as \"numoperacionOcd\", "); sb.append(" cdp.notacreditovendapacote_id as \"notacreditovendapacoteId\", "); - sb.append(" ct.descoperadoracartao as \"operadoracartao\" "); + sb.append(" ct.descoperadoracartao as \"operadoracartao\", "); + sb.append(" sec.cvesecretaria as \"cvesecretaria\" "); 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 "); @@ -956,6 +957,7 @@ public class SQLBuilderOracle implements SQLBuilder { sb.append(" left join motivo_cancelacion mc on mc.motivocancelacion_id = c.motivocancelacion_id "); 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(" "); 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 3ba9588e5..bec90b106 100644 --- a/src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java +++ b/src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java @@ -77,6 +77,7 @@ public class CajaDetalleVO { private Long ocdId; private String numoperacionOcd; private String operadoracartao; + private String cvesecretaria; public Long getCajaId() { return cajaId; @@ -465,5 +466,12 @@ public class CajaDetalleVO { public void setOperadoracartao(String operadoracartao) { this.operadoracartao = operadoracartao; } + @XmlTransient + public String getCvesecretaria() { + return cvesecretaria; + } + public void setCvesecretaria(String cvesecretaria) { + this.cvesecretaria = cvesecretaria; + } } diff --git a/src/com/rjconsultores/ventaboletos/vo/caja/PagamentoVO.java b/src/com/rjconsultores/ventaboletos/vo/caja/PagamentoVO.java index 92c71e94a..f5dad3521 100644 --- a/src/com/rjconsultores/ventaboletos/vo/caja/PagamentoVO.java +++ b/src/com/rjconsultores/ventaboletos/vo/caja/PagamentoVO.java @@ -9,7 +9,7 @@ import javax.xml.bind.annotation.XmlType; import com.rjconsultores.ventaboletos.vo.busquedapacotes.NotaCreditoVendaPacoteVO; @XmlRootElement(name = "pagamento") -@XmlType(propOrder = { "formapagamento", "moeda", "valor", "cartao", "notacredito"}) +@XmlType(propOrder = { "formapagamento", "moeda", "valor", "cartao", "notacredito", "identificacaoEmpresa"}) public class PagamentoVO { private String formapagamento; @@ -18,6 +18,7 @@ public class PagamentoVO { private PagamentoCartaoVO cartao; private Integer formapagoId; private NotaCreditoVendaPacoteVO notacredito; + private String identificacaoEmpresa; public String getMoeda() { return moeda; @@ -67,4 +68,12 @@ public class PagamentoVO { public void setNotacredito(NotaCreditoVendaPacoteVO notacredito) { this.notacredito = notacredito; } + + public String getIdentificacaoEmpresa() { + return identificacaoEmpresa; + } + + public void setIdentificacaoEmpresa(String identificacaoEmpresa) { + this.identificacaoEmpresa = identificacaoEmpresa; + } }