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

FIXES BUG #0006935 

FIXES BUG #0006936

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@51248 d1611594-4594-4d17-8e1d-87c2c4800839
master
daniel.zauli 2015-12-15 18:55:16 +00:00
parent 6653ba8e54
commit e2c82619ba
3 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/rjconsultores/ventaboletos/entidad/Corrida.java
View File

@ -209,6 +209,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();

20
src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java
View File

@ -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;

7
src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java
View File

@ -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());