diff --git a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java index 69495f0af..f008910f6 100644 --- a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java +++ b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java @@ -13,11 +13,11 @@ public class SQLBuilderOracle implements SQLBuilder { sb.append(" ( "); sb.append(" TARIFAOFICIAL_ID, "); sb.append(" PRECIO, "); - sb.append(" PRECIOREDABIERTO, "); + sb.append(" PRECIOORIGINAL, "); sb.append(" TRAMO_ID, "); sb.append(" MARCA_ID, "); sb.append(" CLASESERVICIO_ID, "); - sb.append(" PRECIOORIGINAL, "); + sb.append(" PRECIOREDABIERTO, "); sb.append(" MONEDA_ID, "); sb.append(" VIGENCIATARIFA_ID, "); sb.append(" STATUSTARIFA, "); @@ -40,7 +40,10 @@ public class SQLBuilderOracle implements SQLBuilder { sb.append(" (coalesce(ct1.coeficiente,0) * coalesce(tc.kmcoeficiente1,0) + "); sb.append(" coalesce(ct2.coeficiente,0) * coalesce(tc.kmcoeficiente2,0) + "); sb.append(" coalesce(ct3.coeficiente,0) * coalesce(tc.kmcoeficiente3,0)) * case when e.icms is null then 1 else (1/(1-e.icms/100)) end ,2), "); - sb.append(" null, "); + sb.append(" ROUND( "); + sb.append(" (coalesce(ct1.coeficiente,0) * coalesce(tc.kmcoeficiente1,0) + "); + sb.append(" coalesce(ct2.coeficiente,0) * coalesce(tc.kmcoeficiente2,0) + "); + sb.append(" coalesce(ct3.coeficiente,0) * coalesce(tc.kmcoeficiente3,0)) * case when e.icms is null then 1 else (1/(1-e.icms/100)) end ,2), "); sb.append(" t.tramo_id, "); sb.append(" mc.marca_id, "); sb.append(" r.CLASESERVICIO_ID, "); diff --git a/src/com/rjconsultores/ventaboletos/entidad/ClaseServicio.java b/src/com/rjconsultores/ventaboletos/entidad/ClaseServicio.java index ecc3f287f..921cfeb59 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ClaseServicio.java +++ b/src/com/rjconsultores/ventaboletos/entidad/ClaseServicio.java @@ -29,6 +29,8 @@ import javax.persistence.SequenceGenerator; @Table(name = "CLASE_SERVICIO") public class ClaseServicio implements Serializable { + public final static short TODOS = -1; + private static final long serialVersionUID = 1L; @Id @Basic(optional = false) diff --git a/src/com/rjconsultores/ventaboletos/entidad/Marca.java b/src/com/rjconsultores/ventaboletos/entidad/Marca.java index c9fa6c23f..03d31b88e 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Marca.java +++ b/src/com/rjconsultores/ventaboletos/entidad/Marca.java @@ -31,10 +31,9 @@ import javax.persistence.TemporalType; @Table(name = "MARCA") public class Marca implements Serializable { - @OneToMany(mappedBy = "marca") - private List tarifaHistList; - @OneToMany(mappedBy = "marca") - private List corridaList; + public final static short TODOS = -1; + + private static final long serialVersionUID = 1L; @Id @Basic(optional = false) @@ -62,7 +61,10 @@ public class Marca implements Serializable { private List cancelacionCtrlList; @Column(name = "EQUIVALENCIA_ID") private String equivalenciaId; - + @OneToMany(mappedBy = "marca") + private List tarifaHistList; + @OneToMany(mappedBy = "marca") + private List corridaList; public Marca() { } diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TarifaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/TarifaServiceImpl.java index 09df42cb3..fbe6d72b4 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/TarifaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/TarifaServiceImpl.java @@ -285,6 +285,7 @@ public class TarifaServiceImpl implements TarifaService { List lsClaseServicio, List lsCategoria, List lsEmpresa, List lsRuta, List lsTipoPuntoVenta, List lsVigenciaTarifa) { + return tarifaDAO.pesquisar(lsMoneda, lsMarca, lsClaseServicio, lsCategoria, lsEmpresa, lsRuta, lsTipoPuntoVenta, lsVigenciaTarifa); }