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@62411 d1611594-4594-4d17-8e1d-87c2c4800839
master
valdevir 2016-11-08 13:14:22 +00:00
parent c40c63cd8e
commit 79fe435360
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,7 +100,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
} }
} }
@SuppressWarnings({ "unchecked", "deprecation" })
private void carregarPuntoVentas(List<ConferenciaComissaoVO> lsConferencias, String competencia, private void carregarPuntoVentas(List<ConferenciaComissaoVO> lsConferencias, String competencia,
Empresa empresa, PuntoVenta puntoVenta) throws BusinessException { Empresa empresa, PuntoVenta puntoVenta) throws BusinessException {
try { try {
@ -132,6 +131,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
sQuery.append("ORDER BY PV.NOMBPUNTOVENTA "); sQuery.append("ORDER BY PV.NOMBPUNTOVENTA ");
@SuppressWarnings("deprecation")
Query qr = getSession().createSQLQuery(sQuery.toString()) Query qr = getSession().createSQLQuery(sQuery.toString())
.addScalar("puntoventaId", Hibernate.INTEGER) .addScalar("puntoventaId", Hibernate.INTEGER)
.addScalar("numPuntoVenta", Hibernate.STRING) .addScalar("numPuntoVenta", Hibernate.STRING)
@ -147,7 +147,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
} }
} }
@SuppressWarnings("unchecked")
private void carregarConferenciasRegistradas(List<ConferenciaComissaoVO> lsConferencias, private void carregarConferenciasRegistradas(List<ConferenciaComissaoVO> lsConferencias,
String competencia, Empresa empresa, PuntoVenta puntoVenta) throws BusinessException { String competencia, Empresa empresa, PuntoVenta puntoVenta) throws BusinessException {
try { try {
@ -174,7 +173,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
} }
} }
@SuppressWarnings("rawtypes")
private void setParametros(Query qr, Map<String, Object> parametros) { private void setParametros(Query qr, Map<String, Object> parametros) {
for (Entry<String, Object> parametro : parametros.entrySet()) { for (Entry<String, Object> parametro : parametros.entrySet()) {
if (parametro.getValue() instanceof Collection) { if (parametro.getValue() instanceof Collection) {
@ -499,14 +497,13 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
} }
@Override @Override
@SuppressWarnings({ "unchecked", "deprecation" })
public List<EventosFinanceirosVO> carregarEventosFinanceiros(Conferencia conferencia) public List<EventosFinanceirosVO> carregarEventosFinanceiros(Conferencia conferencia)
throws BusinessException { throws BusinessException {
try { try {
Map<String, Object> parametros = carregarParametros(null, conferencia.getEmpresa(), Map<String, Object> parametros = carregarParametros(null, conferencia.getEmpresa(),
conferencia.getPuntoVenta(), conferencia.getDatamovimento()); conferencia.getPuntoVenta(), conferencia.getDatamovimento());
StringBuilder sQuery = new StringBuilder() StringBuilder sQuery = new StringBuilder()
.append("SELECT EE.EVENTOEXTRA_ID AS \"eventoextraId\", EE.NUMDOCUMENTO AS \"numdocumento\", ") .append("SELECT EE.BOLETO_ID AS \"boletoId\", EE.EVENTOEXTRA_ID AS \"eventoextraId\", EE.NUMDOCUMENTO AS \"numdocumento\", ")
.append("EE.IMPINGRESO AS \"impingreso\", TEE.DESCTIPOEVENTO AS \"desctipoevento\", EE.DESCINFO AS \"descinfo\", ") .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("LOG.STATUS AS \"status\", FP.FORMAPAGO_ID AS \"formapagoId\", FP.DESCPAGO AS \"descpago\", ")
.append("TEE.INDTIPO AS \"indtipo\", U.NOMBUSUARIO AS \"nombusuario\", LOG.LOGCONFERENCIA_ID AS \"logconferenciaId\", ") .append("TEE.INDTIPO AS \"indtipo\", U.NOMBUSUARIO AS \"nombusuario\", LOG.LOGCONFERENCIA_ID AS \"logconferenciaId\", ")
@ -531,7 +528,9 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
} }
sQuery.append("ORDER BY TEE.DESCTIPOEVENTO "); sQuery.append("ORDER BY TEE.DESCTIPOEVENTO ");
@SuppressWarnings("deprecation")
Query qr = getSession().createSQLQuery(sQuery.toString()) Query qr = getSession().createSQLQuery(sQuery.toString())
.addScalar("boletoId", Hibernate.LONG)
.addScalar("eventoextraId", Hibernate.LONG) .addScalar("eventoextraId", Hibernate.LONG)
.addScalar("numdocumento", Hibernate.STRING) .addScalar("numdocumento", Hibernate.STRING)
.addScalar("impingreso", Hibernate.BIG_DECIMAL) .addScalar("impingreso", Hibernate.BIG_DECIMAL)
@ -557,7 +556,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
} }
@Override @Override
@SuppressWarnings({ "deprecation", "unchecked" })
public List<LogConferenciaVO> carregarLogConferencia(Conferencia conferencia) public List<LogConferenciaVO> carregarLogConferencia(Conferencia conferencia)
throws BusinessException { throws BusinessException {
try { try {
@ -579,6 +577,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
.append("WHERE LOG.ACTIVO = 1 ") .append("WHERE LOG.ACTIVO = 1 ")
.append("AND LOG.CONFERENCIA_ID = :conferenciaId "); .append("AND LOG.CONFERENCIA_ID = :conferenciaId ");
@SuppressWarnings("deprecation")
Query qr = getSession().createSQLQuery(sQuery.toString()) Query qr = getSession().createSQLQuery(sQuery.toString())
.addScalar("logconferenciaId", Hibernate.LONG) .addScalar("logconferenciaId", Hibernate.LONG)
.addScalar("observacao", Hibernate.STRING) .addScalar("observacao", Hibernate.STRING)
@ -659,7 +658,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
} }
@Override @Override
@SuppressWarnings({ "unchecked", "deprecation" })
public List<BoletoComissao> carregarBilhetesComissao(Conferencia conferencia) public List<BoletoComissao> carregarBilhetesComissao(Conferencia conferencia)
throws BusinessException { throws BusinessException {
try { try {
@ -717,6 +715,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
} }
sQuery.append("ORDER BY B.BOLETO_ID "); sQuery.append("ORDER BY B.BOLETO_ID ");
@SuppressWarnings("deprecation")
Query qr = getSession().createSQLQuery(sQuery.toString()) Query qr = getSession().createSQLQuery(sQuery.toString())
.addScalar("boletoId", Hibernate.LONG) .addScalar("boletoId", Hibernate.LONG)
.addScalar("boletoOriginalId", Hibernate.LONG) .addScalar("boletoOriginalId", Hibernate.LONG)
@ -795,7 +794,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
} }
@Override @Override
@SuppressWarnings({ "unchecked", "deprecation" })
public List<OcdVO> carregarOcds(Conferencia conferencia) throws BusinessException { public List<OcdVO> carregarOcds(Conferencia conferencia) throws BusinessException {
try { try {
Map<String, Object> parametros = carregarParametros(null, conferencia.getEmpresa(), Map<String, Object> parametros = carregarParametros(null, conferencia.getEmpresa(),
@ -823,6 +821,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
sQuery.append("AND O.PUNTOVENTAPAGO_ID = :puntoventaId "); sQuery.append("AND O.PUNTOVENTAPAGO_ID = :puntoventaId ");
} }
@SuppressWarnings("deprecation")
Query qr = getSession().createSQLQuery(sQuery.toString()) Query qr = getSession().createSQLQuery(sQuery.toString())
.addScalar("ocdId", Hibernate.LONG).addScalar("numoperacion", Hibernate.STRING) .addScalar("ocdId", Hibernate.LONG).addScalar("numoperacion", Hibernate.STRING)
.addScalar("fecinc", Hibernate.DATE).addScalar("fecpagar", Hibernate.DATE) .addScalar("fecinc", Hibernate.DATE).addScalar("fecpagar", Hibernate.DATE)
@ -873,16 +872,15 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
@Transactional @Transactional
private void gerarLancamentoContaCorrente(Conferencia conferencia) throws BusinessException { private void gerarLancamentoContaCorrente(Conferencia conferencia) throws BusinessException {
try { try {
Calendar cal = Calendar.getInstance();
cal.add(Calendar.DAY_OF_MONTH, 1);
List<LogConferencia> lsLogConferencia = carregarLogConferencia(conferencia.getConferenciaId()); List<LogConferencia> lsLogConferencia = carregarLogConferencia(conferencia.getConferenciaId());
String sDataMovimento = DateUtil.getStringDate(conferencia.getDatamovimento(), "dd/MM/yyyy"); String sDataMovimento = DateUtil.getStringDate(conferencia.getDatamovimento(), "dd/MM/yyyy");
String descOperacion = "CONFERENCIA MOVIMENTO DIA - " + sDataMovimento; String descOperacion = "CONFERENCIA MOVIMENTO DIA - " + sDataMovimento;
for (LogConferencia logConferencia : lsLogConferencia) { for (LogConferencia logConferencia : lsLogConferencia) {
Calendar cal = Calendar.getInstance();
if(!Boolean.TRUE.equals(logConferencia.getIndmesmodia())){ if(!Boolean.TRUE.equals(logConferencia.getIndmesmodia())){
cal.add(Calendar.DAY_OF_MONTH, 1); cal.add(Calendar.DAY_OF_MONTH, 1);
} }
@ -918,7 +916,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
} }
@Override @Override
@SuppressWarnings("unchecked")
public List<LogConferencia> carregarLogConferencia(Long conferenciaId) throws BusinessException { public List<LogConferencia> carregarLogConferencia(Long conferenciaId) throws BusinessException {
try { try {
StringBuilder sQuery = new StringBuilder() StringBuilder sQuery = new StringBuilder()
@ -978,7 +975,6 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
} }
@Override @Override
@SuppressWarnings("unchecked")
public DiaConferenciaComissaoVO carregarConferenciaRegistrada(Date datamovimento, public DiaConferenciaComissaoVO carregarConferenciaRegistrada(Date datamovimento,
Empresa empresa, PuntoVenta puntoVenta) throws BusinessException { Empresa empresa, PuntoVenta puntoVenta) throws BusinessException {
try { try {