correção de sumiço de registros no relatorio de descontos fix

bug#AL-2684
master
Fabio Faria 2023-07-06 18:58:48 -03:00
parent 65f619a631
commit 8193860b81
3 changed files with 7 additions and 3 deletions

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.6.8</version> <version>1.6.9</version>
<distributionManagement> <distributionManagement>
<repository> <repository>
<id>rj-releases</id> <id>rj-releases</id>

View File

@ -66,8 +66,7 @@ public class Convenio implements Serializable {
@Column(name = "IMPRIMEPRECIO") @Column(name = "IMPRIMEPRECIO")
private Short imprimeprecio; private Short imprimeprecio;
@OneToMany(cascade = CascadeType.ALL) @OneToMany(mappedBy = "convenio", cascade = CascadeType.ALL)
@JoinColumn(name = "CONVENIO_ID", referencedColumnName = "CONVENIO_ID")
private List<ConvenioDet> convenioDetList; private List<ConvenioDet> convenioDetList;
@OneToMany(mappedBy = "convenio", cascade = CascadeType.ALL) @OneToMany(mappedBy = "convenio", cascade = CascadeType.ALL)

View File

@ -13,6 +13,8 @@ import javax.persistence.Entity;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType; import javax.persistence.GenerationType;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.SequenceGenerator; import javax.persistence.SequenceGenerator;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Temporal; import javax.persistence.Temporal;
@ -33,6 +35,9 @@ public class ConvenioDet implements Serializable {
@Basic(optional = false) @Basic(optional = false)
@Column(name = "CONVENIODET_ID") @Column(name = "CONVENIODET_ID")
private Integer conveniodetId; private Integer conveniodetId;
@JoinColumn(name = "CONVENIO_ID", referencedColumnName = "CONVENIO_ID")
@ManyToOne
private Convenio convenio;
@Column(name = "PORCDESCUENTO") /* Refere-se ao desconto na tarifa */ @Column(name = "PORCDESCUENTO") /* Refere-se ao desconto na tarifa */
private BigDecimal porcdescuento; private BigDecimal porcdescuento;