diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java index ce72a33ae..ead085356 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java @@ -182,7 +182,8 @@ public class CajaHibernateDAO extends GenericHibernateDAO implemen .addScalar("tipoPago", IntegerType.INSTANCE) .addScalar("indEncargoVenta", BooleanType.INSTANCE) .addScalar("descconvenio", StringType.INSTANCE) - .addScalar("cveconvenio", StringType.INSTANCE); + .addScalar("cveconvenio", StringType.INSTANCE) + .addScalar("descsecretaria", StringType.INSTANCE); sql.setResultTransformer(new AliasToBeanResultTransformer(CajaDetalleVO.class)); @@ -212,6 +213,7 @@ public class CajaHibernateDAO extends GenericHibernateDAO implemen pagamentoVO.setMoeda("R$"); pagamentoVO.setValor(cd.getVlrFormaPago()); pagamentoVO.setIdentificacaoEmpresa(cd.getCvesecretaria()); + pagamentoVO.setRazaoSocial(cd.getDescsecretaria()); 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 25635262e..8a59f3578 100644 --- a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java +++ b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java @@ -951,7 +951,8 @@ public class SQLBuilderOracle implements SQLBuilder { sb.append(" fp.tipo_pago as \"tipoPago\", "); sb.append(" NVL(c.INDENCARGOVENTA,0) as \"indEncargoVenta\", "); sb.append(" con.cveconvenio as \"cveconvenio\", "); - sb.append(" con.descconvenio as \"descconvenio\" "); + sb.append(" con.descconvenio as \"descconvenio\", "); + sb.append(" sec.descsecretaria as \"descsecretaria\" "); 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 "); diff --git a/src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java b/src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java index ef360e588..776965173 100644 --- a/src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java +++ b/src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java @@ -76,6 +76,7 @@ public class CajaDetalleVO { private String numoperacionOcd; private String operadoracartao; private String cvesecretaria; + private String descsecretaria; private Boolean indEncargoVenta; private String descconvenio; @@ -502,5 +503,12 @@ public class CajaDetalleVO { public void setCveconvenio(String cveconvenio) { this.cveconvenio = cveconvenio; } + @XmlTransient + public String getDescsecretaria() { + return descsecretaria; + } + public void setDescsecretaria(String descsecretaria) { + this.descsecretaria = descsecretaria; + } } diff --git a/src/com/rjconsultores/ventaboletos/vo/caja/PagamentoVO.java b/src/com/rjconsultores/ventaboletos/vo/caja/PagamentoVO.java index ddde69c1d..2344114cc 100644 --- a/src/com/rjconsultores/ventaboletos/vo/caja/PagamentoVO.java +++ b/src/com/rjconsultores/ventaboletos/vo/caja/PagamentoVO.java @@ -14,7 +14,7 @@ import com.rjconsultores.ventaboletos.vo.busquedapacotes.DadosBancarioVO; import com.rjconsultores.ventaboletos.vo.busquedapacotes.NotaCreditoVendaPacoteVO; @XmlRootElement(name = "pagamento") -@XmlType(propOrder = { "formapagamento", "moeda", "valor", "cartao", "notacredito", "identificacaoEmpresa", "dadosBancarios"}) +@XmlType(propOrder = { "formapagamento", "moeda", "valor", "cartao", "notacredito", "identificacaoEmpresa", "razaoSocial", "dadosBancarios"}) public class PagamentoVO { private String formapagamento; @@ -24,6 +24,7 @@ public class PagamentoVO { private Integer formapagoId; private NotaCreditoVendaPacoteVO notacredito; private String identificacaoEmpresa; + private String razaoSocial; private TipoFormapago tipoFormapago; private List dadosBancarios; @@ -103,4 +104,12 @@ public class PagamentoVO { public void setDadosBancarios(List dadosBancarios) { this.dadosBancarios = dadosBancarios; } + + public String getRazaoSocial() { + return razaoSocial; + } + + public void setRazaoSocial(String razaoSocial) { + this.razaoSocial = razaoSocial; + } }