From 5877c971206d42e96257fd448baee5427bdc6fdf Mon Sep 17 00:00:00 2001 From: frederico Date: Mon, 21 Mar 2016 14:25:34 +0000 Subject: [PATCH] =?UTF-8?q?Fixed=20bug=20#7212=20-=20corre=C3=A7=C3=A3o=20?= =?UTF-8?q?Modifica=C3=A7=C3=A3o=20Massiva=20Alias?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@54062 d1611594-4594-4d17-8e1d-87c2c4800839 --- ...dificacionMasivaAliasUploadController.java | 56 +++++++++++++++++-- 1 file changed, 51 insertions(+), 5 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaAliasUploadController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaAliasUploadController.java index 25fa851bf..f7d8f000c 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaAliasUploadController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaAliasUploadController.java @@ -157,7 +157,12 @@ public class ModificacionMasivaAliasUploadController extends MyGenericForwardCom if (aliasServico.getAliasServicoId() == null) { duplicados.append(Labels.getLabel("modificacionMasivaAliasTarifasController.msg.servicoExisteIdNull") + "\n" + getCampos(existente, Boolean.FALSE)); } else { - duplicados.append(Labels.getLabel("modificacionMasivaAliasTarifasController.msg.servicoExiste") + " (" + aliasServico.getAliasServicoId() + ") \n"); + if (temAlteracao(aliasServico, existente) && atualizarExistentes) { + salvar(aliasServico, Boolean.TRUE); + registrosAlterados++; + } else { + duplicados.append(Labels.getLabel("modificacionMasivaAliasTarifasController.msg.servicoExiste") + " (" + aliasServico.getAliasServicoId() + ") \n"); + } } continue; } @@ -210,6 +215,48 @@ public class ModificacionMasivaAliasUploadController extends MyGenericForwardCom closeWindow(); } + private boolean temAlteracao(AliasServico aliasServico, AliasServico existente) { + + if (( + (aliasServico.getAliasDestino() == null && existente.getAliasDestino() == null) + || + (aliasServico.getAliasDestino().equals(existente.getAliasDestino())) + ) + && + ( + (aliasServico.getAliasOrigen() == null && existente.getAliasOrigen() == null) + || + (aliasServico.getAliasOrigen().equals(existente.getAliasOrigen())) + ) + && + ( + (aliasServico.getOrigen() == null && existente.getOrigen() == null) + || + (aliasServico.getOrigen().equals(existente.getOrigen())) + ) + && + ( + (aliasServico.getDestino() == null && existente.getDestino() == null) + || + (aliasServico.getDestino().equals(existente.getDestino())) + ) + && + ( + (aliasServico.getRuta() == null && existente.getRuta() == null) + || + (aliasServico.getRuta().equals(existente.getRuta())) + ) + && + ( + (aliasServico.getCorridaId() == null && existente.getCorridaId() == null) + || + (aliasServico.getCorridaId().equals(existente.getCorridaId())) + )) { + return false; + } + return true; + } + private String getCampos(AliasServico aliasServico, Boolean exibirId) { return exibirId ? (Labels.getLabel("modificacionMasivaAliasTarifasController.lblAlias" + " - " + aliasServico.getAliasServicoId()) + "\n") : "" + Labels.getLabel("modificacionMasivaAliasTarifasController.lblAliasOrigem") + "-" + aliasServico.getAliasOrigen().getParadaId() + "\n" @@ -340,7 +387,7 @@ public class ModificacionMasivaAliasUploadController extends MyGenericForwardCom private Boolean validaSheet(Sheet sheet) { Row header = sheet.getRow(0); - + Cell cell0 = header.getCell(CELL_ID_ALIAS_ORIGEM); Cell cell1 = header.getCell(CELL_ID_ALIAS_DESTINO); Cell cell2 = header.getCell(CELL_ID_ORIGEM); @@ -348,7 +395,7 @@ public class ModificacionMasivaAliasUploadController extends MyGenericForwardCom Cell cell4 = header.getCell(CELL_ID_LINHA); Cell cell5 = header.getCell(CELL_ID_CORRIDA); Cell cell6 = header.getCell(CELL_ID_ALIAS); - + if (cell0 == null || cell1 == null || cell2 == null @@ -362,8 +409,7 @@ public class ModificacionMasivaAliasUploadController extends MyGenericForwardCom || !cell3.toString().equals(getNomeCell(CELL_ID_DESTINO)) || !cell4.toString().equals(getNomeCell(CELL_ID_LINHA)) || !cell5.toString().equals(getNomeCell(CELL_ID_CORRIDA)) - || !cell6.toString().equals(getNomeCell(CELL_ID_ALIAS)) - ) { + || !cell6.toString().equals(getNomeCell(CELL_ID_ALIAS))) { return false; }