Agregamos tipo autorizacion a tareas de solicitud
This commit is contained in:
parent
2c0aae0c7c
commit
009558163e
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:05:10 ECT 2022
|
#Thu Dec 29 11:38:40 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.bpm
|
groupId=com.fp.base.bpm
|
||||||
artifactId=bpmlib
|
artifactId=bpmlib
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:05:04 ECT 2022
|
#Thu Dec 29 11:38:34 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.bpm
|
groupId=com.fp.base.bpm
|
||||||
artifactId=simple
|
artifactId=simple
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:05:31 ECT 2022
|
#Thu Dec 29 11:39:01 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.business
|
groupId=com.fp.base.business
|
||||||
artifactId=armas
|
artifactId=armas
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:05:24 ECT 2022
|
#Thu Dec 29 11:38:54 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.business
|
groupId=com.fp.base.business
|
||||||
artifactId=general
|
artifactId=general
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:05:26 ECT 2022
|
#Thu Dec 29 11:38:56 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.business
|
groupId=com.fp.base.business
|
||||||
artifactId=log
|
artifactId=log
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:05:21 ECT 2022
|
#Thu Dec 29 11:38:51 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.business
|
groupId=com.fp.base.business
|
||||||
artifactId=person
|
artifactId=person
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:05:25 ECT 2022
|
#Thu Dec 29 11:38:55 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.business
|
groupId=com.fp.base.business
|
||||||
artifactId=report
|
artifactId=report
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:05:28 ECT 2022
|
#Thu Dec 29 11:38:57 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.business
|
groupId=com.fp.base.business
|
||||||
artifactId=viaticos
|
artifactId=viaticos
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:05:18 ECT 2022
|
#Thu Dec 29 11:38:48 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.core
|
groupId=com.fp.base.core
|
||||||
artifactId=alfresco-client
|
artifactId=alfresco-client
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:05:06 ECT 2022
|
#Thu Dec 29 11:38:36 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.core
|
groupId=com.fp.base.core
|
||||||
artifactId=bpm
|
artifactId=bpm
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:05:17 ECT 2022
|
#Thu Dec 29 11:38:47 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.core
|
groupId=com.fp.base.core
|
||||||
artifactId=firmas
|
artifactId=firmas
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:04:49 ECT 2022
|
#Thu Dec 29 11:38:22 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.dto
|
groupId=com.fp.base.dto
|
||||||
artifactId=common
|
artifactId=common
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:04:47 ECT 2022
|
#Thu Dec 29 11:38:20 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.dto
|
groupId=com.fp.base.dto
|
||||||
artifactId=dto
|
artifactId=dto
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:05:33 ECT 2022
|
#Thu Dec 29 11:39:03 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base
|
groupId=com.fp.base
|
||||||
artifactId=facade
|
artifactId=facade
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,6 @@ public class ServiceLocator {
|
||||||
props.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
|
props.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
|
||||||
|
|
||||||
server = "jnp://" + ph.getStringValue("server") + ":" + ph.getStringValue("port");
|
server = "jnp://" + ph.getStringValue("server") + ":" + ph.getStringValue("port");
|
||||||
System.out.println("Apuntando al server >>>" +server);
|
|
||||||
props.put(Context.PROVIDER_URL, server);
|
props.put(Context.PROVIDER_URL, server);
|
||||||
Context jndiContext = new InitialContext(props);
|
Context jndiContext = new InitialContext(props);
|
||||||
String a = ph.getStringValue("ear") + ph.getStringValue("bean");
|
String a = ph.getStringValue("ear") + ph.getStringValue("bean");
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:05:32 ECT 2022
|
#Thu Dec 29 11:39:02 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base
|
groupId=com.fp.base
|
||||||
artifactId=facadeclient
|
artifactId=facadeclient
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:04:59 ECT 2022
|
#Thu Dec 29 11:38:30 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.persistence
|
groupId=com.fp.base.persistence
|
||||||
artifactId=commondb
|
artifactId=commondb
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:05:16 ECT 2022
|
#Thu Dec 29 11:38:46 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.persistence
|
groupId=com.fp.base.persistence
|
||||||
artifactId=parmas
|
artifactId=parmas
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:04:51 ECT 2022
|
#Thu Dec 29 11:38:23 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.persistence
|
groupId=com.fp.base.persistence
|
||||||
artifactId=pbpm
|
artifactId=pbpm
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:05:02 ECT 2022
|
#Thu Dec 29 11:38:32 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.persistence
|
groupId=com.fp.base.persistence
|
||||||
artifactId=pcustomer
|
artifactId=pcustomer
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:05:13 ECT 2022
|
#Thu Dec 29 11:38:43 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.persistence
|
groupId=com.fp.base.persistence
|
||||||
artifactId=pfirmas
|
artifactId=pfirmas
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:04:57 ECT 2022
|
#Thu Dec 29 11:38:28 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.persistence
|
groupId=com.fp.base.persistence
|
||||||
artifactId=pgeneral
|
artifactId=pgeneral
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:05:11 ECT 2022
|
#Thu Dec 29 11:38:41 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.persistence
|
groupId=com.fp.base.persistence
|
||||||
artifactId=plog
|
artifactId=plog
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:05:13 ECT 2022
|
#Thu Dec 29 11:38:42 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.persistence
|
groupId=com.fp.base.persistence
|
||||||
artifactId=pviaticos
|
artifactId=pviaticos
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:05:03 ECT 2022
|
#Thu Dec 29 11:38:33 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base.persistence
|
groupId=com.fp.base.persistence
|
||||||
artifactId=util
|
artifactId=util
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:05:19 ECT 2022
|
#Thu Dec 29 11:38:49 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.base
|
groupId=com.fp.base
|
||||||
artifactId=sessionbeans
|
artifactId=sessionbeans
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:05:33 ECT 2022
|
#Thu Dec 29 11:39:04 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.clients.maia
|
groupId=com.fp.clients.maia
|
||||||
artifactId=maiaear
|
artifactId=maiaear
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Wed Dec 21 09:05:33 ECT 2022
|
#Thu Dec 29 11:39:03 ECT 2022
|
||||||
version=2.1
|
version=2.1
|
||||||
groupId=com.fp.clients.maia
|
groupId=com.fp.clients.maia
|
||||||
artifactId=environment-eap6
|
artifactId=environment-eap6
|
||||||
|
|
|
||||||
|
|
@ -141,7 +141,7 @@ public class ConocimientoLovController extends AbstractController<AbstractDataTr
|
||||||
MessageHelper.setMessageError("PROBLEMAS DE PARAMETRIZACION. CONSULTE AL EVALUADOR");
|
MessageHelper.setMessageError("PROBLEMAS DE PARAMETRIZACION. CONSULTE AL EVALUADOR");
|
||||||
error = "PROBLEMAS DE PARAMETRIZACION. CONSULTE AL EVALUADOR";
|
error = "PROBLEMAS DE PARAMETRIZACION. CONSULTE AL EVALUADOR";
|
||||||
errorrend = true;
|
errorrend = true;
|
||||||
System.out.println("Error");
|
System.out.println("Error: "+e.toString());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -688,7 +688,6 @@ private String descategoria;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void update() throws Exception {
|
public void update() throws Exception {
|
||||||
System.out.println(" Estamos en la matrix");
|
|
||||||
TgeneCatalogDetail estado = CatalogDetailController.findxCodigoCodcatalogo(record.getEstado(), record.getEstadocodigo());
|
TgeneCatalogDetail estado = CatalogDetailController.findxCodigoCodcatalogo(record.getEstado(), record.getEstadocodigo());
|
||||||
TgeneCatalogDetail marca = CatalogDetailController.findxCodigoCodcatalogo(record.getMarca(), record.getMarcacodigo());
|
TgeneCatalogDetail marca = CatalogDetailController.findxCodigoCodcatalogo(record.getMarca(), record.getMarcacodigo());
|
||||||
record.getModifiedData().put("estado", estado.getDescription());
|
record.getModifiedData().put("estado", estado.getDescription());
|
||||||
|
|
|
||||||
|
|
@ -328,10 +328,12 @@ public class CertificadosArmasController extends AbstractController<TarmArmas> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
codigosArma.add(codigos);
|
codigosArma.add(codigos);
|
||||||
|
|
||||||
List<String> estadossArma = new ArrayList<>();
|
List<String> estadossArma = new ArrayList<>();
|
||||||
|
|
||||||
estadossArma.add(" t.estado !='CDP' and t.estado !='VEND' and t.estado!='TRAS' and t.estado!='MING' and t.estado!='DEST' and t.estado!='DUPL' and t.estado!='CUSTEM' and t.estado!='ENTR'"
|
estadossArma.add(" t.estado !='CDP' and t.estado !='VEND' and t.estado!='TRAS' and t.estado!='MING' and t.estado!='DEST' and t.estado!='DUPL' and t.estado!='CUSTEM' and t.estado!='ENTR'"
|
||||||
+ " and (t.peso>0 or t.cantidad>0) ");//t.estado !='DEST' and and t.estado !='DEC'//destruidas - cambiodepropietario - vendidas - decomisadas - suspendida - cancelada - incautada
|
+ " and (t.peso>0 or t.cantidad>0) ");//t.estado !='DEST' and and t.estado !='DEC'//destruidas - cambiodepropietario - vendidas - decomisadas - suspendida - cancelada - incautada
|
||||||
|
|
||||||
List<String> codigoPersona = new ArrayList<>();
|
List<String> codigoPersona = new ArrayList<>();
|
||||||
codigoPersona.add(filtroPersona);
|
codigoPersona.add(filtroPersona);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,7 @@ public class IngresoFichaTecnicaArmasController extends AbstractController<TarmA
|
||||||
* Controlador que maneja armas
|
* Controlador que maneja armas
|
||||||
*/
|
*/
|
||||||
@ManagedProperty(value = "#{armasController}")
|
@ManagedProperty(value = "#{armasController}")
|
||||||
private ArmasController armas;
|
private ArmasController armamentoController;
|
||||||
|
|
||||||
private TarmArmas arma = new TarmArmas();
|
private TarmArmas arma = new TarmArmas();
|
||||||
|
|
||||||
|
|
@ -343,15 +343,17 @@ public class IngresoFichaTecnicaArmasController extends AbstractController<TarmA
|
||||||
estadoarma = "COLE";
|
estadoarma = "COLE";
|
||||||
}
|
}
|
||||||
tarmArmaObj.setEstado(estadoarma);
|
tarmArmaObj.setEstado(estadoarma);
|
||||||
if (armas.getMfilters().get("csolicitud") != null) {
|
|
||||||
armas.getMfilters().remove("csolicitud");
|
|
||||||
|
if (armamentoController.getMfilters().get("csolicitud") != null) {
|
||||||
|
armamentoController.getMfilters().remove("csolicitud");
|
||||||
}
|
}
|
||||||
armas.update(tarmArmaObj);
|
armamentoController.update(tarmArmaObj);
|
||||||
armas.save();
|
armamentoController.save();
|
||||||
} else if (record.getApruebaevaluacion().equals("N")) {
|
} else if (record.getApruebaevaluacion().equals("N")) {
|
||||||
tarmArmaObj.setEstado("NAPT");
|
tarmArmaObj.setEstado("NAPT");
|
||||||
armas.update(tarmArmaObj);
|
armamentoController.update(tarmArmaObj);
|
||||||
armas.save();
|
armamentoController.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
Request request = callerhelper.getRequest();
|
Request request = callerhelper.getRequest();
|
||||||
|
|
@ -364,16 +366,17 @@ public class IngresoFichaTecnicaArmasController extends AbstractController<TarmA
|
||||||
msave.put(beanalias, dtosave);
|
msave.put(beanalias, dtosave);
|
||||||
request.setSaveTables(msave);
|
request.setSaveTables(msave);
|
||||||
|
|
||||||
DtoSave dtoSaveArma = armas.getDtoSave();
|
DtoSave dtoSaveArma = armamentoController.getDtoSave();
|
||||||
dtoSaveArma.setIsForm(Boolean.TRUE);
|
dtoSaveArma.setIsForm(Boolean.TRUE);
|
||||||
dtoSaveArma.setReturnpk(Boolean.TRUE);
|
dtoSaveArma.setReturnpk(Boolean.TRUE);
|
||||||
dtoSaveArma.setPosition(1);
|
dtoSaveArma.setPosition(1);
|
||||||
msave.put(armas.getBeanalias(), dtoSaveArma);
|
msave.put(armamentoController.getBeanalias(), dtoSaveArma);
|
||||||
|
|
||||||
Response resp = callerhelper.executeSave(request);
|
Response resp = callerhelper.executeSave(request);
|
||||||
if (resp.getResponseCode().compareTo(Response.RESPONSE_OK) == 0) {
|
if (resp.getResponseCode().compareTo(Response.RESPONSE_OK) == 0) {
|
||||||
this.postCommit(resp);
|
this.postCommit(resp);
|
||||||
MessageHelper.setMessageInfo(resp);
|
MessageHelper.setMessageInfo(resp);
|
||||||
|
|
||||||
record.modifiedData().put("GUARDA", "S");
|
record.modifiedData().put("GUARDA", "S");
|
||||||
MessageHelper.setMessageInfo(resp);
|
MessageHelper.setMessageInfo(resp);
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -1323,11 +1326,11 @@ public class IngresoFichaTecnicaArmasController extends AbstractController<TarmA
|
||||||
}
|
}
|
||||||
|
|
||||||
public ArmasController getArmas() {
|
public ArmasController getArmas() {
|
||||||
return armas;
|
return armamentoController;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setArmas(ArmasController armas) {
|
public void setArmas(ArmasController armas) {
|
||||||
this.armas = armas;
|
this.armamentoController = armas;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getTramiteingresado() {
|
public String getTramiteingresado() {
|
||||||
|
|
|
||||||
|
|
@ -450,7 +450,6 @@ public class PagarTarjetaController extends AbstractController<TarmSolicitudTram
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public void guardarTransaccion(String mostrar){
|
public void guardarTransaccion(String mostrar){
|
||||||
System.out.println(new Date()+".. QMasVe Please>>>>>"+mostrar);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**=========================================================*/
|
/**=========================================================*/
|
||||||
|
|
|
||||||
|
|
@ -349,7 +349,6 @@ public class ReporteDestruccionArmasController extends AbstractController<TarmDe
|
||||||
parameters.put("codResponsable", this.responsableCentroControl.getPk().getPersoncode());
|
parameters.put("codResponsable", this.responsableCentroControl.getPk().getPersoncode());
|
||||||
parameters.put("gradoUsuario", gradoUsuario.trim());
|
parameters.put("gradoUsuario", gradoUsuario.trim());
|
||||||
try {
|
try {
|
||||||
|
|
||||||
//Usuario logueado en la aplicacion
|
//Usuario logueado en la aplicacion
|
||||||
String nombreUsuario;
|
String nombreUsuario;
|
||||||
if (userDetail.getPk().getPersoncode() != null) {
|
if (userDetail.getPk().getPersoncode() != null) {
|
||||||
|
|
|
||||||
|
|
@ -1418,7 +1418,7 @@ public class TramiteArmasController extends AbstractController<AbstractDataTrans
|
||||||
*/
|
*/
|
||||||
public void setNumeroSolicitudPorTramite(){
|
public void setNumeroSolicitudPorTramite(){
|
||||||
if(this.tipoAutorizacion.getLegalcode() != null && this.solicitud.getRecord().getNumerosolicitud()!=null){
|
if(this.tipoAutorizacion.getLegalcode() != null && this.solicitud.getRecord().getNumerosolicitud()!=null){
|
||||||
this.solicitud.getRecord().setNumerosolicitud(this.numeroSolicitudBase.concat(this.tipoAutorizacion.getLegalcode()));
|
this.solicitud.getRecord().setNumerosolicitud(this.numeroSolicitudBase);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,10 +20,15 @@ import com.fp.dto.query.DtoQuery;
|
||||||
import com.fp.dto.query.SubQuery;
|
import com.fp.dto.query.SubQuery;
|
||||||
import com.fp.frontend.controller.AbstractController;
|
import com.fp.frontend.controller.AbstractController;
|
||||||
import com.fp.frontend.controller.armas.solicitud.DocumentoHabilitanteController;
|
import com.fp.frontend.controller.armas.solicitud.DocumentoHabilitanteController;
|
||||||
|
import com.fp.frontend.controller.armas.solicitud.SolicitudController;
|
||||||
|
import com.fp.frontend.controller.armas.solicitud.TarmTramiteController;
|
||||||
import com.fp.frontend.controller.pcustomer.PersonDetailController;
|
import com.fp.frontend.controller.pcustomer.PersonDetailController;
|
||||||
|
import com.fp.frontend.controller.pgeneral.gene.CatalogDetailController;
|
||||||
import com.fp.frontend.controller.pgeneral.gene.ParametersController;
|
import com.fp.frontend.controller.pgeneral.gene.ParametersController;
|
||||||
import com.fp.frontend.helper.MessageHelper;
|
import com.fp.frontend.helper.MessageHelper;
|
||||||
|
import com.fp.persistence.parmas.param.TarmTramite;
|
||||||
import com.fp.persistence.parmas.soli.TarmDocumentoHabilitante;
|
import com.fp.persistence.parmas.soli.TarmDocumentoHabilitante;
|
||||||
|
import com.fp.persistence.parmas.soli.TarmSolicitud;
|
||||||
import com.fp.persistence.pbpm.gene.TbpmGroupsUsers;
|
import com.fp.persistence.pbpm.gene.TbpmGroupsUsers;
|
||||||
import com.fp.persistence.pcustomer.gene.TcustPersonDetail;
|
import com.fp.persistence.pcustomer.gene.TcustPersonDetail;
|
||||||
import com.fp.persistence.pgeneral.gene.TgeneParameters;
|
import com.fp.persistence.pgeneral.gene.TgeneParameters;
|
||||||
|
|
@ -141,13 +146,14 @@ public class InboxController extends AbstractController<TgeneTransactionLog> {
|
||||||
request.put("queryalias", "INBOX_TRN_GROUP");
|
request.put("queryalias", "INBOX_TRN_GROUP");
|
||||||
request.put("querytype", "P");
|
request.put("querytype", "P");
|
||||||
request.put("groupId", codBpmGroupSelected);
|
request.put("groupId", codBpmGroupSelected);
|
||||||
|
|
||||||
Response resp = callerhelper.executeQuery(request);
|
Response resp = callerhelper.executeQuery(request);
|
||||||
if (resp.getResponseCode().compareTo(Response.RESPONSE_OK) != 0) {
|
if (resp.getResponseCode().compareTo(Response.RESPONSE_OK) != 0) {
|
||||||
lTransactionsByGroup = new ArrayList<Map<String, Object>>();
|
lTransactionsByGroup = new ArrayList<Map<String, Object>>();
|
||||||
MessageHelper.setMessageError(resp);
|
MessageHelper.setMessageError(resp);
|
||||||
} else {
|
} else {
|
||||||
lTransactionsByGroup = (List<Map<String, Object>>) resp.get("transactions");
|
lTransactionsByGroup = (List<Map<String, Object>>) resp.get("transactions");
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
||||||
MessageHelper.setMessageError(e);
|
MessageHelper.setMessageError(e);
|
||||||
|
|
@ -165,13 +171,45 @@ public class InboxController extends AbstractController<TgeneTransactionLog> {
|
||||||
Request request = callerhelper.getRequest();
|
Request request = callerhelper.getRequest();
|
||||||
request.put("queryalias", "INBOX_TRN");
|
request.put("queryalias", "INBOX_TRN");
|
||||||
request.put("querytype", "P");
|
request.put("querytype", "P");
|
||||||
|
/** VARIABLES PARA BUSCAR EL TIPO AUTORIZACION SI ES QUE ES SOLICITUD */
|
||||||
|
String logSolicitude = null;
|
||||||
|
TarmSolicitud solicitud= null;
|
||||||
|
TarmTramite tramite = null;
|
||||||
|
String tipoAutorizacionAux = null;
|
||||||
|
String tipoAutorizacion = null;
|
||||||
Response resp = callerhelper.executeQuery(request);
|
Response resp = callerhelper.executeQuery(request);
|
||||||
if (resp.getResponseCode().compareTo(Response.RESPONSE_OK) != 0) {
|
if (resp.getResponseCode().compareTo(Response.RESPONSE_OK) != 0) {
|
||||||
lTransactions = new ArrayList<Map<String, Object>>();
|
lTransactions = new ArrayList<Map<String, Object>>();
|
||||||
MessageHelper.setMessageError(resp);
|
MessageHelper.setMessageError(resp);
|
||||||
} else {
|
} else {
|
||||||
lTransactions = (List<Map<String, Object>>) resp.get("transactions");
|
//Manipular la respuesta de transacciones 'No conozco la base del jbpm'
|
||||||
|
List<Map<String, Object>> lstAux = (List<Map<String, Object>>) resp.get("transactions");
|
||||||
|
List<Map<String, Object>> lTasks = null;
|
||||||
|
for (int i = 0; i < lstAux.size(); i++) {
|
||||||
|
Map<String,Object> mapaPadre = lstAux.get(i);
|
||||||
|
lTasks =(List<Map<String, Object>>) mapaPadre.get("tasks");
|
||||||
|
if(lTasks !=null){
|
||||||
|
for (int j = 0; j < lTasks.size(); j++) {
|
||||||
|
logSolicitude = lTasks.get(j).get("logsolicitude").toString();
|
||||||
|
|
||||||
|
tipoAutorizacion = verificarTipoAutorizacion(logSolicitude, solicitud, tramite, tipoAutorizacionAux);
|
||||||
|
Map<String, Object> lTask = (Map<String, Object>) lTasks.get(j);
|
||||||
|
lTask.put("tipoAutorizacion", tipoAutorizacion);
|
||||||
|
lTasks.set(j, lTask);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
mapaPadre.put("tasks",lTasks);
|
||||||
|
lstAux.set(i, mapaPadre);
|
||||||
|
|
||||||
|
/**
|
||||||
|
Map<String, Object> objeto = lstAux.get(i) ;
|
||||||
|
objeto.put("tasks", task);
|
||||||
|
lstAux.set(i, objeto);*/
|
||||||
|
}
|
||||||
|
lTransactions = lstAux;
|
||||||
}
|
}
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
||||||
MessageHelper.setMessageError(e);
|
MessageHelper.setMessageError(e);
|
||||||
|
|
@ -181,7 +219,24 @@ public class InboxController extends AbstractController<TgeneTransactionLog> {
|
||||||
// this.fillTransactions(this.lTransactions, false);
|
// this.fillTransactions(this.lTransactions, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* METODO PARA OBTENER EL TIPO DE AUTORIZACION CON LOGSOLICITUDE
|
||||||
|
*/
|
||||||
|
public String verificarTipoAutorizacion(String logSolicitude,TarmSolicitud solicitud, TarmTramite tramite,String tipoAutorizacion){
|
||||||
|
try {
|
||||||
|
if(logSolicitude!= null && logSolicitude.trim().startsWith("SOL-")){
|
||||||
|
solicitud = SolicitudController.findSolicitudxnumerosolicitud(logSolicitude.trim());
|
||||||
|
tramite = TarmTramiteController.find(solicitud.getCtramite().toString());
|
||||||
|
tipoAutorizacion = CatalogDetailController.findCatalogo(tramite.getTipoautorizacioncodigo(), tramite.getTipoautorizacion()).getDescription();
|
||||||
|
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
tipoAutorizacion="";
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
return tipoAutorizacion;
|
||||||
|
}
|
||||||
private void fillTransactions(List<Map<String, Object>> lTransactions, boolean isGroup) {
|
private void fillTransactions(List<Map<String, Object>> lTransactions, boolean isGroup) {
|
||||||
for (Map<String, Object> map : lTransactions) {
|
for (Map<String, Object> map : lTransactions) {
|
||||||
String tModule = (String) map.get("m");
|
String tModule = (String) map.get("m");
|
||||||
|
|
@ -215,7 +270,21 @@ public class InboxController extends AbstractController<TgeneTransactionLog> {
|
||||||
} else {
|
} else {
|
||||||
List<Map<String, Object>> lTasks = (List<Map<String, Object>>) resp.get("tasks");
|
List<Map<String, Object>> lTasks = (List<Map<String, Object>>) resp.get("tasks");
|
||||||
map.put("tasks", lTasks);
|
map.put("tasks", lTasks);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* BUSCANDO EL TIPO AUTORIZACION
|
||||||
|
*/
|
||||||
|
String logSolicitude = null;
|
||||||
|
String tipoAutorizacion = "";
|
||||||
|
TarmSolicitud solicitud= null;
|
||||||
|
TarmTramite tramite = null;
|
||||||
|
String tipoAutorizacionAux = null;
|
||||||
for (Map<String, Object> mapTask : lTasks) {
|
for (Map<String, Object> mapTask : lTasks) {
|
||||||
|
logSolicitude = mapTask.get("logsolicitude").toString();
|
||||||
|
if(logSolicitude.startsWith("SOL-")){
|
||||||
|
tipoAutorizacion = verificarTipoAutorizacion(logSolicitude, solicitud, tramite, tipoAutorizacionAux);
|
||||||
|
mapTask.put("tipoAutorizacion", tipoAutorizacion);
|
||||||
|
}
|
||||||
this.fillTaskDetail(mapTask);
|
this.fillTaskDetail(mapTask);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -237,9 +306,15 @@ public class InboxController extends AbstractController<TgeneTransactionLog> {
|
||||||
MessageHelper.setMessageError(resp);
|
MessageHelper.setMessageError(resp);
|
||||||
} else {
|
} else {
|
||||||
Map<String, Object> param = (Map<String, Object>) resp.get("param");
|
Map<String, Object> param = (Map<String, Object>) resp.get("param");
|
||||||
|
for (Map.Entry<String, Object> entry : mapTask.entrySet()) {
|
||||||
|
String key = entry.getKey();
|
||||||
|
Object value = entry.getValue();
|
||||||
|
|
||||||
|
}
|
||||||
param.put("TID", mapTask.get("tid"));
|
param.put("TID", mapTask.get("tid"));
|
||||||
param.put("KIND", resp.get("k"));
|
param.put("KIND", resp.get("k"));
|
||||||
mapTask.put("taskDetail", resp);
|
mapTask.put("taskDetail", resp);
|
||||||
|
|
||||||
}
|
}
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
||||||
MessageHelper.setMessageError(e);
|
MessageHelper.setMessageError(e);
|
||||||
|
|
@ -589,7 +664,6 @@ public class InboxController extends AbstractController<TgeneTransactionLog> {
|
||||||
String mensaje = param != null ?
|
String mensaje = param != null ?
|
||||||
String.format(param.getTextvalue(), doc.getNumerodocumento(),doc.getFechacambioexpiracion()) :
|
String.format(param.getTextvalue(), doc.getNumerodocumento(),doc.getFechacambioexpiracion()) :
|
||||||
String.format("Su permiso asociado a %s esta a punto de caducar en la fecha %s", doc.getNumerodocumento(),doc.getFechaexpiracion());
|
String.format("Su permiso asociado a %s esta a punto de caducar en la fecha %s", doc.getNumerodocumento(),doc.getFechaexpiracion());
|
||||||
System.out.println("Mensaje: "+mensaje);
|
|
||||||
|
|
||||||
MessageHelper.setMessageInfo(mensaje);
|
MessageHelper.setMessageInfo(mensaje);
|
||||||
RequestContext.getCurrentInstance().execute("PF('advicesDialog').show()");
|
RequestContext.getCurrentInstance().execute("PF('advicesDialog').show()");
|
||||||
|
|
|
||||||
|
|
@ -116,8 +116,6 @@
|
||||||
</p:column>
|
</p:column>
|
||||||
</p:dataTable>
|
</p:dataTable>
|
||||||
</p:panelGrid>
|
</p:panelGrid>
|
||||||
|
|
||||||
</h:form>
|
</h:form>
|
||||||
|
|
||||||
</ui:define>
|
</ui:define>
|
||||||
</ui:composition>
|
</ui:composition>
|
||||||
|
|
@ -174,6 +174,12 @@
|
||||||
style="cursor:pointer;" escape="false"
|
style="cursor:pointer;" escape="false"
|
||||||
onclick="enableBpmData([{name: 'kind', value: '#{task['taskDetail']['k']}'}, {name: 'tid', value: '#{task['tid']}'}, {name: 's', value: '#{task['taskDetail']['s']}'}]);
|
onclick="enableBpmData([{name: 'kind', value: '#{task['taskDetail']['k']}'}, {name: 'tid', value: '#{task['tid']}'}, {name: 's', value: '#{task['taskDetail']['s']}'}]);
|
||||||
Maiaworkspace.loadPage('#{transaction['pjsfurl']}', '#{transaction['name']}', '#{task['taskDetail']['param']}')" />
|
Maiaworkspace.loadPage('#{transaction['pjsfurl']}', '#{transaction['name']}', '#{task['taskDetail']['param']}')" />
|
||||||
|
<br/>
|
||||||
|
<h:outputLabel value="#{task['tipoAutorizacion']}"
|
||||||
|
style="cursor:pointer;" escape="false"
|
||||||
|
onclick="enableBpmData([{name: 'kind', value: '#{task['taskDetail']['k']}'}, {name: 'tid', value: '#{task['tid']}'}, {name: 's', value: '#{task['taskDetail']['s']}'}]);
|
||||||
|
Maiaworkspace.loadPage('#{transaction['pjsfurl']}', '#{transaction['name']}', '#{task['taskDetail']['param']}')" />
|
||||||
|
|
||||||
</p:tab>
|
</p:tab>
|
||||||
</p:accordionPanel>
|
</p:accordionPanel>
|
||||||
</p:tab>
|
</p:tab>
|
||||||
|
|
@ -207,6 +213,12 @@
|
||||||
<h:outputLabel value="#{task['taskDetail']['detail']}"
|
<h:outputLabel value="#{task['taskDetail']['detail']}"
|
||||||
style="cursor:pointer;" escape="false"
|
style="cursor:pointer;" escape="false"
|
||||||
onclick="assignTask([{name: 'tid', value: '#{task['tid']}'}]);" />
|
onclick="assignTask([{name: 'tid', value: '#{task['tid']}'}]);" />
|
||||||
|
<br/>
|
||||||
|
<h:outputLabel
|
||||||
|
value="#{task['tipoAutorizacion']}"
|
||||||
|
style="cursor:pointer;" escape="false"
|
||||||
|
onclick="assignTask([{name: 'tid', value: '#{task['tid']}'}]);" />
|
||||||
|
|
||||||
</p:tab>
|
</p:tab>
|
||||||
</p:accordionPanel>
|
</p:accordionPanel>
|
||||||
</p:tab>
|
</p:tab>
|
||||||
|
|
|
||||||
|
|
@ -253,12 +253,16 @@ public class testFactura {
|
||||||
}
|
}
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
//correrClase();
|
//correrClase();
|
||||||
|
Map<String,String> sexo = new HashMap();
|
||||||
Scanner sc = new Scanner(new InputStreamReader(System.in));
|
sexo.put("uno", "uno");
|
||||||
|
sexo.put("dos", "dos");
|
||||||
|
System.out.println("Prueba > "+sexo.get("uno"));
|
||||||
|
System.out.println("Prueba > "+sexo.get("tres"));
|
||||||
|
/** Scanner sc = new Scanner(new InputStreamReader(System.in));
|
||||||
System.out.println("Ingrese un numero: ");
|
System.out.println("Ingrese un numero: ");
|
||||||
int value1= sc.nextInt();
|
int value1= sc.nextInt();
|
||||||
System.out.println("Ingrese un numero: ");
|
System.out.println("Ingrese un numero: ");
|
||||||
int value2= sc.nextInt();
|
int value2= sc.nextInt();
|
||||||
System.out.println("La suma de los dos numeros es:" +(value1+value2));
|
System.out.println("La suma de los dos numeros es:" +(value1+value2)); */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue