fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug #8755 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@68028 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2017-04-13 19:18:06 +00:00
parent bb0b63b490
commit 3496c97bc5
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java
View File

@ -180,7 +180,9 @@ public class CajaHibernateDAO extends GenericHibernateDAO<Object, Long> 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));

6
src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java
View File

@ -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')");

15
src/com/rjconsultores/ventaboletos/vo/caja/CajaDetalleVO.java
View File

@ -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;
}
}