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

fixes bug #9339 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@71978 d1611594-4594-4d17-8e1d-87c2c4800839
master
leonardo 2017-07-27 19:31:36 +00:00
parent e58909d17b
commit bd6f777898
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/rjconsultores/ventaboletos/entidad/Tramo.java
View File

@ -81,12 +81,16 @@ public class Tramo implements Serializable {
@OneToMany(cascade = CascadeType.ALL) @OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "TRAMO_ID", referencedColumnName = "TRAMO_ID") @JoinColumn(name = "TRAMO_ID", referencedColumnName = "TRAMO_ID")
private List<OrgaoTramo> lsOrgaoTramo; private List<OrgaoTramo> lsOrgaoTramo;
@Column(name = "CANTKMENTRADASAIDA")
private BigDecimal kmEntradaSaida;
public Tramo() { public Tramo() {
this.kmEntradaSaida = BigDecimal.ZERO;
} }
public Tramo(Integer tramoId) { public Tramo(Integer tramoId) {
this.tramoId = tramoId; this.tramoId = tramoId;
this.kmEntradaSaida = BigDecimal.ZERO;
} }
public Integer getTramoId() { public Integer getTramoId() {
@ -240,11 +244,23 @@ public class Tramo implements Serializable {
public BigDecimal getKmReal() { public BigDecimal getKmReal() {
return kmReal; return kmReal;
} }
public BigDecimal getKmRealSemKmEntradaSaida(){
return kmReal.subtract(kmEntradaSaida);
}
public void setKmReal(BigDecimal kmReal) { public void setKmReal(BigDecimal kmReal) {
this.kmReal = kmReal; this.kmReal = kmReal;
} }
public BigDecimal getKmEntradaSaida() {
return kmEntradaSaida;
}
public void setKmEntradaSaida(BigDecimal kmEntradaSaida) {
this.kmEntradaSaida = kmEntradaSaida;
}
public List<OrgaoTramo> getLsOrgaoTramo() { public List<OrgaoTramo> getLsOrgaoTramo() {
List<OrgaoTramo> tmp = new ArrayList<OrgaoTramo>(); List<OrgaoTramo> tmp = new ArrayList<OrgaoTramo>();
for (OrgaoTramo orgaoTramo : this.lsOrgaoTramo) { for (OrgaoTramo orgaoTramo : this.lsOrgaoTramo) {

1
src/com/rjconsultores/ventaboletos/service/impl/TramoRutaServiceImpl.java
View File

@ -166,6 +166,7 @@ public class TramoRutaServiceImpl implements TramoRutaService {
tramo.setOrigem(s.getOrigen()); tramo.setOrigem(s.getOrigen());
tramo.setDestino(s.getDestino()); tramo.setDestino(s.getDestino());
tramo.setKmReal(s.getKmReal()); tramo.setKmReal(s.getKmReal());
tramo.setKmEntradaSaida(s.getKmEntradaSaida());
tramo.setVia(s.getVia()); tramo.setVia(s.getVia());
tramo.setActivo(Boolean.TRUE); tramo.setActivo(Boolean.TRUE);
tramo.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); tramo.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());