fixes bug #7021

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@51894 d1611594-4594-4d17-8e1d-87c2c4800839

src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java

@@ -216,8 +216,9 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 	 * @param lsConferencias
 	 * @param competencia
 	 * @param corPadrao
+	 * @throws ParseException 
 	 */
-	private void processarQueryConferenciaComissao(List<ConferenciaComissaoVO> lsQuery, List<ConferenciaComissaoVO> lsConferencias, String competencia) {
+	private void processarQueryConferenciaComissao(List<ConferenciaComissaoVO> lsQuery, List<ConferenciaComissaoVO> lsConferencias, String competencia) throws ParseException {
 		Set<Integer> diasSemMovimentos = DateUtil.carregarDiasCompetencia(competencia);
 		
 		for (ConferenciaComissaoVO conferenciaComissaoMovimentoDiario : lsQuery) {
@@ -238,6 +239,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 
 					DiaConferenciaComissaoVO diaConferenciaComissao = new DiaConferenciaComissaoVO();
 					diaConferenciaComissao.setDia(dia);
+					diaConferenciaComissao.setData(DateUtil.getDateFromString(dia + "/" + competencia, "dd/MM/yyyy"));
 
 					if(conferenciaComissao.getDias() == null) {
 						conferenciaComissao.setDias(new ArrayList<DiaConferenciaComissaoVO>());
@@ -259,8 +261,9 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 	 * @param lsQuery
 	 * @param lsConferencias
 	 * @param competencia
+	 * @throws ParseException 
 	 */
-	private void processarQueryConferencia(List<Conferencia> lsQuery, List<ConferenciaComissaoVO> lsConferencias, String competencia) {
+	private void processarQueryConferencia(List<Conferencia> lsQuery, List<ConferenciaComissaoVO> lsConferencias, String competencia) throws ParseException {
 		Set<Integer> diasSemMovimentos = DateUtil.carregarDiasCompetencia(competencia);
 		
 		for (Conferencia conferencia : lsQuery) {
@@ -282,6 +285,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 					DiaConferenciaComissaoVO diaConferenciaComissao = new DiaConferenciaComissaoVO();
 					diaConferenciaComissao.setConferenciaId(conferencia.getConferenciaId());
 					diaConferenciaComissao.setDia(dia);
+					diaConferenciaComissao.setData(DateUtil.getDateFromString(dia + "/" + competencia, "dd/MM/yyyy"));
 					diaConferenciaComissao.setIndboletogerado(conferencia.getIndboletogerado());
 					diaConferenciaComissao.setIndconferido(conferencia.getIndconferido());
 					diaConferenciaComissao.setIndmaloterecebido(conferencia.getIndmaloterecebido());
@@ -303,11 +307,12 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 		}
 	}
 
-	private void carregarDiasSemMovimento(List<ConferenciaComissaoVO> lsConferencias, String competencia, Empresa empresa, PuntoVenta puntoVenta) {
+	private void carregarDiasSemMovimento(List<ConferenciaComissaoVO> lsConferencias, String competencia, Empresa empresa, PuntoVenta puntoVenta) throws ParseException {
 		for (ConferenciaComissaoVO conferenciaComissao : lsConferencias) {
 			for (Integer diaSemMovimento : conferenciaComissao.getDiasSemMovimentos()) {
 				DiaConferenciaComissaoVO diaConferenciaComissao = new DiaConferenciaComissaoVO();
 				diaConferenciaComissao.setDia(diaSemMovimento);
+				diaConferenciaComissao.setData(DateUtil.getDateFromString(diaSemMovimento + "/" + competencia, "dd/MM/yyyy"));
 				diaConferenciaComissao.setIndsemmovimento(true);
 				
 				if(conferenciaComissao.getDias() == null) {
@@ -441,7 +446,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 			sQuery.append("SELECT DISTINCT EE.EVENTOEXTRA_ID AS \"eventoextraId\", EE.NUMDOCUMENTO AS \"numdocumento\", ")
 				  .append("EE.IMPINGRESO AS \"impingreso\", TEE.DESCTIPOEVENTO AS \"desctipoevento\", EE.DESCINFO AS \"descinfo\", ")
 				  .append("LOG.STATUS AS \"status\", FP.FORMAPAGO_ID AS \"formapagoId\", FP.DESCPAGO AS \"descpago\", ")
-				  .append("FP.INDCONFERENCIAFISICACOMISSAO AS \"indconferenciafisicacomissao\" ")
+				  .append("FP.INDCONFERENCIAFISICACOMISSAO AS \"indconferenciafisicacomissao\", TEE.INDTIPO AS \"indtipo\" ")
 				  .append("FROM EVENTO_EXTRA EE ")
 				  .append("JOIN TIPO_EVENTO_EXTRA TEE ON EE.TIPOEVENTOEXTRA_ID = TEE.TIPOEVENTOEXTRA_ID ")
 				  .append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.EVENTOEXTRA_ID = EE.EVENTOEXTRA_ID ")
@@ -459,7 +464,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 				sQuery.append("AND EE.PUNTOVENTA_ID = :puntoventaId ");
 			}
 			
-			sQuery.append("ORDER BY TEE.DESCTIPOEVENTO ");
+			sQuery.append("AND EE.EVENTOEXTRACANC_ID IS NULL AND EE.IMPINGRESO >= 0 ")
+				  .append("ORDER BY TEE.DESCTIPOEVENTO ");
 			
 			log.info(sQuery.toString());
 			
@@ -473,6 +479,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 								   .addScalar("formapagoId", Hibernate.INTEGER)
 								   .addScalar("descpago", Hibernate.STRING)
 								   .addScalar("indconferenciafisicacomissao", Hibernate.BOOLEAN)
+								   .addScalar("indtipo", Hibernate.STRING)
 								   .setResultTransformer(Transformers.aliasToBean(EventosFinanceirosVO.class));			
 			setParametros(qr, parametros);
 			
@@ -580,10 +587,10 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 			Map<String, Object> parametros = carregarParametros(null, conferencia.getEmpresa(), conferencia.getPuntoVenta());
 			
 			StringBuilder sQuery = new StringBuilder();
-			sQuery.append("SELECT B.BOLETO_ID AS \"boletoId\", B.NUMASIENTO AS \"numAsiento\", B.NUMFOLIOSISTEMA AS \"numFolioSistema\", B.NUMSERIEPREIMPRESA AS \"numSeriePreimpresa\", ")
+			sQuery.append("SELECT B.BOLETO_ID AS \"boletoId\", B.NUMASIENTO AS \"numAsiento\", B.NUMASIENTOVINCULADO AS \"numAsientoVinculado\", B.NUMFOLIOSISTEMA AS \"numFolioSistema\", B.NUMSERIEPREIMPRESA AS \"numSeriePreimpresa\", ")
 				  .append("B.NUMFOLIOPREIMPRESO AS \"numFolioPreImpreso\", EST.CVEESTADO AS \"uf\", CAT.DESCCATEGORIA AS \"desccategoria\", ")
 				  .append("NVL(B.PRECIOPAGADO,0) AS \"valorpagado\", NVL(B.IMPORTEOUTROS,0) AS \"seguroOutros\", ")
-				  .append("NVL(B.IMPORTEPEDAGIO,0) AS \"pedagio\", NVL(B.IMPORTESEGURO,0) AS \"seguro\", ")
+				  .append("NVL(B.IMPORTEPEDAGIO,0) AS \"pedagio\", NVL(B.IMPORTESEGURO,0) AS \"seguro\", NVL(B.IMPORTETAXAEMBARQUE,0) AS \"embarque\", ")
 				  .append("B.TIPOVENTA_ID AS \"tipoVenta\", B.INDSTATUSBOLETO AS \"indstatusboleto\", LOG.STATUS AS \"status\", ")
 				  .append("FP.FORMAPAGO_ID AS \"formapagoId\", FP.DESCPAGO AS \"descpago\", FP.INDCONFERENCIAFISICACOMISSAO AS \"indconferenciafisicacomissao\", ")
 				  .append("MC.DESCMOTIVO AS \"descmotivocancelacion\" ")
@@ -654,6 +661,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 			Query qr = getSession().createSQLQuery(sQuery.toString())
 								   .addScalar("boletoId", Hibernate.LONG)
 								   .addScalar("numAsiento", Hibernate.STRING)
+								   .addScalar("numAsientoVinculado", Hibernate.STRING)
 								   .addScalar("numFolioSistema", Hibernate.STRING)
 								   .addScalar("numSeriePreimpresa", Hibernate.STRING)
 								   .addScalar("numFolioPreImpreso", Hibernate.STRING)
@@ -663,6 +671,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 								   .addScalar("seguroOutros", Hibernate.BIG_DECIMAL)
 								   .addScalar("pedagio", Hibernate.BIG_DECIMAL)
 								   .addScalar("seguro", Hibernate.BIG_DECIMAL)
+								   .addScalar("embarque", Hibernate.BIG_DECIMAL)
 								   .addScalar("tipoVenta", Hibernate.INTEGER)
 								   .addScalar("indstatusboleto", Hibernate.STRING)
 								   .addScalar("status", Hibernate.INTEGER)

src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java

@@ -24,6 +24,7 @@ public class BoletoComissao {
 	private BigDecimal seguroOutros;
 	private Boolean ptoVtaOrigem;
 	private String numAsiento;
+	private String numAsientoVinculado;
 	private String numFolioSistema;
 	private String numSeriePreimpresa;
 	private String numFolioPreImpreso;
@@ -320,4 +321,12 @@ public class BoletoComissao {
 		this.estadoId = estadoId;
 	}
 
+	public String getNumAsientoVinculado() {
+		return numAsientoVinculado;
+	}
+
+	public void setNumAsientoVinculado(String numAsientoVinculado) {
+		this.numAsientoVinculado = numAsientoVinculado;
+	}
+
 }

src/com/rjconsultores/ventaboletos/vo/comissao/DiaConferenciaComissaoVO.java

@@ -1,10 +1,13 @@
 package com.rjconsultores.ventaboletos.vo.comissao;
 
+import java.util.Date;
+
 import com.rjconsultores.ventaboletos.enums.comissao.CoresConferencia;
 
 public class DiaConferenciaComissaoVO implements Comparable<DiaConferenciaComissaoVO> {
 
 	private Integer dia;
+	private Date data;
 	private Long conferenciaId;
 
 	private Boolean indboletogerado;
@@ -137,4 +140,12 @@ public class DiaConferenciaComissaoVO implements Comparable<DiaConferenciaComiss
 		this.conferenciaId = conferenciaId;
 	}
 
+	public Date getData() {
+		return data;
+	}
+
+	public void setData(Date data) {
+		this.data = data;
+	}
+
 }

src/com/rjconsultores/ventaboletos/vo/comissao/EventosFinanceirosVO.java

@@ -3,6 +3,8 @@ package com.rjconsultores.ventaboletos.vo.comissao;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import org.apache.commons.lang.StringUtils;
+
 import com.rjconsultores.ventaboletos.enums.comissao.StatusLogConferencia;
 
 public class EventosFinanceirosVO {
@@ -17,6 +19,7 @@ public class EventosFinanceirosVO {
 	private Integer formapagoId;
 	private String descpago;
 	private Boolean indconferenciafisicacomissao;
+	private String indtipo; /* 0- Debito, 1- Credito  */
 	
 	public Long getEventoextraId() {
 		return eventoextraId;
@@ -106,4 +109,16 @@ public class EventosFinanceirosVO {
 		this.indconferenciafisicacomissao = indconferenciafisicacomissao;
 	}
 
+	public String getIndtipo() {
+		return indtipo;
+	}
+
+	public void setIndtipo(String indtipo) {
+		this.indtipo = indtipo;
+	}
+	
+	public boolean isCredito() {
+		return StringUtils.isNotBlank(getIndtipo()) && "1".equals(getIndtipo());
+	}
+
 }