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

16609: Retornar Alias venda embarcada 

fixes bug#16609
dev:valdir
qua:marcelo

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@98465 d1611594-4594-4d17-8e1d-87c2c4800839
master
leonardo 2019-10-25 19:45:27 +00:00
parent ac4f2e30c7
commit 3f9e4973f4
3 changed files with 94 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java
View File

@ -417,9 +417,16 @@ public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO<Op
sb.append(" and paradaDestinoId = TRM.DESTINO_ID");
sb.append(" and rutaId = TA.RUTA_ID");
sb.append(" and rownum = 1");
sb.append(" ) as tarifaMinima");
sb.append(" ) as tarifaMinima,");
sb.append(" aser.aliasorigen_id As aliasorigenId,");
sb.append(" aser.aliasdestino_id As aliasdestinoId,");
sb.append(" aori.descparada As descAliasorigen,");
sb.append(" dori.descparada As descAliasdestino");
sb.append(" FROM RUTA_COMBINACION RC");
sb.append(" JOIN TRAMO TRM ON TRM.TRAMO_ID = RC.TRAMO_ID");
sb.append(" left join alias_servico aser on aser.origen_id = trm.origen_id and aser.destino_id = trm.destino_id and aser.ruta_id = rc.ruta_id and aser.corrida_id = :corridaId");
sb.append(" left join parada aori on aori.parada_id = aser.aliasorigen_id");
sb.append(" left join parada dori on dori.parada_id = aser.aliasdestino_id");
sb.append(" JOIN CORRIDA_TRAMO CRT ON CRT.DESTINO_ID = TRM.DESTINO_ID AND CRT.CORRIDA_ID = :corridaId AND CRT.FECCORRIDA = TO_DATE(:feccorrida,'DD/MM/YYYY HH24:MI:SS')");
sb.append(" JOIN PARADA ORI ON ORI.PARADA_ID = TRM.ORIGEN_ID");
sb.append(" JOIN CIUDAD ORICID ON ORICID.CIUDAD_ID = ORI.CIUDAD_ID");
@ -474,7 +481,11 @@ public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO<Op
sb.append(" TA.IMPORTEOUTROS,");
sb.append(" TA.IMPORTESEGURO,");
sb.append(" TA.PRECIO,");
sb.append(" TA.RUTA_ID");
sb.append(" TA.RUTA_ID,");
sb.append(" aser.aliasorigen_id,");
sb.append(" aser.aliasdestino_id,");
sb.append(" aori.descparada,");
sb.append(" dori.descparada");
sb.append(" ORDER BY");
sb.append(" CRT.NUMSECUENCIA");
@ -504,6 +515,10 @@ public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO<Op
.addScalar("importeSeguro", BigDecimalType.INSTANCE)
.addScalar("precio", BigDecimalType.INSTANCE)
.addScalar("tarifaMinima", BigDecimalType.INSTANCE)
.addScalar("aliasorigenId", IntegerType.INSTANCE)
.addScalar("aliasdestinoId", IntegerType.INSTANCE)
.addScalar("descAliasorigen", StringType.INSTANCE)
.addScalar("descAliasdestino", StringType.INSTANCE)
.setResultTransformer(Transformers.aliasToBean(TramoSequenciaVO.class));
query.setParameter("empresaId", corrida.getEmpresaId());
@ -571,6 +586,10 @@ public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO<Op
ts.getImporteSeguro(),
ts.getImportePedagio(),
ts.getImporteOutros());
tramo.setAliasdestinoId(ts.getAliasdestinoId());
tramo.setAliasorigenId(ts.getAliasorigenId());
tramo.setDescAliasdestino(ts.getDescAliasdestino());
tramo.setDescAliasorigen(ts.getDescAliasorigen());
lsTramo.add(tramo);
}

37
src/com/rjconsultores/ventaboletos/vo/corrida/TramoSequenciaVO.java
View File

@ -28,6 +28,10 @@ public class TramoSequenciaVO {
private BigDecimal importeSeguro;
private BigDecimal precio;
private BigDecimal tarifaMinima;
private Integer aliasorigenId;
private Integer aliasdestinoId;
private String descAliasorigen;
private String descAliasdestino;
public TramoSequenciaVO() {
@ -232,4 +236,37 @@ public class TramoSequenciaVO {
public void setTarifaMinima(BigDecimal tarifaMinima) {
this.tarifaMinima = tarifaMinima;
}
public Integer getAliasorigenId() {
return aliasorigenId;
}
public void setAliasorigenId(Integer aliasorigenId) {
this.aliasorigenId = aliasorigenId;
}
public Integer getAliasdestinoId() {
return aliasdestinoId;
}
public void setAliasdestinoId(Integer aliasdestinoId) {
this.aliasdestinoId = aliasdestinoId;
}
public String getDescAliasorigen() {
return descAliasorigen;
}
public void setDescAliasorigen(String descAliasorigen) {
this.descAliasorigen = descAliasorigen;
}
public String getDescAliasdestino() {
return descAliasdestino;
}
public void setDescAliasdestino(String descAliasdestino) {
this.descAliasdestino = descAliasdestino;
}
}

36
src/com/rjconsultores/ventaboletos/vo/tramo/TramoVO.java
View File

@ -17,6 +17,10 @@ public class TramoVO {
private BigDecimal valorSeguro = BigDecimal.ZERO;
private BigDecimal valorPedagio = BigDecimal.ZERO;
private BigDecimal valorOutros = BigDecimal.ZERO;
private Integer aliasorigenId;
private Integer aliasdestinoId;
private String descAliasorigen;
private String descAliasdestino;
public TramoVO() {
@ -127,4 +131,36 @@ public class TramoVO {
this.valorOutros = valorOutros == null ? BigDecimal.ZERO : valorOutros;
}
public Integer getAliasorigenId() {
return aliasorigenId;
}
public void setAliasorigenId(Integer aliasorigenId) {
this.aliasorigenId = aliasorigenId;
}
public Integer getAliasdestinoId() {
return aliasdestinoId;
}
public void setAliasdestinoId(Integer aliasdestinoId) {
this.aliasdestinoId = aliasdestinoId;
}
public String getDescAliasorigen() {
return descAliasorigen;
}
public void setDescAliasorigen(String descAliasorigen) {
this.descAliasorigen = descAliasorigen;
}
public String getDescAliasdestino() {
return descAliasdestino;
}
public void setDescAliasdestino(String descAliasdestino) {
this.descAliasdestino = descAliasdestino;
}
}