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

Merge pull request 'alterada a primary key composta para simples fixes bug#AL-4453' (!235) from AL-4453 into master 

Reviewed-on: adm/ModelWeb#235
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master
leonardo.bolivariano 2024-07-25 20:16:47 +00:00
parent e4437b4b58 f7beccb5dd
commit edcd9a0d2f
2 changed files with 17 additions and 2 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.0</version> <version>1.88.1</version>
<distributionManagement> <distributionManagement>
<repository> <repository>

17
src/com/rjconsultores/ventaboletos/entidad/CategoriaFormAutorizacao.java
View File

@ -6,23 +6,31 @@ import java.util.Date;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Temporal; import javax.persistence.Temporal;
import javax.persistence.TemporalType; import javax.persistence.TemporalType;
@Entity @Entity
@SequenceGenerator(name = "CAT_FORM_AUTORIZACAO_SEQ", sequenceName = "CAT_FORM_AUTORIZACAO_SEQ", allocationSize = 1)
@Table(name = "CATEGORIA_FORM_AUTORIZACAO") @Table(name = "CATEGORIA_FORM_AUTORIZACAO")
public class CategoriaFormAutorizacao implements Serializable { public class CategoriaFormAutorizacao implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@GeneratedValue(strategy = GenerationType.AUTO, generator = "CAT_FORM_AUTORIZACAO_SEQ")
@Column(name = "CATEGORIAFORMAUTORIZACAO_ID")
private Integer categoriaFormAutorizacaoId;
@JoinColumn(name = "CATEGORIA_ID", referencedColumnName = "CATEGORIA_ID") @JoinColumn(name = "CATEGORIA_ID", referencedColumnName = "CATEGORIA_ID")
@ManyToOne() @ManyToOne()
private Categoria categoria; private Categoria categoria;
@Id
@JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID") @JoinColumn(name = "EMPRESA_ID", referencedColumnName = "EMPRESA_ID")
@ManyToOne() @ManyToOne()
private Empresa empresa; private Empresa empresa;
@ -74,6 +82,13 @@ public class CategoriaFormAutorizacao implements Serializable {
public void setActivo(Boolean activo) { public void setActivo(Boolean activo) {
this.activo = activo; this.activo = activo;
} }
public Integer getCategoriaFormAutorizacaoId() {
return categoriaFormAutorizacaoId;
}
public void setCategoriaFormAutorizacaoId(Integer categoriaFormAutorizacaoId) {
this.categoriaFormAutorizacaoId = categoriaFormAutorizacaoId;
}
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj == null) { if (obj == null) {