From b78ab949f02105c93699723ef43f77942366b6e0 Mon Sep 17 00:00:00 2001 From: frederico Date: Thu, 24 Mar 2016 19:21:10 +0000 Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#7275=20#7268=20#7277=20-=20Ponto?= =?UTF-8?q?=20Venda:=20adi=C3=A7=C3=A3o=20de=20checks=20de=20dia=20de=20fu?= =?UTF-8?q?ncionamento=20na=20edi=C3=A7=C3=A3o,=20filtros=20de=20localidad?= =?UTF-8?q?e=20e=20cidade=20na=20busca.=20Configura=C3=A7=C3=A3o=20Servi?= =?UTF-8?q?=C3=A7os=20:=20corre=C3=A7=C3=A3o=20mensagens=20de=20erro=20e?= =?UTF-8?q?=20altera=C3=A7=C3=A3o=20para=20habilitar=20edi=C3=A7=C3=A3o=20?= =?UTF-8?q?do=20n=C3=BAmero=20do=20piso=20extra=20caso=20esteja=20inv?= =?UTF-8?q?=C3=A1lido?= 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@54227 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/dao/ParadaDAO.java | 2 + .../ventaboletos/entidad/PuntoVenta.java | 73 ++++++++++++++++++- .../ventaboletos/service/CorridaService.java | 1 + .../ventaboletos/service/ParadaService.java | 2 + .../service/impl/ParadaServiceImpl.java | 5 ++ 5 files changed, 82 insertions(+), 1 deletion(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/ParadaDAO.java b/src/com/rjconsultores/ventaboletos/dao/ParadaDAO.java index 46a943e68..1221b5676 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ParadaDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/ParadaDAO.java @@ -45,4 +45,6 @@ public interface ParadaDAO { public Long count(TipoParada tipoParada); public List obtenerOrigenPorRuta(Ruta ruta); + + public List obtenerTodos(); } diff --git a/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java b/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java index 5d28ba9fb..668153133 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java +++ b/src/com/rjconsultores/ventaboletos/entidad/PuntoVenta.java @@ -187,6 +187,21 @@ public class PuntoVenta implements Serializable { @Column(name = "CODPOSTAL") private Long codpostal; + + @Column(name = "INDLUNES") + private Boolean indlunes; + @Column(name = "INDMARTES") + private Boolean indmartes; + @Column(name = "INDMIERCOLES") + private Boolean indmiercoles; + @Column(name = "INDJUEVES") + private Boolean indjueves; + @Column(name = "INDVIERNES") + private Boolean indviernes; + @Column(name = "INDSABADO") + private Boolean indsabado; + @Column(name = "INDDOMINGO") + private Boolean inddomingo; public PtovtaEmpresaBloqueada addEmpresaBloqueada(Empresa e) { PtovtaEmpresaBloqueada eb = new PtovtaEmpresaBloqueada(); @@ -827,5 +842,61 @@ public class PuntoVenta implements Serializable { public void setIndEstoqueMotorista(Boolean indEstoqueMotorista) { this.indEstoqueMotorista = indEstoqueMotorista; } - + + public Boolean getIndlunes() { + return indlunes; + } + + public void setIndlunes(Boolean indlunes) { + this.indlunes = indlunes; + } + + public Boolean getIndmartes() { + return indmartes; + } + + public void setIndmartes(Boolean indmartes) { + this.indmartes = indmartes; + } + + public Boolean getIndmiercoles() { + return indmiercoles; + } + + public void setIndmiercoles(Boolean indmiercoles) { + this.indmiercoles = indmiercoles; + } + + public Boolean getIndjueves() { + return indjueves; + } + + public void setIndjueves(Boolean indjueves) { + this.indjueves = indjueves; + } + + public Boolean getIndviernes() { + return indviernes; + } + + public void setIndviernes(Boolean indviernes) { + this.indviernes = indviernes; + } + + public Boolean getIndsabado() { + return indsabado; + } + + public void setIndsabado(Boolean indsabado) { + this.indsabado = indsabado; + } + + public Boolean getInddomingo() { + return inddomingo; + } + + public void setInddomingo(Boolean inddomingo) { + this.inddomingo = inddomingo; + } + } diff --git a/src/com/rjconsultores/ventaboletos/service/CorridaService.java b/src/com/rjconsultores/ventaboletos/service/CorridaService.java index e5ebcfd6a..4a840c4cf 100644 --- a/src/com/rjconsultores/ventaboletos/service/CorridaService.java +++ b/src/com/rjconsultores/ventaboletos/service/CorridaService.java @@ -73,4 +73,5 @@ public interface CorridaService extends GenericService { Boolean atualizarCorridaFecHusoFecVerano(Estado estado, Date dataInicial, Integer corridaId); public List buscarCorridaRelatorio(Connection conexao, Parada origem, Parada destino, Date feccorrida, Integer corridaId); + } diff --git a/src/com/rjconsultores/ventaboletos/service/ParadaService.java b/src/com/rjconsultores/ventaboletos/service/ParadaService.java index 415cd2b03..0f39d0367 100644 --- a/src/com/rjconsultores/ventaboletos/service/ParadaService.java +++ b/src/com/rjconsultores/ventaboletos/service/ParadaService.java @@ -36,4 +36,6 @@ public interface ParadaService { public List buscaLike(String descparada); public List obtenerOrigenPorRuta(Ruta ruta); + + public List obtenerTodos(); } diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ParadaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ParadaServiceImpl.java index 495d26038..d1cc83f2e 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ParadaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/ParadaServiceImpl.java @@ -151,4 +151,9 @@ public class ParadaServiceImpl implements ParadaService { public List obtenerOrigenPorRuta(Ruta ruta){ return paradaDAO.obtenerOrigenPorRuta(ruta); } + + @Override + public List obtenerTodos() { + return paradaDAO.obtenerTodos(); + } }