From da79ae88b56ed319c4a49447faac35798557a31c Mon Sep 17 00:00:00 2001 From: gleimar Date: Tue, 28 Aug 2012 20:45:15 +0000 Subject: [PATCH] git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@20803 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../dao/sqlbuilder/impl/SQLBuilderOracle.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java index e4c851717..c6a1238c9 100644 --- a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java +++ b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java @@ -37,9 +37,9 @@ public class SQLBuilderOracle implements SQLBuilder { sb.append(" "); sb.append(" TARIFA_OFICIAL_SEQ.NEXTVAL, "); sb.append(" ROUND( "); - sb.append(" coalesce(ct1.coeficiente,0) * coalesce(tc.kmcoeficiente1,0) + "); + 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),2), "); + 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(" t.tramo_id, "); sb.append(" mc.marca_id, "); @@ -71,6 +71,8 @@ public class SQLBuilderOracle implements SQLBuilder { sb.append(" inner join tramo t on t.tramo_id = rc.tramo_id "); sb.append(" inner join parada po on po.parada_id = t.origen_id "); sb.append(" inner join parada pd on pd.parada_id = t.destino_id "); + sb.append(" inner join ciudad c on c.ciudad_id = po.ciudad_id "); + sb.append(" inner join estado e on e.estado_id = c.estado_id "); sb.append(" inner join MARCA_CLASESERVICIO mc on mc.CLASESERVICIO_ID = r.CLASESERVICIO_ID, "); sb.append(" moneda m "); sb.append(" "); @@ -105,9 +107,9 @@ public class SQLBuilderOracle implements SQLBuilder { sb.append("select "); sb.append(" "); sb.append(" ROUND( "); - sb.append(" coalesce(ct1.coeficiente,0) * coalesce(tc.kmcoeficiente1,0) + "); + 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),2) "); + 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(" "); sb.append("from "); sb.append(" ruta_combinacion rc "); @@ -120,6 +122,8 @@ public class SQLBuilderOracle implements SQLBuilder { sb.append(" inner join tramo t on t.tramo_id = rc.tramo_id "); sb.append(" inner join parada po on po.parada_id = t.origen_id "); sb.append(" inner join parada pd on pd.parada_id = t.destino_id "); + sb.append(" inner join ciudad c on c.ciudad_id = po.ciudad_id "); + sb.append(" inner join estado e on e.estado_id = c.estado_id "); sb.append(" inner join MARCA_CLASESERVICIO mc on mc.CLASESERVICIO_ID = r.CLASESERVICIO_ID, "); sb.append(" moneda m "); sb.append(" ");