llopez
/
portal-sincoar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Indentacion

This commit is contained in:
james 2023-02-10 22:36:00 -05:00
parent 6fe44d8f65
commit e464e4a486
5 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ArmasController.java
View File

@ -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()) {

4
frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/AuxArmasController.java
View File

@ -168,7 +168,7 @@ public class AuxArmasController extends AbstractController<TarmArmas> {
/**
* Lista de Armas por Registro
*
*
*/
public static List<TarmArmas> findxRegistro(String registrocode) {
try {
@ -349,13 +349,13 @@ public class AuxArmasController extends AbstractController<TarmArmas> {
DtoQuery dto = this.getDtoQuery(true);
SubQuery subqueryPersonCode = new SubQuery("TarmRegistroArmas", "personcode", "personcode", "i.pk=t.cregistro");
dto.addSubQuery(subqueryPersonCode);
dto.setOrderby("pk");
HashMap<String, DtoQuery> mtables = new HashMap<String, DtoQuery>();
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<TarmArmas>();
MessageHelper.setMessageError(resp);

2
frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/IngresoFichaTecnicaArmasController.java
View File

@ -718,7 +718,6 @@ public class IngresoFichaTecnicaArmasController extends AbstractController<TarmA
*/
public void reporteFichaArmas() throws Exception {
String gradoUsuario = "";
System.out.println("=======> 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<TarmA
System.err.println("ERROR " + ex);
ex.printStackTrace(System.err);
}
System.out.println("=========> TIPO TRAMITE " + tramiteingresado);
if ("Y".equals(record.getAptituddisparo()) && "Y".equals(record.getVainastestigo()) && "Y".equals(record.getBalastestigo())) {
record.setApruebaevaluacion("Y");
} else {

7
frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/RecepcionArmasController.java
View File

@ -937,12 +937,7 @@ public class RecepcionArmasController extends AbstractController<TarmSolicitudAr
parameters.put("codigoQR", (sol != null ? sol.getNumerosolicitud() : "") + " " + fechaActualSB.toString() + " " + gradoUsuario);
try {
System.err.println("==========> 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);

55
frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/TramiteArmasController.java
View File

@ -150,7 +150,6 @@ public class TramiteArmasController extends AbstractController<AbstractDataTrans
*/
private List<TgeneCatalogDetail> ltipoidenti;
/**
* Lista de tipos de tr&aacute;mite.
*/
@ -164,7 +163,6 @@ public class TramiteArmasController extends AbstractController<AbstractDataTrans
/**
* Lista de origen de tipos de pagos
*/
/**
* Lista de provincias
*/
@ -481,7 +479,7 @@ public class TramiteArmasController extends AbstractController<AbstractDataTrans
this.responsableCentroControl = new TcustPersonDetail();
this.tsafeUserDetailUsuario = new TsafeUserDetail();
tipoDocumento = CatalogDetailController.find("IDENTIFICATION");
listaPersonasDetailVen = new HashSet<TcustPersonDetail>();
listaPersonasDetailVen = new HashSet<>();
tcustPersonDetailVendedor = null;
codigoRuc = codigos("CODIGO.RUC");
codigoCedula = codigos("CODIGO.CEDULA");
@ -1331,7 +1329,10 @@ public class TramiteArmasController extends AbstractController<AbstractDataTrans
this.mostrarIngresoArmas = Boolean.FALSE;
}
}
/***/
/**
*
*/
public void executeTipoPago() {
TarmTramite tramite = this.solicitud.getRecord().getCtramite() != null ? TarmTramiteController.find(this.solicitud.getRecord().getCtramite().toString()) : null;
@ -1413,15 +1414,17 @@ public class TramiteArmasController extends AbstractController<AbstractDataTrans
this.armas.getRecord().getModifiedData().put("clase", clase.getDescription());
this.armas.setClase(clase.getPk().getCatalog());
}
/**
* MODIFICAR EL NUMERO DE SOLICITUD POR TIPO DE TRAMITE
*/
public void setNumeroSolicitudPorTramite(){
if(this.tipoAutorizacion.getLegalcode() != null && this.solicitud.getRecord().getNumerosolicitud()!=null){
public void setNumeroSolicitudPorTramite() {
if (this.tipoAutorizacion.getLegalcode() != null && this.solicitud.getRecord().getNumerosolicitud() != null) {
this.solicitud.getRecord().setNumerosolicitud(this.numeroSolicitudBase);
}
}
/**
* Regresa del LOV para cargar valores
*
@ -1438,14 +1441,14 @@ public class TramiteArmasController extends AbstractController<AbstractDataTrans
if (!verificaAptitudPersona(tarmTramite)) {
return;
}
this.armas.setTarmTramite(this.tarmTramite);
solicitud.getRecord().setCtramite(tramite.getPk());
tipoTramite = CatalogDetailController.findxCodigoCodcatalogo(tramite.getTipotramite(), tramite.getTipotramitecodigo());
tipoAutorizacion = CatalogDetailController.findxCodigoCodcatalogo(tramite.getTipoautorizacion(), tramite.getTipoautorizacioncodigo());
setNumeroSolicitudPorTramite();
TgeneCatalogDetail categoria = CatalogDetailController.findxCodigoCodcatalogo(tramite.getCategoria(), tramite.getCategoriacodigo());
actividad = CatalogDetailController.findxCodigoCodcatalogo(tramite.getUsoactividad(), tramite.getUsoactividadcodigo());
this.getSolicitud().addField("tipoTramite", tipoTramite.getDescription());
@ -1758,19 +1761,17 @@ public class TramiteArmasController extends AbstractController<AbstractDataTrans
mostrarFiltroAUCP = Boolean.TRUE;
}
//
listaPersonasDetailVen = new HashSet<TcustPersonDetail>();
Set<String> listaCodigos = new HashSet<String>();
listaPersonasDetailVen = new HashSet<>();
Set<String> 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<TarmArmas> 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<AbstractDataTrans
*
* @param event
*/
public void onReturnCarga(SelectEvent event) {
public void onReturnCarga(SelectEvent event) {
TarmCarga carga = (TarmCarga) event.getObject();
filterAUCP = carga.getAucp();
solicitud.getRecord().setAucp(filterAUCP);
@ -2220,6 +2221,7 @@ public class TramiteArmasController extends AbstractController<AbstractDataTrans
if (armas.getLrecord() == null) {
armas.setLrecord(new ArrayList<TarmArmas>());
}
}
/**
@ -2301,7 +2303,10 @@ public class TramiteArmasController extends AbstractController<AbstractDataTrans
public TcustPersonDetail buscarPersonaMaia(String numeroDocumento, String tipoDocumento) {
return PersonDetailController.findxidentification(numeroDocumento, tipoDocumento);
}
/** ============================= buscar EstadoTramite =============================*/
/**
* ============================= buscar EstadoTramite =============================
*/
/**
* M&eacute;todo para obtener los codigos
@ -2316,8 +2321,9 @@ public class TramiteArmasController extends AbstractController<AbstractDataTrans
*
* @param documento
*/
/** ================= GENERAR SQL =================== */
/**
* ================= GENERAR SQL ===================
*/
public TcustPersonDetail buscarPersonaSnap(String documento, String tipoDocumento) {
if (tipoDocumento.equals(codigoCedula)) {
Cedula cedula = ClienteCedula.obtenerCedula(documento);
@ -2364,7 +2370,9 @@ public class TramiteArmasController extends AbstractController<AbstractDataTrans
return ltipoidenti;
}
/************** AGREGADOS PARA EL TIPO DE PAGO ************ */
/**
* ************ AGREGADOS PARA EL TIPO DE PAGO ************
*/
public List<TgeneCatalogDetail> getLtipopago() {
return ltipopago;
}
@ -2372,10 +2380,7 @@ public class TramiteArmasController extends AbstractController<AbstractDataTrans
public void setLtipopago(List<TgeneCatalogDetail> ltipopago) {
this.ltipopago = ltipopago;
}
/**
* Entrega el valor de: ltipotramite
*