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

fixes bug#21112 

dev: Valdir
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@104544 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabio 2020-11-27 18:45:15 +00:00
parent e20ffaa318
commit 8b6ee06dd1
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/rjconsultores/ventaboletos/dao/TramoDAO.java
View File

@ -51,6 +51,6 @@ public interface TramoDAO extends GenericDAO<Tramo, Integer> {
public List<Tramo> buscarListaPorIds(List<Integer> tramoIds); public List<Tramo> buscarListaPorIds(List<Integer> tramoIds);
public List<TramoVO> buscarListaPorIds(List<Integer> tramoIds, String chaveCorrida) throws Exception; public List<TramoVO> buscarListaPorIds(List<Integer> tramoIds, String chaveCorrida, boolean tarifaEmbarcada) throws Exception;
} }

20
src/com/rjconsultores/ventaboletos/dao/hibernate/TramoHibernateDAO.java
View File

@ -200,7 +200,7 @@ public class TramoHibernateDAO extends GenericHibernateDAO<Tramo, Integer>
} }
@Override @Override
public List<TramoVO> buscarListaPorIds(List<Integer> tramoIds, String chaveCorrida ) throws Exception { public List<TramoVO> buscarListaPorIds(List<Integer> tramoIds, String chaveCorrida, boolean tarifaEmbarcada ) throws Exception {
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append(" SELECT "); sql.append(" SELECT ");
@ -227,11 +227,19 @@ public class TramoHibernateDAO extends GenericHibernateDAO<Tramo, Integer>
sql.append(" and rc.ruta_id = co.ruta_id "); sql.append(" and rc.ruta_id = co.ruta_id ");
sql.append(" JOIN empresa emp ON emp.empresa_id = co.empresacorrida_id "); sql.append(" JOIN empresa emp ON emp.empresa_id = co.empresacorrida_id ");
sql.append(" JOIN marca mar ON mar.empresa_id = emp.empresa_id AND mar.activo = 1 "); sql.append(" JOIN marca mar ON mar.empresa_id = emp.empresa_id AND mar.activo = 1 ");
sql.append(" JOIN tarifa ta ON ta.marca_id = mar.marca_id "); if (tarifaEmbarcada) {
sql.append(" AND ta.tramo_id = trm.tramo_id "); sql.append(" JOIN TARIFA_EMBARCADA ta ON ta.marca_id = mar.marca_id ");
sql.append(" AND ta.ruta_id = rc.ruta_id "); sql.append(" AND ta.tramo_id = trm.tramo_id ");
sql.append(" AND ta.activo = 1 "); sql.append(" AND ta.ruta_id = rc.ruta_id ");
sql.append(" AND ta.activo = 1 ");
} else {
sql.append(" JOIN tarifa ta ON ta.marca_id = mar.marca_id ");
sql.append(" AND ta.tramo_id = trm.tramo_id ");
sql.append(" AND ta.ruta_id = rc.ruta_id ");
sql.append(" AND ta.activo = 1 ");
}
sql.append(" JOIN vigencia_tarifa vt ON vt.vigenciatarifa_id = ta.vigenciatarifa_id AND vt.activo = 1 "); sql.append(" JOIN vigencia_tarifa vt ON vt.vigenciatarifa_id = ta.vigenciatarifa_id AND vt.activo = 1 ");
sql.append(" AND sysdate BETWEEN vt.feciniciovigencia AND vt.fecfinvigencia ");
sql.append(" WHERE "); sql.append(" WHERE ");
sql.append(" rc.activo = 1 "); sql.append(" rc.activo = 1 ");
sql.append(" AND coalesce(rc.indventa, 0) = 1 "); sql.append(" AND coalesce(rc.indventa, 0) = 1 ");
@ -247,8 +255,6 @@ public class TramoHibernateDAO extends GenericHibernateDAO<Tramo, Integer>
sql.append(" WHERE x.corrida_id = co.corrida_id "); sql.append(" WHERE x.corrida_id = co.corrida_id ");
sql.append(" AND x.feccorrida = co.feccorrida "); sql.append(" AND x.feccorrida = co.feccorrida ");
sql.append(" ) "); sql.append(" ) ");
sql.append(" AND ( sysdate BETWEEN vt.feciniciovigencia AND vt.fecfinvigencia ");
sql.append(" AND vt.activo = 1 ) ");
sql.append(" and trm.tramo_id in ( :tramoIds ) "); sql.append(" and trm.tramo_id in ( :tramoIds ) ");
sql.append(" ORDER BY crt.numsecuencia "); sql.append(" ORDER BY crt.numsecuencia ");

10
src/com/rjconsultores/ventaboletos/vo/corrida/CorridaVO.java
View File

@ -34,6 +34,7 @@ public class CorridaVO {
private Integer rolOperativoId; private Integer rolOperativoId;
private List<Integer> listTramos; private List<Integer> listTramos;
private String chaveCorrida; private String chaveCorrida;
private boolean tarifaEmbarcada;
public CorridaVO() { public CorridaVO() {
super(); super();
@ -53,6 +54,7 @@ public class CorridaVO {
this.claseServicioId = corrida.getClaseServicio().getClaseservicioId(); this.claseServicioId = corrida.getClaseServicio().getClaseservicioId();
this.empresaId = corrida.getEmpresa().getEmpresaId(); this.empresaId = corrida.getEmpresa().getEmpresaId();
this.rutaId = corrida.getRuta().getRutaId(); this.rutaId = corrida.getRuta().getRutaId();
this.tarifaEmbarcada = corrida.getEmpresa().getIndTabelaPrecoEmbarcada();
} }
public CorridaVO(Integer corridaId, Integer numCorrida, String descServico, String fechorsalida, public CorridaVO(Integer corridaId, Integer numCorrida, String descServico, String fechorsalida,
@ -259,5 +261,13 @@ public class CorridaVO {
public void setChaveCorrida(String chaveCorrida) { public void setChaveCorrida(String chaveCorrida) {
this.chaveCorrida = chaveCorrida; this.chaveCorrida = chaveCorrida;
} }
public boolean isTarifaEmbarcada() {
return tarifaEmbarcada;
}
public void setTarifaEmbarcada(boolean tarifaEmbarcada) {
this.tarifaEmbarcada = tarifaEmbarcada;
}
} }