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

fixed bug #8166 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@62268 d1611594-4594-4d17-8e1d-87c2c4800839
master
frederico 2016-11-03 18:01:49 +00:00
parent be6c7ad7b2
commit c40c63cd8e
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
View File

@ -567,7 +567,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
.append("LOG.STATUS AS \"status\", B.NUMFOLIOSISTEMA AS \"numfoliosistema\", LOG.TIPO AS \"tipo\", ")
.append("O.NUMOPERACION AS \"numoperacion\", TEE.DESCTIPOEVENTO AS \"desctipoevento\", U.NOMBUSUARIO AS \"nombusuario\", ")
.append("LOG.FECMODIF AS \"fecmodif\", LOG.INDCREDITO AS \"indcredito\", B.BOLETO_ID AS \"boletoId\", O.OCD_ID AS \"ocdId\", EE.EVENTOEXTRA_ID AS \"eventoextraId\", TI.DESCTIPO AS \"desctipoinformativo\", ")
.append("CP.DESCPENDENCIA AS \"descpendencia\" ")
.append("CP.DESCPENDENCIA AS \"descpendencia\", LOG.INDMESMODIA AS \"descComportamentoData\" ")
.append("FROM LOG_CONFERENCIA LOG ")
.append("LEFT JOIN BOLETO B ON B.BOLETO_ID = LOG.BOLETO_ID ")
.append("LEFT JOIN EVENTO_EXTRA EE ON EE.EVENTOEXTRA_ID = LOG.EVENTOEXTRA_ID ")
@ -583,6 +583,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
.addScalar("logconferenciaId", Hibernate.LONG)
.addScalar("observacao", Hibernate.STRING)
.addScalar("preco", Hibernate.BIG_DECIMAL)
.addScalar("descComportamentoData",Hibernate.STRING)
.addScalar("status", Hibernate.INTEGER)
.addScalar("numfoliosistema", Hibernate.STRING)
.addScalar("tipo", Hibernate.INTEGER)
@ -872,14 +873,20 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
@Transactional
private void gerarLancamentoContaCorrente(Conferencia conferencia) throws BusinessException {
try {
Calendar cal = Calendar.getInstance();
cal.add(Calendar.DAY_OF_MONTH, 1);
List<LogConferencia> lsLogConferencia = carregarLogConferencia(conferencia.getConferenciaId());
String sDataMovimento = DateUtil.getStringDate(conferencia.getDatamovimento(), "dd/MM/yyyy");
String descOperacion = "CONFERENCIA MOVIMENTO DIA - " + sDataMovimento;
for (LogConferencia logConferencia : lsLogConferencia) {
Calendar cal = Calendar.getInstance();
if(!Boolean.TRUE.equals(logConferencia.getIndmesmodia())){
cal.add(Calendar.DAY_OF_MONTH, 1);
}
if (logConferencia.getStatus().equals(StatusLogConferencia.CONFERIDO)
|| ((logConferencia.getContaCorrentePtoVta() != null
&& logConferencia.getContaCorrentePtoVta().getActivo() != null

11
src/com/rjconsultores/ventaboletos/entidad/LogConferencia.java
View File

@ -88,6 +88,9 @@ public class LogConferencia implements Serializable {
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "CONFERENCIAPENDENCIA_ID")
private ConferenciaPendencia conferenciaPendencia;
@Column(name = "INDMESMODIA")
private Boolean indmesmodia;
public Long getLogconferenciaId() {
return logconferenciaId;
@ -248,5 +251,13 @@ public class LogConferencia implements Serializable {
public Short getIndcredito() {
return indcredito;
}
public Boolean getIndmesmodia() {
return indmesmodia;
}
public void setIndmesmodia(Boolean indmesmodia) {
this.indmesmodia = indmesmodia;
}
}

9
src/com/rjconsultores/ventaboletos/vo/comissao/LogConferenciaVO.java
View File

@ -31,6 +31,7 @@ public class LogConferenciaVO {
private String descinfoevento;
private String desctipoinformativo;
private String descpendencia;
private String descComportamentoData;
public LogConferenciaVO() {
super();
@ -276,5 +277,13 @@ public class LogConferenciaVO {
public void setDescpendencia(String descpendencia) {
this.descpendencia = descpendencia;
}
public String getDescComportamentoData() {
return descComportamentoData != null ? descComportamentoData.equals("0") ? "Dia posterior" : "Mesmo dia" : null;
}
public void setDescComportamentoData(String descComportamentoData) {
this.descComportamentoData = descComportamentoData;
}
}