Merge pull request 'fix bug#AL-1905' (#24) from AL-1905 into master

Reviewed-on: http://18.235.188.113:3000/adm/ModelWeb/pulls/24
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master
Célio de Souza Ribeiro JR 2023-01-27 19:41:56 +00:00
commit 0d9a4d5c47
2 changed files with 236 additions and 199 deletions

View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId>
<version>1.0.26</version>
<version>1.0.27</version>
<distributionManagement>
<repository>
<id>rj-releases</id>

View File

@ -56,6 +56,16 @@ public class EsquemaCorrida implements Serializable, Auditavel<EsquemaCorrida> {
@AuditarAtributo(pattern = "HH:mm")
private Date horasalida;
@Column(name = "HORAINI_NAO_IMP_BPE")
@Temporal(TemporalType.TIME)
@AuditarAtributo(pattern = "HH:mm")
private Date horaIniNaoImpBPE;
@Column(name = "HORAFIM_NAO_IMP_BPE")
@Temporal(TemporalType.TIME)
@AuditarAtributo(pattern = "HH:mm")
private Date horaFimNaoImpBPE;
@Column(name = "INDPISOEXTRA")
private Boolean pisoExtra;
@ -242,6 +252,8 @@ public class EsquemaCorrida implements Serializable, Auditavel<EsquemaCorrida> {
@Column(name = "INDBLOQUEIAWEBAPOSSAIDA")
private Boolean indBloqueiaWebAposSaida;
@Column(name = "INDNAOIMPRIMEBPE")
private String indNaoImprimeBpe;
public enum GerarFeriado {
// Declaração dos enum
@ -871,4 +883,29 @@ public class EsquemaCorrida implements Serializable, Auditavel<EsquemaCorrida> {
public void setIndBloqueiaWebAposSaida(Boolean indBloqueiaWebAposSaida) {
this.indBloqueiaWebAposSaida = indBloqueiaWebAposSaida;
}
public Date getHoraIniNaoImpBPE() {
return horaIniNaoImpBPE;
}
public void setHoraIniNaoImpBPE(Date horaIniNaoImpBPE) {
this.horaIniNaoImpBPE = horaIniNaoImpBPE;
}
public Date getHoraFimNaoImpBPE() {
return horaFimNaoImpBPE;
}
public void setHoraFimNaoImpBPE(Date horaFimNaoImpBPE) {
this.horaFimNaoImpBPE = horaFimNaoImpBPE;
}
public String getIndNaoImprimeBpe() {
return indNaoImprimeBpe;
}
public void setIndNaoImprimeBpe(String indNaoImprimeBpe) {
this.indNaoImprimeBpe = indNaoImprimeBpe;
}
}