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

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@20875 d1611594-4594-4d17-8e1d-87c2c4800839

master
gleimar 2012-08-30 18:00:26 +00:00
parent 86aa774d55
commit ef562d886d
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
src/com/rjconsultores/ventaboletos/entidad/ClaseServicio.java
View File

@ -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)

12
src/com/rjconsultores/ventaboletos/entidad/Marca.java
View File

@ -31,10 +31,9 @@ import javax.persistence.TemporalType;
@Table(name = "MARCA")
public class Marca implements Serializable {
@OneToMany(mappedBy = "marca")
private List<TarifaHist> tarifaHistList;
@OneToMany(mappedBy = "marca")
private List<Corrida> 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<CancelacionCtrl> cancelacionCtrlList;
@Column(name = "EQUIVALENCIA_ID")
private String equivalenciaId;
@OneToMany(mappedBy = "marca")
private List<TarifaHist> tarifaHistList;
@OneToMany(mappedBy = "marca")
private List<Corrida> corridaList;
public Marca() {
}

1
src/com/rjconsultores/ventaboletos/service/impl/TarifaServiceImpl.java
View File

@ -285,6 +285,7 @@ public class TarifaServiceImpl implements TarifaService {
List<ClaseServicio> lsClaseServicio, List<Categoria> lsCategoria,
List<Empresa> lsEmpresa, List<Ruta> lsRuta,
List<TipoPuntoVenta> lsTipoPuntoVenta, List<VigenciaTarifa> lsVigenciaTarifa) {
return tarifaDAO.pesquisar(lsMoneda, lsMarca, lsClaseServicio, lsCategoria,
lsEmpresa, lsRuta, lsTipoPuntoVenta, lsVigenciaTarifa);
}