diff --git a/pom.xml b/pom.xml index c5408de83..732534438 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.com.rjconsultores ModelWeb - 1.90.1 + 1.91.0 diff --git a/src/com/rjconsultores/ventaboletos/dao/RutaDAO.java b/src/com/rjconsultores/ventaboletos/dao/RutaDAO.java index 9a0bbacad..d4b4e3981 100644 --- a/src/com/rjconsultores/ventaboletos/dao/RutaDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/RutaDAO.java @@ -79,5 +79,7 @@ public interface RutaDAO extends GenericDAO { public List buscarPorIds(Integer[] rutaIds); public List buscarPorOrgaoEcasetaPeaje(OrgaoConcedente orgao, Integer[] listCasetaPeaje, Empresa empresa); + + public List buscarRutasPorEmpresaOrgaoConcedenteClaseServicio(Empresa empresa, OrgaoConcedente orgao, ClaseServicio claseServicio); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java index e6d04ab0c..f221bf9f5 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java @@ -524,5 +524,29 @@ public class RutaHibernateDAO extends GenericHibernateDAO impleme } + + @Override + public List buscarRutasPorEmpresaOrgaoConcedenteClaseServicio(Empresa empresa, OrgaoConcedente orgao, ClaseServicio claseServicio) { + + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.ne("rutaId", -1)); + + if (empresa != null && empresa.getEmpresaId() != -1) { + c.createCriteria("lsRutaEmpresa").add(Restrictions.eq("empresa", empresa)); + } + + if (orgao != null && orgao.getOrgaoConcedenteId() != -1) { + c.add(Restrictions.eq("orgaoConcedente", orgao)); + } + + if (claseServicio != null && claseServicio.getClaseservicioId() != -1) { + c.add(Restrictions.eq("claseServicio", claseServicio)); + } + + c.addOrder(Order.asc("descruta")); + + return c.list(); + } } diff --git a/src/com/rjconsultores/ventaboletos/entidad/AliasClasse.java b/src/com/rjconsultores/ventaboletos/entidad/AliasClasse.java index b3134b426..9b01de354 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/AliasClasse.java +++ b/src/com/rjconsultores/ventaboletos/entidad/AliasClasse.java @@ -16,6 +16,11 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import org.hibernate.annotations.Parameter; +import org.hibernate.annotations.Type; + +import com.rjconsultores.ventaboletos.enums.EnumClasseServicoConfortoMonitrip; + @Entity @SequenceGenerator(name = "ALIAS_CLASSE_SEQ", sequenceName = "ALIAS_CLASSE_SEQ", allocationSize = 1) @Table(name = "ALIAS_CLASSE_SERVICO") @@ -40,6 +45,14 @@ public class AliasClasse implements Serializable { @JoinColumn(name = "ORGAOCONCEDENTE_ID") private OrgaoConcedente orgaoConcedente; + @OneToOne + @JoinColumn(name = "RUTA_ID") + private Ruta ruta; + + @OneToOne + @JoinColumn(name = "EMPRESA_ID") + private Empresa empresa; + @Column(name = "MENSAGEM") private String mensagem; @@ -52,6 +65,17 @@ public class AliasClasse implements Serializable { @Column(name = "USUARIO_ID") private Integer usuarioId; + + @Column(name = "INDSOMENTEIMPRESSAO") + private Boolean indSomenteImpressao; + + @Type(type = "com.rjconsultores.ventaboletos.constantes.CustomEnumTypeHibernate", parameters = { + @Parameter(name = "type", value = "com.rjconsultores.ventaboletos.constantes.CustomEnumTypeHibernate"), + @Parameter(name = "class", value = "com.rjconsultores.ventaboletos.enums.EnumClasseServicoConfortoMonitrip"), + @Parameter(name = "sqlType", value = "12")/*Types.VARCHAR*/, + @Parameter(name = "enumName", value = "true")}) + @Column(name = "CLASSE_CONFORTO_MONITRIP") + private com.rjconsultores.ventaboletos.enums.EnumClasseServicoConfortoMonitrip classeConfortoMonitrip; public AliasClasse() { super(); @@ -145,4 +169,37 @@ public class AliasClasse implements Serializable { public void setUsuarioId(Integer usuarioId) { this.usuarioId = usuarioId; } + + public EnumClasseServicoConfortoMonitrip getClasseConfortoMonitrip() { + return classeConfortoMonitrip; + } + + public void setClasseConfortoMonitrip(EnumClasseServicoConfortoMonitrip classeConfortoMonitrip) { + this.classeConfortoMonitrip = classeConfortoMonitrip; + } + + public Ruta getRuta() { + return ruta; + } + + public void setRuta(Ruta ruta) { + this.ruta = ruta; + } + + public Empresa getEmpresa() { + return empresa; + } + + public void setEmpresa(Empresa empresa) { + this.empresa = empresa; + } + + public Boolean getIndSomenteImpressao() { + return indSomenteImpressao; + } + + public void setIndSomenteImpressao(Boolean indSomenteImpressao) { + this.indSomenteImpressao = indSomenteImpressao; + } + } diff --git a/src/com/rjconsultores/ventaboletos/enums/EnumClasseServicoConfortoMonitrip.java b/src/com/rjconsultores/ventaboletos/enums/EnumClasseServicoConfortoMonitrip.java new file mode 100644 index 000000000..65779180b --- /dev/null +++ b/src/com/rjconsultores/ventaboletos/enums/EnumClasseServicoConfortoMonitrip.java @@ -0,0 +1,52 @@ +package com.rjconsultores.ventaboletos.enums; + +import java.util.Arrays; +import java.util.List; + +import org.zkoss.util.resource.Labels; + +public enum EnumClasseServicoConfortoMonitrip { + + CAMA(1, Labels.getLabel("editarAliasServicoController.tipoClasseConfortoMonitrip.cama")), + LEITO(2, Labels.getLabel("editarAliasServicoController.tipoClasseConfortoMonitrip.leito")), + SEMILEITO(3, Labels.getLabel("editarAliasServicoController.tipoClasseConfortoMonitrip.semileito")), + EXECUTIVA(4, Labels.getLabel("editarAliasServicoController.tipoClasseConfortoMonitrip.executiva")), + BASICA(5, Labels.getLabel("editarAliasServicoController.tipoClasseConfortoMonitrip.basica")); + + + private Integer codigo; + private String descricao; + + private EnumClasseServicoConfortoMonitrip(Integer codigo, String descricao) { + this.codigo = codigo; + this.descricao = descricao; + } + + public Integer getCodigo() { + return codigo; + } + + public String getDescricao() { + return descricao; + } + + @Override + public String toString() { + return getDescricao(); + } + + public static List getList() { + return Arrays.asList(EnumClasseServicoConfortoMonitrip.values()); + } + + public static EnumClasseServicoConfortoMonitrip getTipo(Integer codigo) { + + for (EnumClasseServicoConfortoMonitrip tipoClasseServicoBPe : EnumClasseServicoConfortoMonitrip.values()) { + if(tipoClasseServicoBPe.getCodigo().equals(codigo)) { + return tipoClasseServicoBPe; + } + } + return null; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/RutaService.java b/src/com/rjconsultores/ventaboletos/service/RutaService.java index 8671780a0..5065b8a42 100644 --- a/src/com/rjconsultores/ventaboletos/service/RutaService.java +++ b/src/com/rjconsultores/ventaboletos/service/RutaService.java @@ -128,4 +128,7 @@ public interface RutaService { public List buscarPorOrgaoEcasetaPeaje(OrgaoConcedente orgao, Integer[] listCasetaPeaje, Empresa empresa); + public List buscarRutasPorEmpresaOrgaoConcedenteClaseServicio(Empresa empresa, OrgaoConcedente orgao, ClaseServicio claseServicio); + + } diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RutaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/RutaServiceImpl.java index 4fc8cf097..c6d761014 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/RutaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/RutaServiceImpl.java @@ -620,6 +620,11 @@ public class RutaServiceImpl implements RutaService { public List buscarRutasPorEmpresaOrgaoConcedente(Empresa empresa, OrgaoConcedente orgao) { return rutaDAO.buscarRutasPorEmpresaOrgaoConcedente(empresa, orgao); } + + @Override + public List buscarRutasPorEmpresaOrgaoConcedenteClaseServicio(Empresa empresa, OrgaoConcedente orgao, ClaseServicio claseServicio) { + return rutaDAO.buscarRutasPorEmpresaOrgaoConcedenteClaseServicio(empresa, orgao, claseServicio); + } class CambioRutaTramo { private Tramo viejoTramo;