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

Merge pull request 'fixes bug#AL-4580' (!238) from AL-4580 into master 

Reviewed-on: adm/ModelWeb#238
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master
Gleison da Cruz 2024-07-29 22:05:22 +00:00
parent 6d92ae8b9b bc298845f2
commit 702f3f5aa0
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId> <artifactId>ModelWeb</artifactId>
<version>1.88.2</version> <version>1.88.3</version>
<distributionManagement> <distributionManagement>
<repository> <repository>

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

@ -10,6 +10,7 @@ import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType; import javax.persistence.GenerationType;
import javax.persistence.Id; import javax.persistence.Id;
@ -113,32 +114,32 @@ public class EsquemaCorrida implements Serializable, Auditavel<EsquemaCorrida> {
private String statusCorrida; private String statusCorrida;
@JoinColumn(name = "RUTA_ID", referencedColumnName = "RUTA_ID") @JoinColumn(name = "RUTA_ID", referencedColumnName = "RUTA_ID")
@ManyToOne @ManyToOne(fetch = FetchType.LAZY)
private Ruta ruta; private Ruta ruta;
@JoinColumn(name = "ROLOPERATIVO_ID", referencedColumnName = "ROLOPERATIVO_ID") @JoinColumn(name = "ROLOPERATIVO_ID", referencedColumnName = "ROLOPERATIVO_ID")
@ManyToOne(cascade = CascadeType.ALL) @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
private RolOperativo rolOperativo; private RolOperativo rolOperativo;
@JoinColumn(name = "MARCA_ID", referencedColumnName = "MARCA_ID") @JoinColumn(name = "MARCA_ID", referencedColumnName = "MARCA_ID")
@ManyToOne @ManyToOne(fetch = FetchType.LAZY)
private Marca marca; private Marca marca;
@JoinColumn(name = "ESQUEMAOPERACIONAL_ID", referencedColumnName = "ESQUEMAOPERACIONAL_ID") @JoinColumn(name = "ESQUEMAOPERACIONAL_ID", referencedColumnName = "ESQUEMAOPERACIONAL_ID")
@ManyToOne(cascade = CascadeType.ALL) @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
@AuditarEntidade @AuditarEntidade
private EsquemaOperacional esquemaOperacional; private EsquemaOperacional esquemaOperacional;
@JoinColumn(name = "EMPRESACORRIDA_ID", referencedColumnName = "EMPRESA_ID") @JoinColumn(name = "EMPRESACORRIDA_ID", referencedColumnName = "EMPRESA_ID")
@ManyToOne @ManyToOne(fetch = FetchType.LAZY)
private Empresa empresa; private Empresa empresa;
@JoinColumn(name = "EMPRESAINGRESO_ID", referencedColumnName = "EMPRESA_ID") @JoinColumn(name = "EMPRESAINGRESO_ID", referencedColumnName = "EMPRESA_ID")
@ManyToOne @ManyToOne(fetch = FetchType.LAZY)
private Empresa empresa1; private Empresa empresa1;
@JoinColumn(name = "CLASESERVICIO_ID", referencedColumnName = "CLASESERVICIO_ID") @JoinColumn(name = "CLASESERVICIO_ID", referencedColumnName = "CLASESERVICIO_ID")
@ManyToOne(cascade = CascadeType.ALL) @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
private ClaseServicio claseServicio; private ClaseServicio claseServicio;
@OneToMany(cascade = CascadeType.ALL) @OneToMany(cascade = CascadeType.ALL)
@ -146,7 +147,7 @@ public class EsquemaCorrida implements Serializable, Auditavel<EsquemaCorrida> {
@AuditarLista(auditarEntidades = true, nome = "Localidade") @AuditarLista(auditarEntidades = true, nome = "Localidade")
private List<EsquemaTramo> esquemaTramoList; private List<EsquemaTramo> esquemaTramoList;
@OneToMany(cascade = CascadeType.PERSIST) @OneToMany(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
@JoinColumn(name = "ESQUEMACORRIDA_ID", referencedColumnName = "ESQUEMACORRIDA_ID") @JoinColumn(name = "ESQUEMACORRIDA_ID", referencedColumnName = "ESQUEMACORRIDA_ID")
@AuditarLista(auditarEntidades = true, nome = "Cotas") @AuditarLista(auditarEntidades = true, nome = "Cotas")
private List<EsquemaAsiento> esquemaAsientoList; private List<EsquemaAsiento> esquemaAsientoList;
@ -155,11 +156,11 @@ public class EsquemaCorrida implements Serializable, Auditavel<EsquemaCorrida> {
private String tipocorrida; private String tipocorrida;
@JoinColumn(name = "ESQUEMAREBOTE_ID", referencedColumnName = "ESQUEMACORRIDA_ID") @JoinColumn(name = "ESQUEMAREBOTE_ID", referencedColumnName = "ESQUEMACORRIDA_ID")
@ManyToOne(cascade = CascadeType.ALL) @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
private EsquemaCorrida esquemaCorridaRebote; private EsquemaCorrida esquemaCorridaRebote;
@JoinColumn(name = "DIVISION_ID", referencedColumnName = "DIVISION_ID") @JoinColumn(name = "DIVISION_ID", referencedColumnName = "DIVISION_ID")
@ManyToOne(cascade = CascadeType.ALL) @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
private Division division; private Division division;
@Column(name = "NUMCORRIDA") @Column(name = "NUMCORRIDA")
@ -190,14 +191,14 @@ public class EsquemaCorrida implements Serializable, Auditavel<EsquemaCorrida> {
private Boolean indDiaSimDiaNao; private Boolean indDiaSimDiaNao;
@JoinColumn(name = "AUTOBUS_ID", referencedColumnName = "AUTOBUS_ID") @JoinColumn(name = "AUTOBUS_ID", referencedColumnName = "AUTOBUS_ID")
@ManyToOne(cascade = CascadeType.ALL) @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
private Autobus autoBus; private Autobus autoBus;
@OneToMany(mappedBy = "esquemaCorrida", cascade = CascadeType.ALL) @OneToMany(mappedBy = "esquemaCorrida", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
@AuditarLista(auditarEntidades = true, nome = "Embarque/Desembarque") @AuditarLista(auditarEntidades = true, nome = "Embarque/Desembarque")
private List<EsquemaCorridaEmbarqueDesembarque> lsEsquemaCorridaEmbarqueDesembarque; private List<EsquemaCorridaEmbarqueDesembarque> lsEsquemaCorridaEmbarqueDesembarque;
@OneToMany(mappedBy = "esquemaCorrida", cascade = CascadeType.ALL) @OneToMany(mappedBy = "esquemaCorrida", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
@AuditarLista(auditarEntidades = true, nome = "Info Tramo>") @AuditarLista(auditarEntidades = true, nome = "Info Tramo>")
private List<EsquemaCorridaInfo> lsEsquemaCorridaInfo; private List<EsquemaCorridaInfo> lsEsquemaCorridaInfo;
@ -236,7 +237,7 @@ public class EsquemaCorrida implements Serializable, Auditavel<EsquemaCorrida> {
private Integer minutosAutomacaoHEAte; private Integer minutosAutomacaoHEAte;
@JoinColumn(name = "ROLOPERATIVO_SERVICOEXTRA_ID", referencedColumnName = "ROLOPERATIVO_ID") @JoinColumn(name = "ROLOPERATIVO_SERVICOEXTRA_ID", referencedColumnName = "ROLOPERATIVO_ID")
@ManyToOne(cascade = CascadeType.ALL) @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
private RolOperativo rolOperativoServicoExtra; private RolOperativo rolOperativoServicoExtra;
@Column(name = "NUMCORRIDA_SERVICOEXTRA") @Column(name = "NUMCORRIDA_SERVICOEXTRA")