diff --git a/src/com/rjconsultores/ventaboletos/entidad/Corrida.java b/src/com/rjconsultores/ventaboletos/entidad/Corrida.java index b05f59424..4dfce1f1f 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Corrida.java +++ b/src/com/rjconsultores/ventaboletos/entidad/Corrida.java @@ -208,6 +208,9 @@ public class Corrida implements Serializable { @Column(name = "CODPRODUTOFISCAL") private String codProdutoFiscal; + + @Column(name = "INFOCORRIDA") + private String infoCorrida; public String getIndTipoVenta() { return indTipoVenta; @@ -520,6 +523,14 @@ public class Corrida implements Serializable { this.codProdutoFiscal = codProdutoFiscal; } + public String getInfoCorrida() { + return infoCorrida; + } + + public void setInfoCorrida(String infoCorrida) { + this.infoCorrida = infoCorrida; + } + @Override public String toString() { return id.toString(); diff --git a/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java b/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java index 02470c67b..a084a7afb 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java +++ b/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java @@ -122,6 +122,10 @@ public class EsquemaCorrida implements Serializable { private Integer cantDiasGeneracion; @Column(name = "ESQUEMAAGRUPACION_ID") private Integer esquemaAgrupacionId; + @Column(name = "INFOCORRIDA") + private String infoCorrida; + @Column(name = "INDCORRIDAEXTRA") + private Boolean indCorridaExtra; public enum GerarFeriado { // Declaração dos enum @@ -453,6 +457,22 @@ public class EsquemaCorrida implements Serializable { this.esquemaAgrupacionId = esquemaAgrupacionId; } + public String getInfoCorrida() { + return infoCorrida; + } + + public void setInfoCorrida(String infoCorrida) { + this.infoCorrida = infoCorrida; + } + + public Boolean getIndCorridaExtra() { + return indCorridaExtra; + } + + public void setIndCorridaExtra(Boolean indCorridaExtra) { + this.indCorridaExtra = indCorridaExtra; + } + @Override public int hashCode() { int hash = 0; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java index 4e68d9811..465808706 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java @@ -506,7 +506,12 @@ public class CorridaServiceImpl implements CorridaService { corrida.setAutobus(null); corrida.setClaseServicio(esquemaCorrida.getClaseServicio()); corrida.setConductor(null); - corrida.setTipoServicio(new Short("1")); + if(esquemaCorrida.getIndCorridaExtra()){ + corrida.setTipoServicio(new Short("2")); + }else{ + corrida.setTipoServicio(new Short("1")); + } + corrida.setInfoCorrida(esquemaCorrida.getInfoCorrida()); Integer cantparados = esquemaCorrida.getCantparados(); if (cantparados != null) { corrida.setCantParados(cantparados.shortValue());