From e464e4a4861d74efe83e92a84523073f05b09dcc Mon Sep 17 00:00:00 2001 From: james Date: Fri, 10 Feb 2023 22:36:00 -0500 Subject: [PATCH] Indentacion --- .../armas/solicitud/ArmasController.java | 5 +- .../armas/solicitud/AuxArmasController.java | 4 +- .../IngresoFichaTecnicaArmasController.java | 2 - .../solicitud/RecepcionArmasController.java | 7 +-- .../solicitud/TramiteArmasController.java | 55 ++++++++++--------- 5 files changed, 35 insertions(+), 38 deletions(-) diff --git a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ArmasController.java b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ArmasController.java index 1061019..31fa9f1 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ArmasController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ArmasController.java @@ -395,7 +395,7 @@ private String descategoria; Request request = this.callerhelper.getRequest(); request.setQueryTables(mtables); request.put("queryalias", "ARMASCOMPLETE"); - + System.out.println("========> PUTO QUERY ARMAS " + sqlFinal); Response resp = this.callerhelper.executeQuery(request); if (resp.getResponseCode().compareTo(Response.RESPONSE_OK) != 0) { @@ -1217,8 +1217,7 @@ private String descategoria; ArmasController cc = new ArmasController(); cc.init(); cc.recperpage = 5000; - cc.addFilter("cregistro", registrocode); - + cc.addFilter("cregistro", registrocode); cc.querydatabase(); if ((cc.lrecord != null) && !cc.lrecord.isEmpty()) { diff --git a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/AuxArmasController.java b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/AuxArmasController.java index b5dd33e..aeabdd3 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/AuxArmasController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/AuxArmasController.java @@ -168,7 +168,7 @@ public class AuxArmasController extends AbstractController { /** * Lista de Armas por Registro - * + * */ public static List findxRegistro(String registrocode) { try { @@ -349,13 +349,13 @@ public class AuxArmasController extends AbstractController { DtoQuery dto = this.getDtoQuery(true); SubQuery subqueryPersonCode = new SubQuery("TarmRegistroArmas", "personcode", "personcode", "i.pk=t.cregistro"); dto.addSubQuery(subqueryPersonCode); - dto.setOrderby("pk"); HashMap mtables = new HashMap(); mtables.put(this.beanalias, dto); // permite adicionar mas de una tabla. Request request = this.callerhelper.getRequest(); request.setQueryTables(mtables); Response resp = this.callerhelper.executeQuery(request); + if (resp.getResponseCode().compareTo(Response.RESPONSE_OK) != 0) { this.lrecord = new ArrayList(); MessageHelper.setMessageError(resp); diff --git a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/IngresoFichaTecnicaArmasController.java b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/IngresoFichaTecnicaArmasController.java index 4abe7e5..7a7d7ac 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/IngresoFichaTecnicaArmasController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/IngresoFichaTecnicaArmasController.java @@ -718,7 +718,6 @@ public class IngresoFichaTecnicaArmasController extends AbstractController QUE ES " + tramiteingresado); String path = "armas/reports/fichaTecArmas"; if (tramiteingresado != null && !tramiteingresado.trim().isEmpty() && tramiteingresado.trim().equals("NOLETAL")) { path = "armas/reports/fichaTecArmasNoLetales"; @@ -1067,7 +1066,6 @@ public class IngresoFichaTecnicaArmasController extends AbstractController TIPO TRAMITE " + tramiteingresado); if ("Y".equals(record.getAptituddisparo()) && "Y".equals(record.getVainastestigo()) && "Y".equals(record.getBalastestigo())) { record.setApruebaevaluacion("Y"); } else { diff --git a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/RecepcionArmasController.java b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/RecepcionArmasController.java index 81f8596..27c5c8c 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/RecepcionArmasController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/RecepcionArmasController.java @@ -937,12 +937,7 @@ public class RecepcionArmasController extends AbstractController PARAMETROS " + parameters); - System.err.println("========>\t" + path); - System.err.println("========>\t" + format); - System.err.println("========>\t" + filename); - System.err.println("========>\t" + this.getLoginController()); + try { this.xpathflujo = this.getRutaDocumento(); InputStream report = this.reportController.jaspertoInputstream(path, parameters, format, filename, this.getLoginController()); this.alfrescoController.uploadFile(report, filename + ".pdf", this.xpathflujo); diff --git a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/TramiteArmasController.java b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/TramiteArmasController.java index 4235cfb..c68ce47 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/TramiteArmasController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/TramiteArmasController.java @@ -150,7 +150,6 @@ public class TramiteArmasController extends AbstractController ltipoidenti; - /** * Lista de tipos de trámite. */ @@ -164,7 +163,6 @@ public class TramiteArmasController extends AbstractController(); + listaPersonasDetailVen = new HashSet<>(); tcustPersonDetailVendedor = null; codigoRuc = codigos("CODIGO.RUC"); codigoCedula = codigos("CODIGO.CEDULA"); @@ -1331,7 +1329,10 @@ public class TramiteArmasController extends AbstractController(); - Set listaCodigos = new HashSet(); + listaPersonasDetailVen = new HashSet<>(); + Set listaCodigos = new HashSet<>(); for (TarmArmas arma : armas.getLrecord()) { if (arma.getLote() == null) { arma.setLote(" "); } //carga los posibles vendedoeres - if (this.guiaLibreTransito) { - System.err.println("guiaLibreTransito " + guiaLibreTransito); + if (this.guiaLibreTransito) { List listaArmas = AuxArmasController.findListXCodigoArma(arma.getCodigoarma()); - if (listaArmas != null && listaArmas.size() > 0) { + if (listaArmas != null && !listaArmas.isEmpty()) { for (TarmArmas tarmArmasVendedor : listaArmas) { - System.out.println("arma.getCregistro(): " + tarmArmasVendedor.getModifiedData().get("personcode")); if (tarmArmasVendedor.getModifiedData().get("personcode") != null && !listaCodigos.contains(tarmArmasVendedor.getModifiedData().get("personcode").toString())) { listaCodigos.add(tarmArmasVendedor.getModifiedData().get("personcode").toString()); @@ -2211,7 +2212,7 @@ public class TramiteArmasController extends AbstractController()); } + } /** @@ -2301,7 +2303,10 @@ public class TramiteArmasController extends AbstractController getLtipopago() { return ltipopago; } @@ -2372,10 +2380,7 @@ public class TramiteArmasController extends AbstractController ltipopago) { this.ltipopago = ltipopago; } - - - - + /** * Entrega el valor de: ltipotramite *