From 86262b15bd788d0bdc1d13c08efdd17de45aae45 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 19 Jan 2016 18:16:02 +0000
Subject: [PATCH] fixes bug #7035

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@52009 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/BusquedaDatosTicketDAO.java           |  2 +-
 .../BusquedaDatosTicketHibernateDAO.java      | 41 +++++++++++++------
 .../ventaboletos/entidad/VendaPacote.java     |  2 +-
 .../ws/rs/BusquedaDatosTicketsRS.java         |  8 +++-
 4 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/BusquedaDatosTicketDAO.java b/src/com/rjconsultores/ventaboletos/dao/BusquedaDatosTicketDAO.java
index 63fdb3563..066d347cf 100644
--- a/src/com/rjconsultores/ventaboletos/dao/BusquedaDatosTicketDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/BusquedaDatosTicketDAO.java
@@ -7,6 +7,6 @@ import com.rjconsultores.ventaboletos.vo.busquedapacotes.PacoteVO;
 
 public interface BusquedaDatosTicketDAO {
 
-	public List<PacoteVO> buscaDatosTickets(Date fecInicial, Date fecFinal);
+	public List<PacoteVO> buscaDatosTickets(Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal);
 	
 }
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/BusquedaDatosTicketHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/BusquedaDatosTicketHibernateDAO.java
index 0909c150d..a5a118481 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/BusquedaDatosTicketHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/BusquedaDatosTicketHibernateDAO.java
@@ -48,18 +48,20 @@ public class BusquedaDatosTicketHibernateDAO extends GenericHibernateDAO<Pacote,
 	}
 	
 	@Override
-	public List<PacoteVO> buscaDatosTickets(Date fecInicial, Date fecFinal) {
+	public List<PacoteVO> buscaDatosTickets(Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal) {
 		vendapacoteIds = null;
 		List<PacoteVO> pacotes = new ArrayList<PacoteVO>();
 		
 		try {
-			pacotes = carregarDadosPacotes(fecInicial, fecFinal);
-			carregarDadosPagamento(pacotes);
-			carregarDadosServico(pacotes);
-			carregarDadosPassageiros(pacotes);
-			carregarDadosCliente(pacotes);
-			carregarDadosEnderecoApanhe(pacotes);
-			carregarDadosItemPacotes(pacotes);
+			pacotes = carregarDadosPacotes(fecInicial, fecFinal, fecVentaInicial, fecVentaFinal);
+			if(!pacotes.isEmpty()) {
+				carregarDadosPagamento(pacotes);
+				carregarDadosServico(pacotes);
+				carregarDadosPassageiros(pacotes);
+				carregarDadosCliente(pacotes);
+				carregarDadosEnderecoApanhe(pacotes);
+				carregarDadosItemPacotes(pacotes);
+			}
 			
 		} catch(Exception e) {			
 			log.error(e.getMessage(), e);
@@ -70,7 +72,7 @@ public class BusquedaDatosTicketHibernateDAO extends GenericHibernateDAO<Pacote,
 	}
 
 	@SuppressWarnings("unchecked")
-	private List<PacoteVO> carregarDadosPacotes(Date fecInicial, Date fecFinal) {
+	private List<PacoteVO> carregarDadosPacotes(Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal) {
 		StringBuilder sQuery = new StringBuilder();
 		sQuery.append("SELECT VP.VENDAPACOTE_ID, VP.DATAPACOTE, VP.DATAVENDA, VP.SUBTOTAL, VP.TOTAL, VP.DESCONTO, VP.NUMOPERACION, P.PACOTE_ID, ")
 			  .append("P.NOMPACOTE, P.DESCPACOTE, E.NOMBEMPRESA, VP.SITUACAO, PV.NOMBPUNTOVENTA, VP.USUARIO_ID, ")	  
@@ -88,14 +90,22 @@ public class BusquedaDatosTicketHibernateDAO extends GenericHibernateDAO<Pacote,
 			  .append("LEFT JOIN TARIFA_VENDA_PACOTE TVP ON TVP.VENDAPACOTE_ID = VP.VENDAPACOTE_ID ")
 			  .append("LEFT JOIN BOLETO B ON B.BOLETO_ID = TVP.BOLETO_ID ")
 			  .append("WHERE (B.BOLETO_ID IS NULL OR B.INDSTATUSBOLETO = 'V') ")
-			  .append("AND VP.DATAPACOTE BETWEEN :fecInicial AND :fecFinal ")
-			  .append("GROUP BY VP.VENDAPACOTE_ID, VP.DATAPACOTE, VP.DATAVENDA, VP.SUBTOTAL, VP.TOTAL, ")
+			  .append("AND VP.DATAPACOTE BETWEEN :fecInicial AND :fecFinal ");
+		
+		if(fecVentaInicial != null) {
+			sQuery.append("AND VP.DATAVENDA >= :fecVentaInicial ");
+		}
+		if(fecVentaFinal != null) {
+			sQuery.append("AND VP.DATAVENDA <= :fecVentaFinal ");
+		}
+		
+		sQuery.append("GROUP BY VP.VENDAPACOTE_ID, VP.DATAPACOTE, VP.DATAVENDA, VP.SUBTOTAL, VP.TOTAL, ")
 			  .append("VP.DESCONTO, VP.NUMOPERACION, P.PACOTE_ID, P.NOMPACOTE, P.DESCPACOTE, E.NOMBEMPRESA, VP.SITUACAO, PV.NOMBPUNTOVENTA, VP.USUARIO_ID ");
 		
 		SQLQuery query = getSession().createSQLQuery(sQuery.toString())
 			 .addScalar("VENDAPACOTE_ID", LongType.INSTANCE)
 			 .addScalar("DATAPACOTE", DateType.INSTANCE)
-			 .addScalar("DATAVENDA", DateType.INSTANCE)
+			 .addScalar("DATAVENDA", TimestampType.INSTANCE)
 			 .addScalar("SUBTOTAL", BigDecimalType.INSTANCE)
 			 .addScalar("TOTAL", BigDecimalType.INSTANCE)
 			 .addScalar("DESCONTO", BigDecimalType.INSTANCE)
@@ -119,6 +129,13 @@ public class BusquedaDatosTicketHibernateDAO extends GenericHibernateDAO<Pacote,
 		query.setParameter("fecInicial", fecInicial, DateType.INSTANCE)
 			 .setParameter("fecFinal", fecFinal, DateType.INSTANCE);
 		
+		if(fecVentaInicial != null) {
+			query.setParameter("fecVentaInicial", fecVentaInicial, TimestampType.INSTANCE);
+		}
+		if(fecVentaFinal != null) {
+			query.setParameter("fecVentaFinal", fecVentaFinal, TimestampType.INSTANCE);
+		}
+		
 		return query.list();
 	}
 	
diff --git a/src/com/rjconsultores/ventaboletos/entidad/VendaPacote.java b/src/com/rjconsultores/ventaboletos/entidad/VendaPacote.java
index cb2a2bd9b..6b4fbb180 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/VendaPacote.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/VendaPacote.java
@@ -37,7 +37,7 @@ public class VendaPacote implements Serializable {
 	@Column(name = "VENDAPACOTE_ID")
 	private Long vendapacoteId;
 	
-	@Temporal(TemporalType.DATE)
+	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name = "DATAVENDA")
 	private Date datavenda;
 	
diff --git a/src/com/rjconsultores/ventaboletos/ws/rs/BusquedaDatosTicketsRS.java b/src/com/rjconsultores/ventaboletos/ws/rs/BusquedaDatosTicketsRS.java
index 80b411a43..f797e0263 100644
--- a/src/com/rjconsultores/ventaboletos/ws/rs/BusquedaDatosTicketsRS.java
+++ b/src/com/rjconsultores/ventaboletos/ws/rs/BusquedaDatosTicketsRS.java
@@ -11,6 +11,8 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
+import org.apache.commons.lang.StringUtils;
+
 import com.rjconsultores.ventaboletos.dao.BusquedaDatosTicketDAO;
 import com.rjconsultores.ventaboletos.vo.busquedapacotes.PacoteVO;
 import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext;
@@ -21,15 +23,17 @@ public class BusquedaDatosTicketsRS {
 	@GET
 	@Path("/busquedadatostickets")
 	@Produces({ MediaType.APPLICATION_XML })
-	public List<PacoteVO> busquedaDatosTickets(@QueryParam("fecinicial") String fechaIniParam, @QueryParam("fecfinal") String fechaFinParam) throws ParseException{
+	public List<PacoteVO> busquedaDatosTickets(@QueryParam("fecinicial") String fechaIniParam, @QueryParam("fecfinal") String fechaFinParam, @QueryParam("fecventainicial") String fechaVentaIniParam, @QueryParam("fecventafinal") String fechaVentaFinParam) throws ParseException{
 		
 		SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
 		
 		Date fecInicial = sdf.parse(fechaIniParam);
 		Date fecFinal = sdf.parse(fechaFinParam);
+		Date fecVentaInicial = StringUtils.isNotBlank(fechaVentaIniParam) ? sdf.parse(fechaVentaIniParam) : null;
+		Date fecVentaFinal = StringUtils.isNotBlank(fechaVentaFinParam) ? sdf.parse(fechaVentaFinParam) : null;
 		
 		BusquedaDatosTicketDAO pacoteDao = (BusquedaDatosTicketDAO)AppContext.getApplicationContext().getBean("busquedaDatosTicketDAO");
-		List<PacoteVO> pacotes = pacoteDao.buscaDatosTickets(fecInicial, fecFinal);
+		List<PacoteVO> pacotes = pacoteDao.buscaDatosTickets(fecInicial, fecFinal, fecVentaInicial, fecVentaFinal);
 		
 		return pacotes;
 	}