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

Cadastro de convenio transportadora feat bug#AL-4346' (!230) from AL-4346 into master 

Reviewed-on: adm/ModelWeb#230
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master
fabio 2024-07-18 14:33:37 +00:00
parent abdf8ce442 8ecbb03c03
commit 622fd86887
8 changed files with 23 additions and 39 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>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId>
<version>1.84.0</version>
<version>1.85.0</version>
<distributionManagement>
<repository>

2
src/com/rjconsultores/ventaboletos/dao/hibernate/ContratoHibernateDAO.java
View File

@ -25,7 +25,7 @@ public class ContratoHibernateDAO extends GenericHibernateDAO<ContratoCorporativ
@Override
public List<ContratoCorporativo> buscaLike(String nome) {
Criteria c = makeCriteria();
c.add(Restrictions.eq("activo", Boolean.TRUE));
c.add(Restrictions.eq(ACTIVO, Boolean.TRUE));
if( nome != null ) {
c.add(Restrictions.like("numContrato", "%"+nome+"%"));

10
src/com/rjconsultores/ventaboletos/dao/hibernate/ConvenioTransportadoraHibernateDAO.java
View File

@ -23,7 +23,7 @@ public class ConvenioTransportadoraHibernateDAO extends GenericHibernateDAO<Conv
@Override
public List<ConvenioTransportadora> obtenerTodos() {
Criteria c = getSession().createCriteria(getPersistentClass());
c.add(Restrictions.eq("activo", Boolean.TRUE));
c.add(Restrictions.eq(ACTIVO, Boolean.TRUE));
return castList(ConvenioTransportadora.class, c.list()) ;
}
@ -31,8 +31,8 @@ public class ConvenioTransportadoraHibernateDAO extends GenericHibernateDAO<Conv
@Override
public ConvenioTransportadora buscarPelaTransportadoraId(Long transportadoraId) {
Criteria c = getSession().createCriteria(getPersistentClass());
c.add(Restrictions.eq("transportadoraId", transportadoraId));
c.add(Restrictions.eq("activo", Boolean.TRUE));
c.add(Restrictions.eq("transportadora.transportadoraId", transportadoraId));
c.add(Restrictions.eq(ACTIVO, Boolean.TRUE));
return (ConvenioTransportadora)c.uniqueResult();
}
@ -40,11 +40,11 @@ public class ConvenioTransportadoraHibernateDAO extends GenericHibernateDAO<Conv
@Override
public boolean existe(ConvenioTransportadora convenio) {
Criteria c = getSession().createCriteria(getPersistentClass());
c.add(Restrictions.eq("transportadoraId", convenio.getTransportadoraId()));
c.add(Restrictions.eq("transportadora", convenio.getTransportadora()));
c.add(Restrictions.eq("numConvenio", convenio.getNumConvenio()));
c.add(Restrictions.eq("dataInicial", convenio.getDataInicial()));
c.add(Restrictions.eq("dataFinal", convenio.getDataFinal()));
c.add(Restrictions.eq("activo", Boolean.TRUE));
c.add(Restrictions.eq(ACTIVO, Boolean.TRUE));
return c.uniqueResult()!=null;
}

1
src/com/rjconsultores/ventaboletos/dao/hibernate/GenericHibernateDAO.java
View File

@ -31,6 +31,7 @@ import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
@SuppressWarnings("unchecked")
public class GenericHibernateDAO<T, ID extends Serializable> extends HibernateDaoSupport implements GenericDAO<T, ID> {
public long start = System.currentTimeMillis();
public static final String ACTIVO = "activo";
public GenericHibernateDAO() {
this.persistentClass = (Class<T>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0];

34
src/com/rjconsultores/ventaboletos/entidad/ConvenioTransportadora.java
View File

@ -11,7 +11,9 @@ import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.persistence.Temporal;
@ -19,29 +21,28 @@ import javax.persistence.TemporalType;
import org.hibernate.annotations.Where;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@EqualsAndHashCode
@NoArgsConstructor
@Entity
@SequenceGenerator(name = "CONVENIO_TRANSPORTADORA_SEQ", sequenceName = "CONVENIO_TRANSPORTADORA_SEQ", allocationSize = 1)
@Table(name = "CONVENIO_TRANSPORTADORA")
public class ConvenioTransportadora {
public ConvenioTransportadora(Long transportadoraId) {
this.transportadoraId = transportadoraId;
}
@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "CONVENIO_TRANSPORTADORA_SEQ")
@Column(name = "CONVENIOTRANSPORTADORA_ID")
private Long convenioTransportadoraId;
@Column(name = "TRANSPORTADORA_ID")
private Long transportadoraId;
@OneToOne
@JoinColumn(name = "TRANSPORTADORA_ID")
private Transportadora transportadora;
@Column(name = "NOME_CONVENIO")
private String nomeConvenio;
@ -75,27 +76,6 @@ public class ConvenioTransportadora {
@Where(clause = "ACTIVO=1")
private List<TarifaConvenioTransport> tarifasConvenio;
@Override
public boolean equals(Object obj) {
if (obj == null) {
return false;
}
if (getClass() != obj.getClass()) {
return false;
}
final ConvenioTransportadora other = (ConvenioTransportadora) obj;
return this.getConvenioTransportadoraId().equals(other.getConvenioTransportadoraId());
}
@Override
public int hashCode() {
int hash = 7;
hash = 59 * hash + (this.getConvenioTransportadoraId() != null ? this.getConvenioTransportadoraId().hashCode() : 0);
return hash;
}
@Override
public String toString() {
return this.getNomeConvenio();

7
src/com/rjconsultores/ventaboletos/entidad/TarifaConvenioTransport.java
View File

@ -7,7 +7,6 @@ import java.util.Date;
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
@ -18,11 +17,13 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@EqualsAndHashCode
@Entity
@Table(name = "TARIFA_CONVENIO_TRANSP")
public class TarifaConvenioTransport implements Serializable {
@ -35,8 +36,8 @@ public class TarifaConvenioTransport implements Serializable {
@Column(name = "TARIFACONVENIO_ID")
private Long tarifaConvenioId;
@OneToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "CONVENIOTRANSPORTADORA_ID")
@OneToOne
@JoinColumn(name = "CONVENIOTRANSPORTADORA_ID", referencedColumnName = "CONVENIOTRANSPORTADORA_ID")
private ConvenioTransportadora convenioTransportadora;
@OneToOne

2
src/com/rjconsultores/ventaboletos/entidad/Transportadora.java
View File

@ -16,6 +16,7 @@ import javax.persistence.TemporalType;
import com.rjconsultores.ventaboletos.anotacao.Renderizado;
import com.rjconsultores.ventaboletos.enums.EnumStatus;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@ -23,6 +24,7 @@ import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
@EqualsAndHashCode
@Entity
@Table(name = "TRANSPORTADORA")
@SequenceGenerator(name = "TRANSPORTADORA_SEQ", sequenceName = "TRANSPORTADORA_SEQ", allocationSize = 1)

2
src/com/rjconsultores/ventaboletos/service/impl/TransportadoraServiceImpl.java
View File

@ -50,7 +50,7 @@ public class TransportadoraServiceImpl implements TransportadoraService {
entidad.setFecModif(Calendar.getInstance().getTime());
entidad.setActivo(Boolean.FALSE);
transportadoraDAO.borrar(entidad);
transportadoraDAO.actualizacion(entidad);
}
@Override