From 33a1d10fabc74035a9a4114824ef13ac0a7e3628 Mon Sep 17 00:00:00 2001 From: julio Date: Mon, 7 May 2018 12:59:42 +0000 Subject: [PATCH] bug#10939 dev:wallace qua:flavio git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@81637 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../dao/hibernate/AidfHibernateDAO.java | 13 +++++-------- .../utilerias/impressaormd/vo/FolioRMD.java | 14 +------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java index d24fef681..e52b11ee1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java @@ -155,9 +155,8 @@ public class AidfHibernateDAO extends GenericHibernateDAO implements } public String buscaUltimoAidfRMDUtilizado(Long idAidf, Integer empresaId, Integer estadoId) { - StringBuilder sb = new StringBuilder(); - sb.append(" select max(folio) as ultimo "); + sb.append(" select max(to_number(folio)) as ultimo "); sb.append(" from folio_consumo_rmd "); sb.append(" where activo = 1 "); sb.append(" and (indimpresso = 1 or indcancelacion = 1) "); @@ -170,20 +169,18 @@ public class AidfHibernateDAO extends GenericHibernateDAO implements query.setInteger("empresaId", empresaId); query.setInteger("estadoId", estadoId); - String resp = (String) query.uniqueResult(); + Object resp = query.uniqueResult(); - Integer aux = resp == null ? null : Integer.parseInt(resp); + Integer aux = resp == null ? null : Integer.parseInt(resp.toString()); if (aux != null) aux++; - return aux == null ? null : aux.toString(); } @Override public boolean vaidaRMDUtilizado(Long idAidf, Integer empresaId, Integer estadoId, String folio) { - StringBuilder sb = new StringBuilder(); - sb.append(" select max(folio) as ultimo "); + sb.append(" select max(to_number(folio)) as ultimo "); sb.append(" from folio_consumo_rmd "); sb.append(" where activo = 1 "); sb.append(" and (indimpresso = 1 or indcancelacion = 1) "); @@ -198,7 +195,7 @@ public class AidfHibernateDAO extends GenericHibernateDAO implements query.setInteger("estadoId", estadoId); query.setString("folio", folio); - String resp = (String) query.uniqueResult(); + Object resp = query.uniqueResult(); return resp == null ? true : false; } diff --git a/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/FolioRMD.java b/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/FolioRMD.java index 53163c653..d2dbb0c0b 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/FolioRMD.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/FolioRMD.java @@ -3,7 +3,7 @@ package com.rjconsultores.ventaboletos.utilerias.impressaormd.vo; import java.math.BigDecimal; import java.util.Date; -public class FolioRMD implements Comparable { +public class FolioRMD { private String foliormd; private String status; @@ -21,18 +21,6 @@ public class FolioRMD implements Comparable { private BigDecimal outros; private BigDecimal icms; - @Override - public int compareTo(FolioRMD o) { - int result = this.tipo.compareToIgnoreCase(o.tipo); - if (result == 0) { - result = this.estado.compareToIgnoreCase(o.estado); - } - if (result == 0) { - result = this.foliormd.compareToIgnoreCase(o.foliormd); - } - return result; - } - public String getFoliormd() { return foliormd; }