From 0f16bac20d98d4e2d56284769295b4a71eaf11d8 Mon Sep 17 00:00:00 2001 From: "lucas.taia" Date: Mon, 30 May 2016 22:39:28 +0000 Subject: [PATCH] fixes bug #7439 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@56482 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/service/impl/AidfServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/service/impl/AidfServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/AidfServiceImpl.java index 759d928fb..7ea9a84a3 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/AidfServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/AidfServiceImpl.java @@ -100,14 +100,14 @@ public class AidfServiceImpl implements AidfService { List list = obtenerAidfFromSerieDocfiscal(entidad.getSerie() , entidad.getDocfiscal().replaceAll("[^a-zA-Z0-9]+","") , conn); - for (AidfVo e : list) { + for (AidfVo aidf : list) { // desconsiderar o próprio ID, caso contrário o erro de validação sempre acontece qdo o registro é editado. - if (e.getAidfId() != entidad.getAidfId()) { - if (e.getDocfiscal().trim().equals(entidad.getDocfiscal().replaceAll("[^a-zA-Z0-9]+", "").trim())) { - if (e.getSerie().trim().equals(entidad.getSerie().trim())) { - if ((Long.parseLong(entidad.getForminicial()) >= Long.parseLong(e.getForminicial()) && Long.parseLong(entidad.getForminicial()) <= Long.parseLong(e.getFormfinal())) - || (Long.parseLong(entidad.getFormfinal()) >= Long.parseLong(e.getForminicial()) && Long.parseLong(entidad.getFormfinal()) <= Long.parseLong(e.getFormfinal()))) { - return e.getAidfId(); + if (aidf.getAidfId().compareTo(entidad.getAidfId()) != 0) { + if (aidf.getDocfiscal().trim().equals(entidad.getDocfiscal().replaceAll("[^a-zA-Z0-9]+", "").trim())) { + if (aidf.getSerie().trim().equals(entidad.getSerie().trim())) { + if ((Long.parseLong(entidad.getForminicial()) >= Long.parseLong(aidf.getForminicial()) && Long.parseLong(entidad.getForminicial()) <= Long.parseLong(aidf.getFormfinal())) + || (Long.parseLong(entidad.getFormfinal()) >= Long.parseLong(aidf.getForminicial()) && Long.parseLong(entidad.getFormfinal()) <= Long.parseLong(aidf.getFormfinal()))) { + return aidf.getAidfId(); } } }