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

fixed bug #7192 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@56926 d1611594-4594-4d17-8e1d-87c2c4800839
master
frederico 2016-06-14 12:57:07 +00:00
parent dd1476a8c7
commit 217ce17a26
5 changed files with 190 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/rjconsultores/ventaboletos/dao/PricingEspecificoDAO.java
View File

@ -4,7 +4,12 @@
*/
package com.rjconsultores.ventaboletos.dao;
import com.rjconsultores.ventaboletos.entidad.ClaseServicio;
import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.entidad.Parada;
import com.rjconsultores.ventaboletos.entidad.PricingEspecifico;
import java.util.Date;
import java.util.List;
/**
@ -14,4 +19,8 @@ import java.util.List;
public interface PricingEspecificoDAO extends GenericDAO<PricingEspecifico, Long> {
public List<PricingEspecifico> buscarPorNome(PricingEspecifico pricingEspecifico);
public List<PricingEspecifico> buscarPorNome(String nome);
public List<PricingEspecifico> buscar(List<Empresa> empresas, List<ClaseServicio> tipoClasses, List<Parada> origens, List<Parada> destinos, Date vigenciaInicial, Date vigenciaFinal);
}

121
src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoHibernateDAO.java
View File

@ -5,9 +5,19 @@
package com.rjconsultores.ventaboletos.dao.hibernate;
import com.rjconsultores.ventaboletos.dao.PricingEspecificoDAO;
import com.rjconsultores.ventaboletos.entidad.ClaseServicio;
import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente;
import com.rjconsultores.ventaboletos.entidad.Parada;
import com.rjconsultores.ventaboletos.entidad.PricingEspecifico;
import com.rjconsultores.ventaboletos.entidad.Ruta;
import com.rjconsultores.ventaboletos.entidad.VigenciaTarifa;
import java.util.Date;
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;
@ -20,26 +30,103 @@ import org.springframework.stereotype.Repository;
*/
@Repository("pricingEspecificoDAO")
public class PricingEspecificoHibernateDAO extends GenericHibernateDAO<PricingEspecifico, Long>
implements PricingEspecificoDAO {
implements PricingEspecificoDAO {
@Autowired
public PricingEspecificoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
setSessionFactory(factory);
}
@Autowired
public PricingEspecificoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
setSessionFactory(factory);
}
@Override
public List<PricingEspecifico> obtenerTodos() {
Criteria c = getSession().createCriteria(getPersistentClass());
c.add(Restrictions.eq("activo", Boolean.TRUE));
@Override
public List<PricingEspecifico> obtenerTodos() {
Criteria c = getSession().createCriteria(getPersistentClass());
c.add(Restrictions.eq("activo", Boolean.TRUE));
return c.list();
}
return c.list();
}
public List<PricingEspecifico> buscarPorNome(PricingEspecifico pricingEspecifico) {
Criteria c = getSession().createCriteria(getPersistentClass());
c.add(Restrictions.eq("activo", Boolean.TRUE));
c.add(Restrictions.eq("nombPricing", pricingEspecifico.getNombPricing()));
public List<PricingEspecifico> buscarPorNome(PricingEspecifico pricingEspecifico) {
Criteria c = getSession().createCriteria(getPersistentClass());
c.add(Restrictions.eq("activo", Boolean.TRUE));
c.add(Restrictions.eq("nombPricing", pricingEspecifico.getNombPricing()));
return c.list();
}
return c.list();
}
@Override
public List<PricingEspecifico> buscarPorNome(String nome) {
Criteria c = getSession().createCriteria(getPersistentClass());
c.add(Restrictions.eq("activo", Boolean.TRUE));
c.add(Restrictions.eq("nombPricing", nome));
return c.list();
}
@Override
public List<PricingEspecifico> buscar(List<Empresa> empresas, List<ClaseServicio> tipoClasses, List<Parada> origens, List<Parada> destinos, Date vigenciaInicial, Date vigenciaFinal) {
StringBuilder hql = new StringBuilder();
hql.append("SELECT DISTINCT pe ");
hql.append("FROM PricingEspecifico pe ");
hql.append(" WHERE pe.activo = 1 ");
if (!empresas.isEmpty()) {
hql.append(" AND pe.marca.empresa.empresaId IN (");
for (Empresa e : empresas) {
hql.append(e.getEmpresaId() + ",");
}
hql.deleteCharAt(hql.length() - 1);
hql.append(")");
}
if (!tipoClasses.isEmpty()) {
hql.append(" AND pe.claseServicio.claseservicioId IN (");
for (ClaseServicio c : tipoClasses) {
hql.append(c.getClaseservicioId() + ",");
}
hql.deleteCharAt(hql.length() - 1);
hql.append(")");
}
if (!origens.isEmpty()) {
hql.append(" AND pe.parada.paradaId IN (");
for (Parada o : origens) {
hql.append(o.getParadaId() + ",");
}
hql.deleteCharAt(hql.length() - 1);
hql.append(")");
}
if (!destinos.isEmpty()) {
hql.append(" AND pe.parada1.paradaId IN (");
for (Parada o : origens) {
hql.append(o.getParadaId() + ",");
}
hql.deleteCharAt(hql.length() - 1);
hql.append(")");
}
if (vigenciaInicial != null) {
hql.append(" AND YEAR(pe.fechorinicio) >= YEAR(:vigenciaInicial) ");
hql.append(" AND MONTH(pe.fechorinicio)>= MONTH(:vigenciaInicial) ");
hql.append(" AND DAY(pe.fechorinicio) >= DAY(:vigenciaInicial) ");
}
if (vigenciaFinal != null) {
hql.append(" AND YEAR(pe.fechorfin) <= YEAR(:vigenciaFinal) ");
hql.append(" AND MONTH(pe.fechorfin) <= MONTH(:vigenciaFinal) ");
hql.append(" AND DAY(pe.fechorfin) <= DAY(:vigenciaFinal) ");
}
Query query = getSession().createQuery(hql.toString());
if (vigenciaInicial != null) {
query.setDate("vigenciaInicial", vigenciaInicial);
}
if (vigenciaFinal != null) {
query.setDate("vigenciaFinal", vigenciaFinal);
}
return query.list();
}
}

3
src/com/rjconsultores/ventaboletos/entidad/PricingEspecifico.java
View File

@ -34,7 +34,7 @@ import javax.persistence.Transient;
@Entity
@SequenceGenerator(name = "PRICING_ESPECIFICO_SEQ", sequenceName = "PRICING_ESPECIFICO_SEQ", allocationSize = 1)
@Table(name = "PRICING_ESPECIFICO")
public class PricingEspecifico implements Serializable {
public class PricingEspecifico implements Serializable, Cloneable {
private static final long serialVersionUID = 1L;
@Id
@ -275,4 +275,5 @@ public class PricingEspecifico implements Serializable {
}
return peoList;
}
}

12
src/com/rjconsultores/ventaboletos/service/PricingEspecificoService.java
View File

@ -4,7 +4,11 @@
*/
package com.rjconsultores.ventaboletos.service;
import com.rjconsultores.ventaboletos.entidad.ClaseServicio;
import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.entidad.Parada;
import com.rjconsultores.ventaboletos.entidad.PricingEspecifico;
import java.util.Date;
import java.util.List;
/**
@ -13,5 +17,11 @@ import java.util.List;
*/
public interface PricingEspecificoService extends GenericService<PricingEspecifico, Long> {
public List<PricingEspecifico> buscarPorNome(PricingEspecifico pricingEspecifico);
public List<PricingEspecifico> buscarPorNome(PricingEspecifico pricingEspecifico);
public List<PricingEspecifico> buscarPorNome(String nome);
public PricingEspecifico clonarPricing(Long id, String nome);
public List<PricingEspecifico> buscar(List<Empresa> empresas, List<ClaseServicio> tipoClasses, List<Parada> origens, List<Parada> destinos, Date vigenciaInicial, Date vigenciaFinal);
}

64
src/com/rjconsultores/ventaboletos/service/impl/PricingEspecificoServiceImpl.java
View File

@ -5,11 +5,20 @@
package com.rjconsultores.ventaboletos.service.impl;
import com.rjconsultores.ventaboletos.dao.PricingEspecificoDAO;
import com.rjconsultores.ventaboletos.entidad.ClaseServicio;
import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.entidad.Parada;
import com.rjconsultores.ventaboletos.entidad.PricingEspecifico;
import com.rjconsultores.ventaboletos.entidad.PricingEspecificoOcupacion;
import com.rjconsultores.ventaboletos.entidad.VigenciaTarifa;
import com.rjconsultores.ventaboletos.service.PricingEspecificoService;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -62,4 +71,59 @@ public class PricingEspecificoServiceImpl implements PricingEspecificoService {
public List<PricingEspecifico> buscarPorNome(PricingEspecifico pricingEspecifico) {
return pricingEspecificoDAO.buscarPorNome(pricingEspecifico);
}
@Override
public List<PricingEspecifico> buscarPorNome(String nome) {
// TODO Auto-generated method stub
return null;
}
@Override
@Transactional
public PricingEspecifico clonarPricing(Long id, String nome) {
PricingEspecifico pricingToClone = obtenerID(id);
PricingEspecifico clonePricing = new PricingEspecifico();
clonePricing.setNombPricing(nome);
clonePricing.setCategoria(pricingToClone.getCategoria());
clonePricing.setClaseServicio(pricingToClone.getClaseServicio());
clonePricing.setCorridaId(pricingToClone.getCorridaId());
clonePricing.setFechorfin(pricingToClone.getFechorfin());
clonePricing.setFechorinicio(pricingToClone.getFechorinicio());
clonePricing.setMarca(pricingToClone.getMarca());
clonePricing.setMoneda(pricingToClone.getMoneda());
clonePricing.setParada(pricingToClone.getParada());
clonePricing.setParada1(pricingToClone.getParada1());
clonePricing.setPricingEspecificoOcupacionsList(getPricingEspecificoOcupacion(pricingToClone, clonePricing));
clonePricing.setTarifa(pricingToClone.getTarifa());
clonePricing.setTarifaredabierto(pricingToClone.getTarifaredabierto());
clonePricing.setTipoPtovta(pricingToClone.getTipoPtovta());
return suscribir(clonePricing);
}
private List<PricingEspecificoOcupacion> getPricingEspecificoOcupacion(PricingEspecifico pricingToClone, PricingEspecifico clonePricing){
List<PricingEspecificoOcupacion> list = new ArrayList<PricingEspecificoOcupacion>();
for(PricingEspecificoOcupacion peo : pricingToClone.getPricingEspecificoOcupacionsList()){
PricingEspecificoOcupacion newPeo = new PricingEspecificoOcupacion();
newPeo.setActivo(peo.getActivo());
newPeo.setFecmodif(new Date());
newPeo.setOcupacionfinal(peo.getOcupacionfinal());
newPeo.setOcupacioninicial(peo.getOcupacioninicial());
newPeo.setPricingEspecifico(clonePricing);
newPeo.setTarifa(peo.getTarifa());
newPeo.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
list.add(newPeo);
}
return list;
}
@Override
public List<PricingEspecifico> buscar(List<Empresa> empresas, List<ClaseServicio> tipoClasses, List<Parada> origens, List<Parada> destinos, Date vigenciaInicial, Date vigenciaFinal) {
return pricingEspecificoDAO.buscar(empresas, tipoClasses, origens, destinos, vigenciaInicial, vigenciaFinal);
}
}