From 32d7ff952023f0e0769a0a0a618c07a53a5aec47 Mon Sep 17 00:00:00 2001 From: alberto Date: Wed, 24 May 2017 22:04:43 +0000 Subject: [PATCH] =?UTF-8?q?Gerar=20lan=C3=A7amento=20comiss=C3=A3o=20no=20?= =?UTF-8?q?conta=20corrente=20da=20ag=C3=AAncia=20(issue=208900)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@69286 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../dao/PtovtaEmpresaContaBancariaDAO.java | 15 ++ ...tovtaEmpresaContaBancariaHibernateDAO.java | 45 ++++++ .../ventaboletos/entidad/PtovtaEmpresa.java | 135 ++++++++++++------ .../entidad/PtovtaEmpresaContaBancaria.java | 132 +++++++++++++++++ .../ventaboletos/entidad/PuntoVenta.java | 9 ++ .../PtovtaEmpresaContaBancariaService.java | 15 ++ ...PtovtaEmpresaContaBancariaServiceImpl.java | 67 +++++++++ 7 files changed, 378 insertions(+), 40 deletions(-) create mode 100644 src/com/rjconsultores/ventaboletos/dao/PtovtaEmpresaContaBancariaDAO.java create mode 100644 src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaContaBancariaHibernateDAO.java create mode 100644 src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresaContaBancaria.java create mode 100644 src/com/rjconsultores/ventaboletos/service/PtovtaEmpresaContaBancariaService.java create mode 100644 src/com/rjconsultores/ventaboletos/service/impl/PtovtaEmpresaContaBancariaServiceImpl.java diff --git a/src/com/rjconsultores/ventaboletos/dao/PtovtaEmpresaContaBancariaDAO.java b/src/com/rjconsultores/ventaboletos/dao/PtovtaEmpresaContaBancariaDAO.java new file mode 100644 index 000000000..59f97ec6a --- /dev/null +++ b/src/com/rjconsultores/ventaboletos/dao/PtovtaEmpresaContaBancariaDAO.java @@ -0,0 +1,15 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.dao; + +import com.rjconsultores.ventaboletos.entidad.PtovtaEmpresaContaBancaria; + +/** + * + * @author Desenvolvimento + */ +public interface PtovtaEmpresaContaBancariaDAO extends GenericDAO { + public void borrarFisico(PtovtaEmpresaContaBancaria pto); +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaContaBancariaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaContaBancariaHibernateDAO.java new file mode 100644 index 000000000..d7066dbce --- /dev/null +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaContaBancariaHibernateDAO.java @@ -0,0 +1,45 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.dao.hibernate; + +import java.util.List; + +import org.hibernate.Criteria; +import org.hibernate.Query; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import com.rjconsultores.ventaboletos.dao.PtovtaEmpresaContaBancariaDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaEmpresaContaBancaria; + +/** + * + * @author Desenvolvimento + */ +@Repository("ptovtaEmpresaContaBancariaHibernateDAO") +public class PtovtaEmpresaContaBancariaHibernateDAO extends GenericHibernateDAO implements PtovtaEmpresaContaBancariaDAO { + @Autowired + public PtovtaEmpresaContaBancariaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("activo", Boolean.TRUE)); + + return c.list(); + } + + public void borrarFisico(PtovtaEmpresaContaBancaria pto) { + String hql = " delete from PtovtaEmpresaContaBancaria " + + " where ptovtaEmpresaContaBancariaId = " + pto.getPtovtaEmpresaContaBancariaId(); + Query sq = getSession().createQuery(hql); + sq.executeUpdate(); + } +} diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java b/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java index cbe6eaf74..a2b9e67a9 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java +++ b/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresa.java @@ -5,19 +5,26 @@ package com.rjconsultores.ventaboletos.entidad; import java.io.Serializable; +import java.util.ArrayList; import java.util.Date; +import java.util.List; + import javax.persistence.Basic; +import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import javax.persistence.Transient; /** * @@ -66,13 +73,20 @@ public class PtovtaEmpresa implements Serializable { @Column(name = "NUMSITEF") private String numeroSitef; - @JoinColumn(name = "EMPRESACONTABANCARIA_ID", referencedColumnName = "EMPRESACONTABANCARIA_ID") - @ManyToOne - private EmpresaContaBancaria empresaContaBancaria; + @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) + @JoinColumn(name = "PTOVTAEMPRESA_ID", referencedColumnName = "PTOVTAEMPRESA_ID") + private List lsPtovtaEmpresaContaBancaria; + +// @JoinColumn(name = "EMPRESACONTABANCARIA_ID", referencedColumnName = "EMPRESACONTABANCARIA_ID") +// @ManyToOne +// private EmpresaContaBancaria empresaContaBancaria; @Column(name = "INDIMPCOMPCARTAO") private Boolean indImpCompCartao; + @Transient + private List contasBancaria; + public PtovtaEmpresa() { } @@ -128,43 +142,13 @@ public class PtovtaEmpresa implements Serializable { this.puntoVenta = puntoVenta; } - public EmpresaContaBancaria getEmpresaContaBancaria() { - return empresaContaBancaria; - } - - public void setEmpresaContaBancaria(EmpresaContaBancaria empresaContaBancaria) { - this.empresaContaBancaria = empresaContaBancaria; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((ptovtaempresaId == null) ? 0 : ptovtaempresaId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - PtovtaEmpresa other = (PtovtaEmpresa) obj; - if (ptovtaempresaId == null) { - if (other.ptovtaempresaId != null) - return false; - } else if (!ptovtaempresaId.equals(other.ptovtaempresaId)) - return false; - return true; - } - - @Override - public String toString() { - return "com.rjconsultores.ventaboletos.entidad.PtovtaEmpresa[ptovtaempresaId=" + ptovtaempresaId + "]"; - } +// public EmpresaContaBancaria getEmpresaContaBancaria() { +// return empresaContaBancaria; +// } +// +// public void setEmpresaContaBancaria(EmpresaContaBancaria empresaContaBancaria) { +// this.empresaContaBancaria = empresaContaBancaria; +// } public Boolean getIndTerceirizada() { return indTerceirizada; @@ -212,4 +196,75 @@ public class PtovtaEmpresa implements Serializable { this.indImpCompCartao = indImpCompCartao; } + public List getLsPtovtaEmpresaContaBancaria() { + if (lsPtovtaEmpresaContaBancaria == null) { + lsPtovtaEmpresaContaBancaria = new ArrayList(0); + } + + return lsPtovtaEmpresaContaBancaria; + } + + public void setLsPtovtaEmpresaContaBancaria(List lsPtovtaEmpresaContaBancaria) { + this.lsPtovtaEmpresaContaBancaria = lsPtovtaEmpresaContaBancaria; + } + + public List getContasBancaria() { + if (contasBancaria == null) { + contasBancaria = new ArrayList(0); + } + + return contasBancaria; + } + + public void setContasBancaria(List contasBancaria) { + this.contasBancaria = contasBancaria; + } + + public String getContasBancariaInfo() { + if (!getContasBancaria().isEmpty()) { + StringBuilder sb = new StringBuilder(); + + for (EmpresaContaBancaria ecb : getContasBancaria()) { + if (!sb.toString().isEmpty()) { + sb.append(", "); + } + + sb.append(ecb.getInstituicaoFinandeira().getNome()); + } + + return sb.toString(); + } + + return null; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((ptovtaempresaId == null) ? 0 : ptovtaempresaId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + PtovtaEmpresa other = (PtovtaEmpresa) obj; + if (ptovtaempresaId == null) { + if (other.ptovtaempresaId != null) + return false; + } else if (!ptovtaempresaId.equals(other.ptovtaempresaId)) + return false; + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.PtovtaEmpresa[ptovtaempresaId=" + ptovtaempresaId + "]"; + } } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresaContaBancaria.java b/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresaContaBancaria.java new file mode 100644 index 000000000..2bacc9bce --- /dev/null +++ b/src/com/rjconsultores/ventaboletos/entidad/PtovtaEmpresaContaBancaria.java @@ -0,0 +1,132 @@ +package com.rjconsultores.ventaboletos.entidad; + +import java.io.Serializable; +import java.util.Date; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * + * @author Desenvolvimento + */ +@Entity +@SequenceGenerator(name = "PTOVTAEMPCONBAN_SEQ", sequenceName = "PTOVTAEMPCONBAN_SEQ", allocationSize = 1) +@Table(name = "PTOVTA_EMPRESA_CONTABANCARIA") +public class PtovtaEmpresaContaBancaria implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @Basic(optional = false) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "PTOVTAEMPCONBAN_SEQ") + @Column(name = "PTOVTAEMPRESACONTABANCARIA_ID") + private Integer ptovtaEmpresaContaBancariaId; + + @JoinColumn(name = "PTOVTAEMPRESA_ID", referencedColumnName = "PTOVTAEMPRESA_ID") + @ManyToOne + private PtovtaEmpresa ptovtaEmpresa; + + @JoinColumn(name = "EMPRESACONTABANCARIA_ID", referencedColumnName = "EMPRESACONTABANCARIA_ID") + @ManyToOne + private EmpresaContaBancaria empresaContaBancaria; + + @Column(name = "ACTIVO") + private Boolean activo; + + @Column(name = "FECMODIF") + @Temporal(TemporalType.TIMESTAMP) + private Date fecmodif; + + @Column(name = "USUARIO_ID") + private Integer usuarioId; + + public PtovtaEmpresaContaBancaria() { + } + + public Integer getPtovtaEmpresaContaBancariaId() { + return ptovtaEmpresaContaBancariaId; + } + + public void setPtovtaEmpresaContaBancariaId(Integer ptovtaEmpresaContaBancariaId) { + this.ptovtaEmpresaContaBancariaId = ptovtaEmpresaContaBancariaId; + } + + public PtovtaEmpresa getPtovtaEmpresa() { + return ptovtaEmpresa; + } + + public void setPtovtaEmpresa(PtovtaEmpresa ptovtaEmpresa) { + this.ptovtaEmpresa = ptovtaEmpresa; + } + + public EmpresaContaBancaria getEmpresaContaBancaria() { + return empresaContaBancaria; + } + + public void setEmpresaContaBancaria(EmpresaContaBancaria empresaContaBancaria) { + this.empresaContaBancaria = empresaContaBancaria; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + + public Date getFecmodif() { + return fecmodif; + } + + public void setFecmodif(Date fecmodif) { + this.fecmodif = fecmodif; + } + + public Integer getUsuarioId() { + return usuarioId; + } + + public void setUsuarioId(Integer usuarioId) { + this.usuarioId = usuarioId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((ptovtaEmpresaContaBancariaId == null) ? 0 : ptovtaEmpresaContaBancariaId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + PtovtaEmpresaContaBancaria other = (PtovtaEmpresaContaBancaria) obj; + if (ptovtaEmpresaContaBancariaId == null) { + if (other.ptovtaEmpresaContaBancariaId != null) + return false; + } else if (!ptovtaEmpresaContaBancariaId.equals(other.ptovtaEmpresaContaBancariaId)) + return false; + return true; + } + + @Override + public String toString() { + return "com.rjconsultores.ventaboletos.entidad.PtovtaEmpresaContaBancaria[ptovtaEmpresaContaBancariaId=" + ptovtaEmpresaContaBancariaId + "]"; + } +} \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java b/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java index 762f268ad..b60b25e9f 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java +++ b/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java @@ -460,14 +460,23 @@ public class PuntoVenta implements Serializable { public List getLsPtovtaEmpresa() { List tmp = new ArrayList(); + if (this.lsPtovtaEmpresa != null) { for (PtovtaEmpresa ddab : this.lsPtovtaEmpresa) { if (ddab.getActivo()) { + ddab.getContasBancaria().clear(); + + for (PtovtaEmpresaContaBancaria cb : ddab.getLsPtovtaEmpresaContaBancaria()) { + ddab.getContasBancaria().add(cb.getEmpresaContaBancaria()); + } + tmp.add(ddab); } } } + this.lsPtovtaEmpresa = tmp; + return tmp; } diff --git a/src/com/rjconsultores/ventaboletos/service/PtovtaEmpresaContaBancariaService.java b/src/com/rjconsultores/ventaboletos/service/PtovtaEmpresaContaBancariaService.java new file mode 100644 index 000000000..79dc131ce --- /dev/null +++ b/src/com/rjconsultores/ventaboletos/service/PtovtaEmpresaContaBancariaService.java @@ -0,0 +1,15 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service; + +import com.rjconsultores.ventaboletos.entidad.PtovtaEmpresaContaBancaria; + +/** + * + * @author Desenvolvimento + */ +public interface PtovtaEmpresaContaBancariaService extends GenericService { + public void borrarFisico(PtovtaEmpresaContaBancaria pto); +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PtovtaEmpresaContaBancariaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/PtovtaEmpresaContaBancariaServiceImpl.java new file mode 100644 index 000000000..5c3f928e5 --- /dev/null +++ b/src/com/rjconsultores/ventaboletos/service/impl/PtovtaEmpresaContaBancariaServiceImpl.java @@ -0,0 +1,67 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.PtovtaEmpresaContaBancariaDAO; +import com.rjconsultores.ventaboletos.entidad.PtovtaEmpresaContaBancaria; +import com.rjconsultores.ventaboletos.service.PtovtaEmpresaContaBancariaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +/** + * + * @author Desenvolvimento + */ +@Service("ptovtaEmpresaContaBancariaService") +public class PtovtaEmpresaContaBancariaServiceImpl implements PtovtaEmpresaContaBancariaService { + + @Autowired + private PtovtaEmpresaContaBancariaDAO ptovtaEmpresaContaBancariaDAO; + + public List obtenerTodos() { + return ptovtaEmpresaContaBancariaDAO.obtenerTodos(); + } + + public PtovtaEmpresaContaBancaria obtenerID(Integer id) { + return ptovtaEmpresaContaBancariaDAO.obtenerID(id); + } + + @Transactional + public PtovtaEmpresaContaBancaria suscribir(PtovtaEmpresaContaBancaria entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return ptovtaEmpresaContaBancariaDAO.suscribir(entidad); + } + + @Transactional + public PtovtaEmpresaContaBancaria actualizacion(PtovtaEmpresaContaBancaria entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return ptovtaEmpresaContaBancariaDAO.actualizacion(entidad); + } + + @Transactional + public void borrar(PtovtaEmpresaContaBancaria entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecmodif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.FALSE); + + ptovtaEmpresaContaBancariaDAO.actualizacion(entidad); + } + + public void borrarFisico(PtovtaEmpresaContaBancaria pto) { + ptovtaEmpresaContaBancariaDAO.borrarFisico(pto); + } +}