From 04f874e2864f8f950033a5473351aaa405816944 Mon Sep 17 00:00:00 2001
From: valdir <valdir@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 7 Aug 2020 20:04:36 +0000
Subject: [PATCH] 0020082: Cadastro de Forma Pagamento bug#20082 dev:valdevir
 qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@102844 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../ventaboletos/dao/SecretariaDAO.java             |  2 +-
 .../dao/hibernate/SecretariaHibernateDAO.java       |  3 ++-
 .../ventaboletos/entidad/FormaPago.java             | 13 +++++++++++--
 .../ventaboletos/entidad/Secretaria.java            | 12 ++++++++++++
 .../ventaboletos/service/SecretariaService.java     |  2 +-
 .../service/impl/SecretariaServiceImpl.java         |  4 ++--
 6 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/SecretariaDAO.java b/src/com/rjconsultores/ventaboletos/dao/SecretariaDAO.java
index 10033c7ae..61ca7a966 100644
--- a/src/com/rjconsultores/ventaboletos/dao/SecretariaDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/SecretariaDAO.java
@@ -17,7 +17,7 @@ public interface SecretariaDAO extends GenericDAO<Secretaria, Integer> {
 
     public List<Secretaria> buscar(String descsecretaria);
     
-    public Secretaria buscarSecretariaVoucherRod();
+    public Secretaria buscarSecretariaVoucherRod(Short formaPagoId);
     
     public List<Secretaria> buscaLike(String descsecretaria);
 }
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/SecretariaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/SecretariaHibernateDAO.java
index fb6364a5a..f9dec6e53 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/SecretariaHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/SecretariaHibernateDAO.java
@@ -56,11 +56,12 @@ public class SecretariaHibernateDAO extends GenericHibernateDAO<Secretaria, Inte
     }
 
 	@Override
-	public Secretaria buscarSecretariaVoucherRod() {
+	public Secretaria buscarSecretariaVoucherRod(Short formaPagoId) {
 		Criteria c = getSession().createCriteria(getPersistentClass());
 
         c.add(Restrictions.eq("activo", Boolean.TRUE));
         c.add(Restrictions.eq("indVoucherRod", Boolean.TRUE));
+        c.add(Restrictions.eq("formaPago.formapagoId", formaPagoId));
 
         List<Secretaria> result = c.list();
         return result.isEmpty() ? null : (Secretaria)result.get(0);
diff --git a/src/com/rjconsultores/ventaboletos/entidad/FormaPago.java b/src/com/rjconsultores/ventaboletos/entidad/FormaPago.java
index 87697fcd8..0927d5eef 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/FormaPago.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/FormaPago.java
@@ -77,6 +77,9 @@ public class FormaPago implements Serializable {
 	@Column(name = "INDESTORNO")
 	private Boolean indProcessoEstorno;
 	
+	@Column(name = "INDVOUCHERRODOVIARIA")
+	private Boolean indVoucherRodoviaria;
+	
 	public FormaPago() {
 		super();
 	}
@@ -267,6 +270,12 @@ public class FormaPago implements Serializable {
 	public void setIndProcessoEstorno(Boolean indProcessoEstorno) {
 		this.indProcessoEstorno = indProcessoEstorno;
 	}
-	
-	
+
+	public Boolean getIndVoucherRodoviaria() {
+		return indVoucherRodoviaria == null ? false : indVoucherRodoviaria;
+	}
+
+	public void setIndVoucherRodoviaria(Boolean indVoucherRodoviaria) {
+		this.indVoucherRodoviaria = indVoucherRodoviaria;
+	}
 }
diff --git a/src/com/rjconsultores/ventaboletos/entidad/Secretaria.java b/src/com/rjconsultores/ventaboletos/entidad/Secretaria.java
index 1f300e136..8f423ad98 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/Secretaria.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/Secretaria.java
@@ -19,6 +19,7 @@ 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;
@@ -79,6 +80,10 @@ public class Secretaria implements Serializable {
 	@Column (name = "CIUDAD")
 	private String ciudad;
 	
+	@OneToOne
+	@JoinColumn(name = "FORMAPAGO_ID")
+	private FormaPago formaPago;
+	
 	public Secretaria() {
 		this.indVoucherRod = false;
 	}
@@ -272,5 +277,12 @@ public class Secretaria implements Serializable {
 	public void setCiudad(String ciudad) {
 		this.ciudad = ciudad;
 	}
+	
+	public FormaPago getFormaPago() {
+		return formaPago;
+	}
 
+	public void setFormaPago(FormaPago formaPago) {
+		this.formaPago = formaPago;
+	}
 }
diff --git a/src/com/rjconsultores/ventaboletos/service/SecretariaService.java b/src/com/rjconsultores/ventaboletos/service/SecretariaService.java
index 08bed54d1..35b17db0e 100644
--- a/src/com/rjconsultores/ventaboletos/service/SecretariaService.java
+++ b/src/com/rjconsultores/ventaboletos/service/SecretariaService.java
@@ -18,7 +18,7 @@ public interface SecretariaService extends GenericService<Secretaria, Integer> {
 
     public List<Secretaria> buscar(String descsecretaria);
     
-    public Secretaria buscarSecretariaVoucherRod();
+    public Secretaria buscarSecretariaVoucherRod(Short formaPagoId);
     
 	public List<Secretaria> buscaLike(String descsecretaria);
 }
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/SecretariaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/SecretariaServiceImpl.java
index a6ced4809..5b9e77ea1 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/SecretariaServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/SecretariaServiceImpl.java
@@ -75,8 +75,8 @@ public class SecretariaServiceImpl implements SecretariaService {
     }
 
 	@Override
-	public Secretaria buscarSecretariaVoucherRod() {
-		return secretariaDAO.buscarSecretariaVoucherRod();
+	public Secretaria buscarSecretariaVoucherRod(Short formaPagoId) {
+		return secretariaDAO.buscarSecretariaVoucherRod(formaPagoId);
 	}
 	
     public List<Secretaria> buscaLike(String descsecretaria) {