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

fixes bug #7985 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@62459 d1611594-4594-4d17-8e1d-87c2c4800839
master
valdevir 2016-11-09 12:12:59 +00:00
parent e8f48cfc79
commit 679edb1e97
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/com/rjconsultores/ventaboletos/vo/comissao/EventosFinanceirosVO.java
View File

@ -9,7 +9,7 @@ import org.zkoss.util.resource.Labels;
import com.rjconsultores.ventaboletos.enums.comissao.StatusLogConferencia;
public class EventosFinanceirosVO {
private Long eventoextraId;
private String numdocumento;
private Date fechoringreso;
@ -20,17 +20,19 @@ public class EventosFinanceirosVO {
private Integer formapagoId;
private String descpago;
private Boolean indconferenciafisicacomissao;
private String indtipo; /* 0- Debito, 1- Credito */
private String indtipo; /* 0- Debito, 1- Credito */
private String nombusuario;
private Integer comemptipoeventoextraId;
private Integer comempformapagoId;
private Long logconferenciaId;
private boolean conferido;
private Boolean exigeConferenciaAba;
private Long boletoId;
public Long getEventoextraId() {
return eventoextraId;
}
@ -86,10 +88,10 @@ public class EventosFinanceirosVO {
public void setStatus(Integer status) {
this.status = status;
}
public String getStatusDescricao() {
StatusLogConferencia statusLogConferencia = StatusLogConferencia.getStatusLogConferencia(status);
if(statusLogConferencia != null) {
if (statusLogConferencia != null) {
return statusLogConferencia.toString();
}
return "";
@ -126,15 +128,15 @@ public class EventosFinanceirosVO {
public void setIndtipo(String indtipo) {
this.indtipo = indtipo;
}
public boolean isCredito() {
return StringUtils.isNotBlank(getIndtipo()) && "1".equals(getIndtipo());
}
public boolean isDebito() {
return StringUtils.isNotBlank(getIndtipo()) && "0".equals(getIndtipo());
}
public String getDebitoCredito() {
return isCredito() ? Labels.getLabel("conferenciaController.lbCredito.value") : Labels.getLabel("conferenciaController.lbDebito.value");
}
@ -178,7 +180,7 @@ public class EventosFinanceirosVO {
public void setComempformapagoId(Integer comempformapagoId) {
this.comempformapagoId = comempformapagoId;
}
public boolean isExigeConferencia() {
return getComemptipoeventoextraId() != null || getComempformapagoId() != null;
}
@ -192,14 +194,22 @@ public class EventosFinanceirosVO {
}
public String getOrderExigeConferencia() {
if((getExigeConferenciaAba() != null && getExigeConferenciaAba()) || isExigeConferencia()) {
if(!isConferido()) {
if ((getExigeConferenciaAba() != null && getExigeConferenciaAba()) || isExigeConferencia()) {
if (!isConferido()) {
return "A";
} else if (isConferido()){
} else if (isConferido()) {
return "B";
}
}
return "C";
}
public Long getBoletoId() {
return boletoId;
}
public void setBoletoId(Long boletoId) {
this.boletoId = boletoId;
}
}