From 091a298d2ce7b14ba52353d6ac825524391cd66b Mon Sep 17 00:00:00 2001 From: gleimar Date: Wed, 29 Aug 2012 19:09:36 +0000 Subject: [PATCH] git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@20848 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../dao/sqlbuilder/impl/SQLBuilderOracle.java | 4 ++-- .../ventaboletos/entidad/OrgaoTramo.java | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java index c6a1238c9..adf3a915c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java +++ b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java @@ -63,7 +63,7 @@ public class SQLBuilderOracle implements SQLBuilder { sb.append("from "); sb.append(" ruta_combinacion rc "); sb.append(" inner join ruta r on r.ruta_id = rc.ruta_id "); - sb.append(" inner join orgao_tramo tc on tc.tramo_id = rc.tramo_id "); + sb.append(" inner join orgao_tramo tc on tc.tramo_id = rc.tramo_id and tc.CLASESERVICIO_ID = r.CLASESERVICIO_ID and tc.activo =1 "); sb.append(" inner join orgao_concedente oc on oc.orgaoconcedente_id = tc.orgaoconcedente_id and oc.orgaoconcedente_id =r.orgaoconcedente_id "); sb.append(" inner join coeficiente_tarifa ct1 on ct1.coeficientetarifa_id = tc.coeficientetarifa1_id "); sb.append(" left join coeficiente_tarifa ct2 on ct2.coeficientetarifa_id = tc.coeficientetarifa2_id "); @@ -114,7 +114,7 @@ public class SQLBuilderOracle implements SQLBuilder { sb.append("from "); sb.append(" ruta_combinacion rc "); sb.append(" inner join ruta r on r.ruta_id = rc.ruta_id "); - sb.append(" inner join orgao_tramo tc on tc.tramo_id = rc.tramo_id "); + sb.append(" inner join orgao_tramo tc on tc.tramo_id = rc.tramo_id and tc.CLASESERVICIO_ID = r.CLASESERVICIO_ID and tc.activo =1 "); sb.append(" inner join orgao_concedente oc on oc.orgaoconcedente_id = tc.orgaoconcedente_id and oc.orgaoconcedente_id =r.orgaoconcedente_id "); sb.append(" inner join coeficiente_tarifa ct1 on ct1.coeficientetarifa_id = tc.coeficientetarifa1_id "); sb.append(" left join coeficiente_tarifa ct2 on ct2.coeficientetarifa_id = tc.coeficientetarifa2_id "); diff --git a/src/com/rjconsultores/ventaboletos/entidad/OrgaoTramo.java b/src/com/rjconsultores/ventaboletos/entidad/OrgaoTramo.java index 0b6554dc9..4b8d8b19d 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/OrgaoTramo.java +++ b/src/com/rjconsultores/ventaboletos/entidad/OrgaoTramo.java @@ -48,6 +48,9 @@ public class OrgaoTramo implements Serializable { @OneToOne @JoinColumn(name = "ORGAOCONCEDENTE_ID") private OrgaoConcedente orgaoConcedente; + @OneToOne + @JoinColumn(name = "CLASESERVICIO_ID") + private ClaseServicio claseServicio; @Column(name = "ACTIVO") private Boolean activo; @Column(name = "FECMODIF") @@ -176,4 +179,12 @@ public class OrgaoTramo implements Serializable { return false; return true; } + + public ClaseServicio getClaseServicio() { + return claseServicio; + } + + public void setClaseServicio(ClaseServicio claseServicio) { + this.claseServicio = claseServicio; + } }