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

fixes bug #10015 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@75774 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2017-10-27 16:33:08 +00:00
parent 64c5d79a26
commit 2ca8908ebc
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -823,13 +823,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
.append("INNER JOIN VIGENCIA_TARIFA VT ON (VT.VIGENCIATARIFA_ID = T.VIGENCIATARIFA_ID) ") .append("INNER JOIN VIGENCIA_TARIFA VT ON (VT.VIGENCIATARIFA_ID = T.VIGENCIATARIFA_ID) ")
.append("WHERE C.ACTIVO = 1 ") .append("WHERE C.ACTIVO = 1 ")
.append("AND C.FECCORTE BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY') AND TO_DATE(:dataFinal, 'DD/MM/YYYY') ") .append("AND C.FECCORTE BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY') AND TO_DATE(:dataFinal, 'DD/MM/YYYY') ")
.append("AND C.FECHORVENTA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA "); .append("AND C.FECHORVENTA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA ")
.append("AND ((C.INDSTATUSBOLETO = 'E' AND C.INDREIMPRESION = 1) OR C.INDREIMPRESION = 0 OR C.MOTIVOCANCELACION_ID = :motivoCancelacionGeracaoOcd) ");
if(isCalculoComissao) {
sQuery.append("AND ((C.INDSTATUSBOLETO = 'E' AND C.INDREIMPRESION = 1) OR C.INDREIMPRESION = 0 OR C.MOTIVOCANCELACION_ID = 99) ");
} else {
sQuery.append("AND ((C.INDSTATUSBOLETO = 'E' AND C.INDREIMPRESION = 1) OR C.INDREIMPRESION = 0) ");
}
if (parametros.containsKey("empresaId")) { if (parametros.containsKey("empresaId")) {
sQuery.append("AND M.EMPRESA_ID = :empresaId "); sQuery.append("AND M.EMPRESA_ID = :empresaId ");
@ -906,6 +901,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
.addScalar("ptoVtaOrigem", Hibernate.BOOLEAN) .addScalar("ptoVtaOrigem", Hibernate.BOOLEAN)
.addScalar("valorbase", Hibernate.BIG_DECIMAL) .addScalar("valorbase", Hibernate.BIG_DECIMAL)
.setResultTransformer(Transformers.aliasToBean(BoletoComissao.class)); .setResultTransformer(Transformers.aliasToBean(BoletoComissao.class));
parametros.put("motivoCancelacionGeracaoOcd", Constantes.MVO_CANCEL_GERACAO_OCD.intValue());
setParametros(qr, parametros); setParametros(qr, parametros);
List<BoletoComissao> lsBoletoComissao = new ArrayList<BoletoComissao>(); List<BoletoComissao> lsBoletoComissao = new ArrayList<BoletoComissao>();
@ -1216,11 +1213,11 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
sql.append("WHERE c.EMPRESACORRIDA_ID = :empresaId "); sql.append("WHERE c.EMPRESACORRIDA_ID = :empresaId ");
sql.append(" AND c.INDSTATUSBOLETO = 'V' "); sql.append(" AND c.INDSTATUSBOLETO = 'V' ");
sql.append(" AND lc.ACTIVO = 1 "); sql.append(" AND lc.ACTIVO = 1 ");
sql.append(" AND c.TRANSACAOORIGINAL_ID =:cajaId "); sql.append(" AND c.TRANSACAOORIGINAL_ID =:transacaoId ");
sql.append(" AND c.TIPOVENTA_ID IN (5,12,18,81,41) "); sql.append(" AND c.TIPOVENTA_ID IN (5,12,18,81,41) ");
Query qr = getSession().createSQLQuery(sql.toString()); Query qr = getSession().createSQLQuery(sql.toString());
qr.setParameter("cajaId", boletoComissao.getTransacaoOriginalId()); qr.setParameter("transacaoId", boletoComissao.getTransacaoOriginalId());
qr.setParameter("empresaId", boletoComissao.getEmpresaId() ); qr.setParameter("empresaId", boletoComissao.getEmpresaId() );
return !qr.list().isEmpty(); return !qr.list().isEmpty();