From c40c63cd8e1a60b4e3dab2f339e748527d2dfe7f Mon Sep 17 00:00:00 2001
From: frederico <frederico@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 3 Nov 2016 18:01:49 +0000
Subject: [PATCH] fixed bug #8166

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@62268 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../hibernate/ConferenciaComissaoHibernateDAO.java  | 13 ++++++++++---
 .../ventaboletos/entidad/LogConferencia.java        | 11 +++++++++++
 .../ventaboletos/vo/comissao/LogConferenciaVO.java  |  9 +++++++++
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index 9642e824c..aae8fc3fd 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -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
diff --git a/src/com/rjconsultores/ventaboletos/entidad/LogConferencia.java b/src/com/rjconsultores/ventaboletos/entidad/LogConferencia.java
index 2f6843cbd..c1f47290f 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/LogConferencia.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/LogConferencia.java
@@ -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;
+	}
 	
 }
diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/LogConferenciaVO.java b/src/com/rjconsultores/ventaboletos/vo/comissao/LogConferenciaVO.java
index c906945fe..88333dab6 100644
--- a/src/com/rjconsultores/ventaboletos/vo/comissao/LogConferenciaVO.java
+++ b/src/com/rjconsultores/ventaboletos/vo/comissao/LogConferenciaVO.java
@@ -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;
+	}
 	
 }