migracion casi lista
This commit is contained in:
cruales
parent
88cfd5a9d7
commit
a2cc63287e
|
|
@ -227,7 +227,7 @@ public final class FlowUtil {
|
|||
if (!lemail.isEmpty()) {
|
||||
HashMap<String, Object> m = (HashMap<String, Object>) pParam;
|
||||
((Request) m.get("request")).put("cusuariobpm", taskinfo.getUserId());
|
||||
//RuleUtil.sendMail((Request) m.get("request"));
|
||||
RuleUtil.sendMail((Request) m.get("request"));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -261,7 +261,7 @@ public final class FlowUtil {
|
|||
if(taskinfo!=null && taskinfo.getAditionalData()!=null && taskinfo.getAditionalData().get("datosmail")!=null && !taskinfo.getAditionalData().get("datosmail").equals("")){
|
||||
((Request) m.get("request")).putAll((Map)taskinfo.getAditionalData().get("datosmail"));
|
||||
}
|
||||
//RuleUtil.sendMail((Request) m.get("request"));
|
||||
RuleUtil.sendMail((Request) m.get("request"));
|
||||
}else{
|
||||
RuleUtil.setSubjectTemplate(63);
|
||||
TgeneParameters addres=TgeneParameters.find(PersistenceHelper.getEntityManager(), new TgeneParametersKey("MAIL.CENTRAL", 1));
|
||||
|
|
@ -271,7 +271,7 @@ public final class FlowUtil {
|
|||
if(taskinfo!=null && taskinfo.getAditionalData()!=null && taskinfo.getAditionalData().get("datosmail")!=null && !taskinfo.getAditionalData().get("datosmail").equals("")){
|
||||
((Request) m.get("request")).putAll((Map)taskinfo.getAditionalData().get("datosmail"));
|
||||
}
|
||||
//RuleUtil.sendMail((Request) m.get("request"));
|
||||
RuleUtil.sendMail((Request) m.get("request"));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -305,7 +305,7 @@ public final class FlowUtil {
|
|||
if(taskinfo!=null && taskinfo.getAditionalData()!=null && taskinfo.getAditionalData().get("datosmail")!=null){
|
||||
((Request) m.get("request")).putAll((Map)taskinfo.getAditionalData().get("datosmail"));
|
||||
}
|
||||
// RuleUtil.sendMail((Request) m.get("request"));
|
||||
RuleUtil.sendMail((Request) m.get("request"));
|
||||
}else{
|
||||
RuleUtil.setSubjectTemplate(63);
|
||||
TgeneParameters addres=TgeneParameters.find(PersistenceHelper.getEntityManager(), new TgeneParametersKey("MAIL.CENTRAL", 1));
|
||||
|
|
@ -315,7 +315,7 @@ public final class FlowUtil {
|
|||
if(taskinfo!=null && taskinfo.getAditionalData()!=null && taskinfo.getAditionalData().get("datosmail")!=null){
|
||||
((Request) m.get("request")).putAll((Map)taskinfo.getAditionalData().get("datosmail"));
|
||||
}
|
||||
// RuleUtil.sendMail((Request) m.get("request"));
|
||||
RuleUtil.sendMail((Request) m.get("request"));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -56,10 +56,12 @@ public class TransactionListGroup extends QueryRule {
|
|||
request = pQueryRequest;
|
||||
this.prepareList();
|
||||
List<Map<String, Object>> data = new ArrayList<Map<String, Object>>();
|
||||
Map<String, Object> rec = null;
|
||||
TransactionDTO tr = null;
|
||||
for (Entry<String, Integer> e : trn.entrySet()) {
|
||||
Map<String, Object> rec = new HashMap<String, Object>();
|
||||
rec = new HashMap<String, Object>();
|
||||
rec.put("c", e.getValue());
|
||||
TransactionDTO tr = trnDTO.get(e.getKey());
|
||||
tr = trnDTO.get(e.getKey());
|
||||
rec.put("m", tr.getModule());
|
||||
rec.put("t", tr.getTransaction());
|
||||
rec.put("v", tr.getVersion());
|
||||
|
|
@ -82,12 +84,17 @@ public class TransactionListGroup extends QueryRule {
|
|||
if (request.get("groupId") == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
List<Object[]> t = htc.getTasksByGroup(request.getString("groupId"), "%");
|
||||
Task task = null;
|
||||
TaskUtil tu = null;
|
||||
TransactionDTO tr=null;
|
||||
Integer count = null;
|
||||
for (Object[] obj : t) {
|
||||
Task task = (Task) obj[0];
|
||||
TaskUtil tu = new TaskUtil(task, htc);
|
||||
TransactionDTO tr = tu.getTransaction();
|
||||
Integer count = trn.get(tr.toString());
|
||||
task = (Task) obj[0];
|
||||
tu = new TaskUtil(task, htc);
|
||||
tr = tu.getTransaction();
|
||||
count = trn.get(tr.toString());
|
||||
if (count == null) {
|
||||
count = 1;
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -467,12 +467,49 @@ public class HumanTaskClient {
|
|||
return lresp;
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* QUERY NATIVO DE TAREAS NO COMPLETADAS
|
||||
*/
|
||||
private static final String TAREAS_GRUPO_NATIVO = "select\n" +
|
||||
" taskimpl0_,\n"+
|
||||
" organizati1_.id\n" +
|
||||
" from\n" +
|
||||
" jbpm6.Task taskimpl0_ cross \n" +
|
||||
" join\n" +
|
||||
" jbpm6.OrganizationalEntity organizati1_ \n" +
|
||||
" where\n" +
|
||||
" (\n" +
|
||||
" organizati1_.id in (\n" +
|
||||
" :groupIds\n" +
|
||||
" )\n" +
|
||||
" ) \n" +
|
||||
" and (\n" +
|
||||
" organizati1_.id in (\n" +
|
||||
" select\n" +
|
||||
" potentialo2_.entity_id \n" +
|
||||
" from\n" +
|
||||
" jbpm6.PeopleAssignments_PotOwners potentialo2_ \n" +
|
||||
" where\n" +
|
||||
" taskimpl0_.id=potentialo2_.task_id\n" +
|
||||
" )\n" +
|
||||
" ) \n" +
|
||||
" and taskimpl0_.archived=0 \n" +
|
||||
" and (\n" +
|
||||
" taskimpl0_.actualOwner_id is null\n" +
|
||||
" ) \n" +
|
||||
" and (\n" +
|
||||
" taskimpl0_.status in (\n" +
|
||||
" 'Created' , 'Ready' , 'Reserved' , 'InProgress' , 'Suspended'\n" +
|
||||
" )\n" +
|
||||
" )";
|
||||
|
||||
|
||||
/**
|
||||
* JPQL JPQL_TASK_NOT_COMPLETEBYGROUP
|
||||
*/
|
||||
private static final String TAREAS_GRUPO = "select t, potentialOwners.id from TaskImpl t, OrganizationalEntityImpl potentialOwners "
|
||||
+ "where potentialOwners.id in (:groupIds) and potentialOwners in elements ( t.peopleAssignments.potentialOwners ) and t.archived = 0 "
|
||||
+ "where potentialOwners.id = :groupIds and potentialOwners in elements ( t.peopleAssignments.potentialOwners ) and t.archived = 0 "
|
||||
+ "and t.taskData.actualOwner = null and t.taskData.status in ('Created', 'Ready', 'Reserved', 'InProgress', 'Suspended')";
|
||||
|
||||
/**
|
||||
|
|
@ -490,6 +527,8 @@ public class HumanTaskClient {
|
|||
try {
|
||||
em = PersistenceManager.getInstance().getEntityManagerFactoryAuxiliar("org.jbpm.domain").createEntityManager();
|
||||
Query qry = em.createQuery(HumanTaskClient.TAREAS_GRUPO);
|
||||
//Query qry = em.createNativeQuery(TAREAS_GRUPO_NATIVO);
|
||||
System.out.println("GROUPS IDS "+pGroupId);
|
||||
qry.setParameter("groupIds", pGroupId);
|
||||
ldatos = qry.getResultList();
|
||||
} catch (Exception e) {
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:25:40 ECT 2023
|
||||
#Mon Jan 30 15:40:56 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base.bpm
|
||||
artifactId=bpmlib
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:25:35 ECT 2023
|
||||
#Mon Jan 30 15:40:51 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base.bpm
|
||||
artifactId=simple
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -212,7 +212,7 @@ public class ScheduleNotificacionCliente {
|
|||
}
|
||||
}
|
||||
|
||||
/*
|
||||
/**
|
||||
private void envioMail(String[] correos,String asunto,String cuerpo,String correoCC[],String correodesde) throws Exception{
|
||||
try {
|
||||
LOG.info("INGREA A ENVIAR MAIL");
|
||||
|
|
@ -237,8 +237,8 @@ public class ScheduleNotificacionCliente {
|
|||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
*/
|
||||
public EntityManagerFactory getEmf() {
|
||||
return emf;
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:26:00 ECT 2023
|
||||
#Mon Jan 30 15:41:17 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base.business
|
||||
artifactId=armas
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:25:54 ECT 2023
|
||||
#Mon Jan 30 15:41:10 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base.business
|
||||
artifactId=general
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:25:56 ECT 2023
|
||||
#Mon Jan 30 15:41:12 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base.business
|
||||
artifactId=log
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:25:51 ECT 2023
|
||||
#Mon Jan 30 15:41:07 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base.business
|
||||
artifactId=person
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:25:55 ECT 2023
|
||||
#Mon Jan 30 15:41:11 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base.business
|
||||
artifactId=report
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:25:57 ECT 2023
|
||||
#Mon Jan 30 15:41:14 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base.business
|
||||
artifactId=viaticos
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,8 +1,8 @@
|
|||
#Configuracion APP
|
||||
api.user=admin
|
||||
api.password=admin
|
||||
#api.uri.base=http://172.17.26.184:8080/alfresco/service
|
||||
api.uri.base=http://172.17.26.91:8082/alfresco/service
|
||||
api.uri.base=http://172.17.26.184:8080/alfresco/service
|
||||
#api.uri.base=http://172.17.26.91:8082/alfresco/service
|
||||
api.uri.delete.general=/slingshot/doclib/action/file/node/
|
||||
#Directorio base para las consultas
|
||||
api.doclocation.base=/app:company_home/st:sites/cm:{0}/cm:documentLibrary
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,8 +1,8 @@
|
|||
#Configuracion APP
|
||||
api.user=admin
|
||||
api.password=admin
|
||||
#api.uri.base=http://172.17.26.184:8080/alfresco/service
|
||||
api.uri.base=http://172.17.26.91:8082/alfresco/service
|
||||
api.uri.base=http://172.17.26.184:8080/alfresco/service
|
||||
#api.uri.base=http://172.17.26.91:8082/alfresco/service
|
||||
api.uri.delete.general=/slingshot/doclib/action/file/node/
|
||||
#Directorio base para las consultas
|
||||
api.doclocation.base=/app:company_home/st:sites/cm:{0}/cm:documentLibrary
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:25:49 ECT 2023
|
||||
#Mon Jan 30 15:41:04 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base.core
|
||||
artifactId=alfresco-client
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:25:36 ECT 2023
|
||||
#Mon Jan 30 15:40:52 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base.core
|
||||
artifactId=bpm
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:25:47 ECT 2023
|
||||
#Mon Jan 30 15:41:03 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base.core
|
||||
artifactId=firmas
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:25:22 ECT 2023
|
||||
#Mon Jan 30 15:40:38 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base.dto
|
||||
artifactId=common
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:25:20 ECT 2023
|
||||
#Mon Jan 30 15:40:36 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base.dto
|
||||
artifactId=dto
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:26:02 ECT 2023
|
||||
#Mon Jan 30 15:41:20 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base
|
||||
artifactId=facade
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:26:01 ECT 2023
|
||||
#Mon Jan 30 15:41:18 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base
|
||||
artifactId=facadeclient
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:25:30 ECT 2023
|
||||
#Mon Jan 30 15:40:46 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base.persistence
|
||||
artifactId=commondb
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:25:46 ECT 2023
|
||||
#Mon Jan 30 15:41:02 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base.persistence
|
||||
artifactId=parmas
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:25:23 ECT 2023
|
||||
#Mon Jan 30 15:40:40 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base.persistence
|
||||
artifactId=pbpm
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:25:33 ECT 2023
|
||||
#Mon Jan 30 15:40:49 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base.persistence
|
||||
artifactId=pcustomer
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:25:43 ECT 2023
|
||||
#Mon Jan 30 15:40:59 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base.persistence
|
||||
artifactId=pfirmas
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:25:28 ECT 2023
|
||||
#Mon Jan 30 15:40:45 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base.persistence
|
||||
artifactId=pgeneral
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:25:41 ECT 2023
|
||||
#Mon Jan 30 15:40:57 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base.persistence
|
||||
artifactId=plog
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:25:43 ECT 2023
|
||||
#Mon Jan 30 15:40:58 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base.persistence
|
||||
artifactId=pviaticos
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:25:34 ECT 2023
|
||||
#Mon Jan 30 15:40:50 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base.persistence
|
||||
artifactId=util
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:25:50 ECT 2023
|
||||
#Mon Jan 30 15:41:05 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.base
|
||||
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
|
||||
#Wed Jan 18 15:26:03 ECT 2023
|
||||
#Mon Jan 30 15:41:20 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.clients.maia
|
||||
artifactId=maiaear
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Jan 18 15:26:02 ECT 2023
|
||||
#Mon Jan 30 15:41:20 ECT 2023
|
||||
version=2.1
|
||||
groupId=com.fp.clients.maia
|
||||
artifactId=environment-eap6
|
||||
|
|
|
|||
|
|
@ -318,6 +318,26 @@ public class TarmCentroControlJurController extends AbstractController<TarmCentr
|
|||
return null;
|
||||
}
|
||||
}
|
||||
/**
|
||||
*BUSCAR POR CENTRO DE CONTROL
|
||||
*/
|
||||
|
||||
public static TarmCentroControlJur findxCentroControl(String ccentrocontrol) {
|
||||
try {
|
||||
TarmCentroControlJurController cc = new TarmCentroControlJurController();
|
||||
cc.init();
|
||||
cc.addFilter("ccentrocontrol", ccentrocontrol);
|
||||
cc.recperpage = 300;
|
||||
cc.querydatabase();
|
||||
if ((cc.lrecord != null) && !cc.lrecord.isEmpty()) {
|
||||
return cc.lrecord.get(0);
|
||||
}
|
||||
return null;
|
||||
} catch (Throwable e) {
|
||||
MessageHelper.setMessageError(e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public TreeNode getRoot() {
|
||||
return root;
|
||||
|
|
|
|||
|
|
@ -57,6 +57,8 @@ import com.fp.persistence.parmas.param.TarmTipoArmaExplosivo;
|
|||
import com.fp.persistence.parmas.param.TarmTramite;
|
||||
import com.fp.persistence.parmas.soli.TarmArmas;
|
||||
import com.fp.persistence.parmas.soli.TarmDocumentoHabilitante;
|
||||
import com.fp.persistence.parmas.soli.TarmSolicitud;
|
||||
import com.fp.persistence.parmas.soli.TarmSolicitudArmas;
|
||||
import com.fp.persistence.pcustomer.gene.TcustPersonDetail;
|
||||
import com.fp.persistence.pgeneral.gene.TgeneCanton;
|
||||
import com.fp.persistence.pgeneral.gene.TgeneCatalogDetail;
|
||||
|
|
@ -2374,7 +2376,30 @@ private String descategoria;
|
|||
|
||||
|
||||
}
|
||||
/**
|
||||
*ALERTA NUMERO DE ARMAS POR NUMERO DE SOLICITUD
|
||||
*/
|
||||
public void obtenerArmas(){
|
||||
List<TarmSolicitud> lSolicitud = SolicitudController.findSolicitudxPersona(nuevoPropietarioArma.getPk().getPersoncode().toString());
|
||||
TarmTramite tramite = null;
|
||||
Integer numMaxArmas = null;
|
||||
List<TarmSolicitudArmas> lstSolicitudArmas = null;
|
||||
for (TarmSolicitud tarmSolicitud : lSolicitud) {
|
||||
tramite = TarmTramiteController.findSimple(tarmSolicitud.getCtramite().toString());
|
||||
if(tramite.getNumeromaxarmas() != null){
|
||||
numMaxArmas = tramite.getNumeromaxarmas().intValue();
|
||||
lstSolicitudArmas = TarmSolicitudArmasController.findPorCSolicitud(longitud);
|
||||
if(lstSolicitudArmas!= null && !lstSolicitudArmas.isEmpty()){
|
||||
for (TarmSolicitudArmas lstSolicitudArma : lstSolicitudArmas) {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
/**
|
||||
* de consultaArmasController
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -304,7 +304,7 @@ public class ConsultaArmasController extends AbstractController<TarmArmas> {
|
|||
// t.cregistro) and i.carma = t.pk and "+
|
||||
" i.pk=(select max(doc.pk) "
|
||||
+ " from TarmDocumentoHabilitante doc "
|
||||
+ " where doc.fechaexpiracion >= now() and "
|
||||
+ " where doc.fechaexpiracion >= current_date and "
|
||||
+ " doc.personcode=(select r.personcode from TarmRegistroArmas r where r.pk = t.cregistro)"
|
||||
+ " and doc.carma in (select arm1.pk from TarmArmas arm1 where arm1.codigoarma in (select arm.codigoarma from TarmArmas arm where arm.pk=t.pk)))");
|
||||
dto.addSubQuery(subqueryFechaemiperm);
|
||||
|
|
@ -379,7 +379,8 @@ public class ConsultaArmasController extends AbstractController<TarmArmas> {
|
|||
|
||||
return dto;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Declarar arma perdida
|
||||
|
|
|
|||
|
|
@ -1233,6 +1233,29 @@ public class DocumentoHabilitanteController extends
|
|||
return null;
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Permisos cerca de caducarse por jurisdiccion
|
||||
*/
|
||||
public static List<TarmDocumentoHabilitante> findByCcontrolCercaCaducarse(String centroControlId, String numeroDias){
|
||||
try {
|
||||
DocumentoHabilitanteController cc = new DocumentoHabilitanteController();
|
||||
cc.init();
|
||||
cc.recperpage = 5000;
|
||||
cc.addFilter("centrocontrol", centroControlId);
|
||||
cc.addFilter("estado", "APR");
|
||||
// FILTROS: tipoautorizacion='1' --> 1 AUTORIZACION
|
||||
// FILTROS: tra.categoria='8' --> 8 IMPORTADOR
|
||||
cc.getMfilelds().put("fechafiltro",String.format("t.fechaexpiracion is not null AND ((t.fechaexpiracion -current_date) between 0 and %s) and t.pathSuspencion is null", numeroDias));
|
||||
cc.querybasesimle();
|
||||
if (cc.lrecord != null) {
|
||||
return cc.lrecord;
|
||||
}
|
||||
return null;
|
||||
} catch (Throwable e) {
|
||||
MessageHelper.setMessageError(e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Metodo que busca los documentos habilitantes por persona para registro de
|
||||
* importaciones
|
||||
|
|
|
|||
|
|
@ -195,7 +195,12 @@ public class ReporteLiquidacionEconomicaController extends AbstractController<Ta
|
|||
|
||||
String path;
|
||||
path = "armas/reports/liquidacionEconomica";
|
||||
parameters.put("idCentroControl", "TODOS".equalsIgnoreCase(idCentroControl) ? null : idCentroControl);
|
||||
//parameters.put("idCentroControl", "TODOS".equalsIgnoreCase(idCentroControl) ? null : idCentroControl);
|
||||
String filtro = "";
|
||||
if(!idCentroControl.equals("TODOS")){
|
||||
filtro = String.format("and sol.ccentrocontrol = '%s'", idCentroControl);
|
||||
}
|
||||
parameters.put("filtro", filtro);
|
||||
parameters.put("nombreCentroControl", institucionCentroControl);
|
||||
// Datos del jefe del centro
|
||||
if (centroControl.getPersoncode() != null) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,322 @@
|
|||
/*
|
||||
* Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
|
||||
* Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
|
||||
*/
|
||||
package com.fp.frontend.controller.armas.solicitud;
|
||||
|
||||
import com.fp.dto.Request;
|
||||
import com.fp.dto.Response;
|
||||
import com.fp.dto.query.DtoQuery;
|
||||
import com.fp.dto.query.Filter;
|
||||
import com.fp.dto.query.SubQuery;
|
||||
import com.fp.frontend.controller.AbstractController;
|
||||
import com.fp.frontend.controller.ReportController;
|
||||
import com.fp.frontend.controller.armas.parametros.CentroControlArmasController;
|
||||
import com.fp.frontend.controller.armas.parametros.TarmCentroControlJurController;
|
||||
import com.fp.frontend.controller.pcustomer.PersonAddressController;
|
||||
import com.fp.frontend.controller.pcustomer.PersonDetailController;
|
||||
import com.fp.frontend.controller.pgeneral.gene.CatalogDetailController;
|
||||
import com.fp.frontend.controller.pgeneral.gene.ProvinceController;
|
||||
import com.fp.frontend.helper.MessageHelper;
|
||||
import com.fp.frontend.utility.MsgControlArmas;
|
||||
import com.fp.persistence.commondb.helper.FormatDates;
|
||||
import com.fp.persistence.parmas.param.TarmCentroControl;
|
||||
import com.fp.persistence.parmas.param.TarmCentroControlJur;
|
||||
import com.fp.persistence.parmas.soli.TarmDocumentoHabilitante;
|
||||
import com.fp.persistence.pcustomer.gene.TcustPersonAddress;
|
||||
import com.fp.persistence.pgeneral.gene.TgeneProvince;
|
||||
import com.fp.persistence.pgeneral.safe.TsafeUserDetail;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import javax.annotation.PostConstruct;
|
||||
import javax.faces.bean.ManagedBean;
|
||||
import javax.faces.bean.ManagedProperty;
|
||||
import javax.faces.bean.ViewScoped;
|
||||
import javax.faces.context.FacesContext;
|
||||
import org.openide.util.Exceptions;
|
||||
import org.openide.util.Utilities;
|
||||
|
||||
/**
|
||||
* Controlador para reporte de permisos proximos a vencerce
|
||||
*
|
||||
*/
|
||||
@ManagedBean
|
||||
@ViewScoped
|
||||
public class ReportePermisosVencerceController extends AbstractController<TarmDocumentoHabilitante> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
||||
private Integer numeroDiasCaducarseSumar = 5;
|
||||
private Date fechavencimiento;
|
||||
|
||||
private String jurisdiccion;
|
||||
|
||||
private List<TgeneProvince> ljurisdicciones;
|
||||
private boolean administrador = Boolean.FALSE;
|
||||
@ManagedProperty(value = "#{reportController}")
|
||||
private ReportController reportController;
|
||||
|
||||
|
||||
|
||||
@PostConstruct
|
||||
public void postConstruct(){
|
||||
|
||||
init();
|
||||
super.startQuery();
|
||||
|
||||
}
|
||||
|
||||
private void init() {
|
||||
this.beanalias = "PERMISOSVENCERSE";
|
||||
this.recperpage = 15;
|
||||
this.lrecord = new ArrayList<>();
|
||||
this.ljurisdicciones =ProvinceController.find("EC");
|
||||
TsafeUserDetail tsafeUserDetail = (TsafeUserDetail) FacesContext.getCurrentInstance().getExternalContext().getSessionMap().get("TSAFEUSERDETAIL");
|
||||
PersonAddressController direccionController = null;
|
||||
fechavencimiento = sumarDiasFecha(new Date(), numeroDiasCaducarseSumar);
|
||||
try {
|
||||
direccionController = new PersonAddressController();
|
||||
TcustPersonAddress tcustPersonAddres = direccionController.findPrincipal(tsafeUserDetail.getPk().getPersoncode().toString());
|
||||
|
||||
if(!super.getLoginController().getProfilecode().equals("26")){
|
||||
jurisdiccion = tcustPersonAddres.getProvincecode();
|
||||
administrador = Boolean.FALSE;
|
||||
}else{
|
||||
administrador = Boolean.TRUE;
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
Exceptions.printStackTrace(ex);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
/**
|
||||
* SUMAR DIAS A UNA FECHA
|
||||
*/
|
||||
public Date sumarDiasFecha(Date fecha, int dias){
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
|
||||
calendar.setTime(fecha); // Configuramos la fecha que se recibe
|
||||
calendar.add(Calendar.DAY_OF_YEAR, dias); // numero de días a añadir, o restar en caso de días<0
|
||||
|
||||
return calendar.getTime(); // Devuelve el objeto Date con los nuevos días añadidos
|
||||
|
||||
}
|
||||
|
||||
public ReportePermisosVencerceController() throws Exception{
|
||||
super(TarmDocumentoHabilitante.class);
|
||||
}
|
||||
|
||||
private DtoQuery getDtoQuery () throws Exception{
|
||||
|
||||
DtoQuery dto = super.getDtoQuery(true);
|
||||
SubQuery subqueryCategoriaCodigo = new SubQuery("TgeneCatalogDetail", "description", "description", "i.pk.catalog = (select a.tipotramite from TarmTramite a where a.pk=t.ctramite)"
|
||||
+ "and i.pk.catalogcode=(select a.tipotramitecodigo from TarmTramite a where a.pk=t.ctramite)");
|
||||
dto.addSubQuery(subqueryCategoriaCodigo);
|
||||
SubQuery subquerytipoAutorizacion = new SubQuery("TgeneCatalogDetail", "pk.catalog", "autorizacion", "i.pk.catalog = (select a.tipoautorizacion from TarmTramite a where a.pk=t.ctramite)"
|
||||
+ "and i.pk.catalogcode=(select a.tipoautorizacioncodigo from TarmTramite a where a.pk=t.ctramite)");
|
||||
dto.addSubQuery(subquerytipoAutorizacion);
|
||||
SubQuery subqueryipoAutorizacion = new SubQuery("TgeneCatalogDetail", "description", "descriptionTipoAut", "i.pk.catalog = (select a.tipoautorizacion from TarmTramite a where a.pk=t.ctramite)"
|
||||
+ "and i.pk.catalogcode=(select a.tipoautorizacioncodigo from TarmTramite a where a.pk=t.ctramite)");
|
||||
dto.addSubQuery(subqueryipoAutorizacion);
|
||||
|
||||
SubQuery subqueryTipocodigo = new SubQuery("TgeneCatalogDetail", "description", "descriptiontram", "i.pk.catalog = (select a.categoria from TarmTramite a where a.pk=t.ctramite)"
|
||||
+ "and i.pk.catalogcode=(select a.categoriacodigo from TarmTramite a where a.pk=t.ctramite)");
|
||||
dto.addSubQuery(subqueryTipocodigo);
|
||||
SubQuery subqueryUsocodigo = new SubQuery("TgeneCatalogDetail", "description", "descriptionact", "i.pk.catalog = (select a.usoactividad from TarmTramite a where a.pk=t.ctramite)"
|
||||
+ "and i.pk.catalogcode=(select a.usoactividadcodigo from TarmTramite a where a.pk=t.ctramite)");
|
||||
|
||||
dto.addSubQuery(subqueryUsocodigo);
|
||||
|
||||
SubQuery subQueryIdentificacionPersona = new SubQuery("TcustPersonDetail", "identification", "identificacion", "i.pk.personcode = t.personcode and i.pk.dateto=(select max(dt.pk.dateto) from TcustPersonDetail dt where dt.pk.personcode=t.personcode)");
|
||||
|
||||
dto.addSubQuery(subQueryIdentificacionPersona);
|
||||
SubQuery subQueryNombrePersona = new SubQuery("TcustPersonDetail", "name", "nombre", "i.pk.personcode = t.personcode and i.pk.dateto=(select max(dt.pk.dateto) from TcustPersonDetail dt where dt.pk.personcode=t.personcode)");
|
||||
dto.addSubQuery(subQueryNombrePersona);
|
||||
SubQuery subQueryCentroControl = new SubQuery("TgeneCatalogDetail", "description", "nombrecentro", "i.pk.catalog = (select nombreinstitucion from TarmCentroControl tac where tac.pk = t.centrocontrol) and i.pk.catalogcode = (select nombreinstitucioncodigo from TarmCentroControl tac where tac.pk = t.centrocontrol)");
|
||||
dto.addSubQuery(subQueryCentroControl);
|
||||
/**
|
||||
SubQuery subQueryTipoArma = new SubQuery("TarmArmas", "lote", "lote", "i.pk = t.carma");
|
||||
|
||||
dto.addSubQuery(subQueryTipoArma);*/
|
||||
/**
|
||||
SubQuery subqueryEstadoDoc = new SubQuery("TgeneCatalogDetail", "description", "estadodocumento", "i.pk.catalog = t.estado"
|
||||
+ " and i.pk.catalogcode= t.estadocode");
|
||||
dto.addSubQuery(subqueryEstadoDoc);*/
|
||||
return dto;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void querydatabase() {
|
||||
try {
|
||||
SimpleDateFormat vDate = new SimpleDateFormat("yyyy-MM-dd");
|
||||
|
||||
HashMap<String, DtoQuery> mtables = new HashMap<String, DtoQuery>();
|
||||
Date fechaActual = new Date();
|
||||
DtoQuery dto = getDtoQuery();
|
||||
if (this.fechavencimiento.before(fechaActual)) {
|
||||
MessageHelper.setMessageError("El valor hace referencia al número de dias que queda para que el permiso caduque y debe ser mayor o igual a 0");
|
||||
}
|
||||
Filter filter = new Filter();
|
||||
String filtro = String.format("t.estado = 'APR' and t.fechaexpiracion is not null AND (t.fechaexpiracion between '%s' and '%s') and t.pathSuspencion is null",vDate.format(fechaActual), vDate.format(fechavencimiento));
|
||||
|
||||
if(jurisdiccion != null && !jurisdiccion.equals("TODOS")){
|
||||
TarmCentroControlJur centroControlJurisdiccion = TarmCentroControlJurController.findxProvincia(jurisdiccion);
|
||||
if(centroControlJurisdiccion != null){
|
||||
filtro = String.format("%s and t.centrocontrol='%s'", filtro, centroControlJurisdiccion.getCcentrocontrol());
|
||||
}
|
||||
}
|
||||
filter.setSql(filtro);
|
||||
dto.addFiltro(filter);
|
||||
|
||||
dto.setOrderby("t.fechaexpiracion");
|
||||
mtables.put(beanalias, dto); // permite adicionar mas de una tabla.
|
||||
Request request = callerhelper.getRequest();
|
||||
request.setQueryTables(mtables);
|
||||
|
||||
Response resp = callerhelper.executeQuery(request);
|
||||
|
||||
if (resp.getResponseCode().compareTo(Response.RESPONSE_OK) != 0) {
|
||||
lrecord = new ArrayList<>();
|
||||
MessageHelper.setMessageError(resp);
|
||||
} else {
|
||||
lrecord = (List<TarmDocumentoHabilitante>) resp.get(beanalias);
|
||||
super.postQuery(lrecord);
|
||||
}
|
||||
} catch (Throwable e) {
|
||||
MessageHelper.setMessageError(e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Generar Reporte
|
||||
*/
|
||||
public void generarReportePermisosVencerse() {
|
||||
try {
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
|
||||
|
||||
String path = "armas/reports/reportePermisosVencidos";
|
||||
String filename = String.format("Permisos-caducarse-%s", sdf.format(fechavencimiento));
|
||||
TsafeUserDetail tsafeUserDetailUsuario = (TsafeUserDetail) FacesContext.getCurrentInstance().getExternalContext().getSessionMap().get("TSAFEUSERDETAIL");
|
||||
|
||||
//Fija parametros del report.
|
||||
HashMap<String, Object> parameters = new HashMap<>();
|
||||
parameters.put("pathLogoIzquierda", "repo:/maia/1/image/comandoconjunto");
|
||||
parameters.put("pathLogoDerecha", "repo:/maia/1/image/selloarmas");
|
||||
parameters.put("centroControl", obtenerCentroControl());
|
||||
|
||||
|
||||
//Fecha actual
|
||||
Date fechaActual = new Date();
|
||||
parameters.put("fechaInicio", String.format("%s", sdf.format(fechaActual)));
|
||||
parameters.put("fechaFin", String.format("%s", sdf.format(fechavencimiento)));
|
||||
String filtro = "";
|
||||
TarmCentroControlJur jurCentroControl = TarmCentroControlJurController.findxProvincia(jurisdiccion);
|
||||
if(!jurisdiccion.trim().endsWith("TODOS") && jurCentroControl !=null){
|
||||
filtro = String.format("and t.ccentrocontrol='%s'", jurCentroControl.getCcentrocontrol());
|
||||
}
|
||||
parameters.put("filtro", filtro);
|
||||
parameters.put("idCentroControl", jurisdiccion.trim().equals("TODOS") ? null : TarmCentroControlJurController.findxProvincia(jurisdiccion).getCcentrocontrol());
|
||||
parameters.put("usuario", tsafeUserDetailUsuario.getPk().getUsercode());
|
||||
|
||||
String format = "xlsx";
|
||||
|
||||
try {
|
||||
|
||||
this.reportController.executeXls(path, parameters, format, filename, this.getLoginController());
|
||||
} catch (Exception ex) {
|
||||
MessageHelper.setMessageError(ex);
|
||||
}
|
||||
|
||||
} catch (Exception ex) {
|
||||
MessageHelper.setMessageError(ex);
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Obtiene el centro de control segun usurio logeado.
|
||||
*
|
||||
* @throws Exception
|
||||
*
|
||||
*/
|
||||
private String obtenerCentroControl() throws Exception {
|
||||
|
||||
TsafeUserDetail tsafeUserDetailUsuario = (TsafeUserDetail) FacesContext.getCurrentInstance().getExternalContext().getSessionMap().get("TSAFEUSERDETAIL");
|
||||
PersonAddressController personAddressController = new PersonAddressController();
|
||||
TcustPersonAddress tcustPersonAddres = personAddressController.findPrincipal(tsafeUserDetailUsuario.getPk().getPersoncode().toString());
|
||||
if (tcustPersonAddres != null && tcustPersonAddres.getProvincecode() != null) {
|
||||
TarmCentroControlJur centroControlJur = TarmCentroControlJurController.findxProvincia(tcustPersonAddres.getProvincecode());
|
||||
TarmCentroControl centroControl = CentroControlArmasController.findPorCodigo(centroControlJur.getCcentrocontrol());
|
||||
return CatalogDetailController.findxCodigoCodcatalogo(centroControl.getNombreinstitucion(), centroControl.getNombreinstitucioncodigo()).getDescription();
|
||||
} else {
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Numero de dias que se sumara a fecha por defecto
|
||||
*/
|
||||
public Integer getNumeroDiasCaducarseSumar() {
|
||||
return numeroDiasCaducarseSumar;
|
||||
}
|
||||
|
||||
public void setNumeroDiasCaducarseSumar(Integer numeroDiasCaducarseSumar) {
|
||||
this.numeroDiasCaducarseSumar = numeroDiasCaducarseSumar;
|
||||
}
|
||||
/**
|
||||
* FECHA VENCIMIENTO
|
||||
*/
|
||||
public Date getFechavencimiento() {
|
||||
return fechavencimiento;
|
||||
}
|
||||
|
||||
public void setFechavencimiento(Date fechavencimiento) {
|
||||
this.fechavencimiento = fechavencimiento;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Jurisdiccion seleccionada como filtro
|
||||
*/
|
||||
public String getJurisdiccion() {
|
||||
return jurisdiccion;
|
||||
}
|
||||
|
||||
public void setJurisdiccion(String jurisdiccion) {
|
||||
this.jurisdiccion = jurisdiccion;
|
||||
}
|
||||
|
||||
/**
|
||||
* Lista de provincias (Jurisdicciones)
|
||||
*/
|
||||
public List<TgeneProvince> getLjurisdicciones() {
|
||||
return ljurisdicciones;
|
||||
}
|
||||
|
||||
public void setLjurisdicciones(List<TgeneProvince> ljurisdicciones) {
|
||||
this.ljurisdicciones = ljurisdicciones;
|
||||
}
|
||||
|
||||
public boolean isAdministrador() {
|
||||
return administrador;
|
||||
}
|
||||
|
||||
public void setAdministrador(boolean administrador) {
|
||||
this.administrador = administrador;
|
||||
}
|
||||
|
||||
public ReportController getReportController() {
|
||||
return reportController;
|
||||
}
|
||||
|
||||
public void setReportController(ReportController reportController) {
|
||||
this.reportController = reportController;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -19,19 +19,23 @@ import com.fp.dto.Response;
|
|||
import com.fp.dto.query.DtoQuery;
|
||||
import com.fp.dto.query.SubQuery;
|
||||
import com.fp.frontend.controller.AbstractController;
|
||||
import com.fp.frontend.controller.armas.parametros.TarmCentroControlJurController;
|
||||
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.pgeneral.gene.CatalogDetailController;
|
||||
import com.fp.frontend.controller.pgeneral.gene.ParametersController;
|
||||
import com.fp.frontend.controller.pgeneral.gene.ProvinceController;
|
||||
import com.fp.frontend.helper.MessageHelper;
|
||||
import com.fp.persistence.parmas.param.TarmCentroControlJur;
|
||||
import com.fp.persistence.parmas.param.TarmTramite;
|
||||
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.pcustomer.gene.TcustPersonDetail;
|
||||
import com.fp.persistence.pgeneral.gene.TgeneParameters;
|
||||
import com.fp.persistence.pgeneral.gene.TgeneProvince;
|
||||
import com.fp.persistence.pgeneral.log.TgeneTransactionLog;
|
||||
import com.fp.persistence.pgeneral.safe.TsafeUserDetail;
|
||||
import org.primefaces.context.RequestContext;
|
||||
|
|
@ -53,7 +57,6 @@ public class InboxController extends AbstractController<TgeneTransactionLog> {
|
|||
private List<Map<String, Object>> lTransactionsByGroup;
|
||||
|
||||
private List<Map<String, Object>> lTransactions;
|
||||
|
||||
private String beanGroupsName;
|
||||
|
||||
private String codBpmGroupSelected;
|
||||
|
|
@ -91,7 +94,6 @@ public class InboxController extends AbstractController<TgeneTransactionLog> {
|
|||
try {
|
||||
beanGroupsName = "BPMGROUPS";
|
||||
this.listGroups();
|
||||
alertarPermisosCaducarse(); //alerta para permisos prontos a caducarse
|
||||
|
||||
} catch (Exception e) {
|
||||
MessageHelper.setMessageError(e);
|
||||
|
|
@ -506,6 +508,8 @@ public class InboxController extends AbstractController<TgeneTransactionLog> {
|
|||
public void setlTransactions(List<Map<String, Object>> lTransactions) {
|
||||
this.lTransactions = lTransactions;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Entrega el valor de: bpmDataStatus
|
||||
|
|
@ -648,33 +652,7 @@ public class InboxController extends AbstractController<TgeneTransactionLog> {
|
|||
================== METODOS DE ALERTAS ==================
|
||||
|
||||
*/
|
||||
/**
|
||||
* PERMISOS PROXIMOS A CADUCARSE
|
||||
*/
|
||||
private void alertarPermisosCaducarse(){
|
||||
TcustPersonDetail personaSesion = buscarPersonaSesion();
|
||||
if(personaSesion != null){
|
||||
TgeneParameters param = ParametersController.find("DIASPREVIOSCADUCAR", "1");
|
||||
int numeroDias = param != null ? param.getNumbervalue().intValue() : 5;
|
||||
List<TarmDocumentoHabilitante>lstDocs = DocumentoHabilitanteController.findByPersonCercaCaducarse(personaSesion.getPk().getPersoncode().toString(),numeroDias+"");
|
||||
|
||||
if(lstDocs != null && !lstDocs.isEmpty()){
|
||||
for (TarmDocumentoHabilitante doc : lstDocs) {
|
||||
|
||||
String mensaje = param != null ?
|
||||
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());
|
||||
|
||||
MessageHelper.setMessageInfo(mensaje);
|
||||
RequestContext.getCurrentInstance().execute("PF('advicesDialog').show()");
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* OBTENER PERSONA DE USUARIO LOGEADO
|
||||
|
|
|
|||
|
|
@ -330,12 +330,12 @@ public class PeopleFastController extends AbstractController<AbstractDataTranspo
|
|||
this.persondetail.getRecord().setPicture(this.selectedPicture.getContents());
|
||||
request.getModifiedData().put("EXTENSION", this.extensionFoto);
|
||||
request.getModifiedData().put("NAME", this.selectedPicture.getFileName());
|
||||
}if(this.persondetail.getRecord().getMilitarygrade().trim().equals("")){
|
||||
this.persondetail.getRecord().setMilitarygrade(null);
|
||||
}
|
||||
|
||||
if (this.persondetail.getRecord().getMilitarygrade() != null) {
|
||||
this.persondetail.getRecord().setMilitarygradecode("MILITARYGRADE");
|
||||
}
|
||||
|
||||
//Asignando la firma
|
||||
if (this.selectedSign != null) {
|
||||
this.persondetail.getRecord().setSign(this.selectedSign.getContents());
|
||||
|
|
|
|||
|
|
@ -5,26 +5,32 @@ import com.fp.dto.Response;
|
|||
import com.fp.dto.query.DtoQuery;
|
||||
import com.fp.frontend.controller.alfresco.AlfrescoController;
|
||||
import com.fp.frontend.controller.armas.parametros.CentroControlArmasController;
|
||||
import com.fp.frontend.controller.armas.parametros.TarmCentroControlJurController;
|
||||
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.armas.solicitud.TramiteArmasController;
|
||||
import com.fp.frontend.controller.pcustomer.PersonAddressController;
|
||||
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.ProvinceController;
|
||||
import com.fp.frontend.controller.pgeneral.gene.TerminosCondicionesController;
|
||||
import com.fp.frontend.helper.CallerHelper;
|
||||
import com.fp.frontend.helper.MessageHelper;
|
||||
import com.fp.frontend.utility.EnumParametros;
|
||||
import com.fp.persistence.commondb.exception.CommondbException;
|
||||
import com.fp.persistence.parmas.param.TarmCentroControl;
|
||||
import com.fp.persistence.parmas.param.TarmCentroControlJur;
|
||||
import com.fp.persistence.parmas.param.TarmTramite;
|
||||
import com.fp.persistence.parmas.soli.TarmDocumentoHabilitante;
|
||||
import com.fp.persistence.parmas.soli.TarmSolicitud;
|
||||
import com.fp.persistence.parmas.soli.TarmTerminos;
|
||||
import com.fp.persistence.pcustomer.gene.TcustPersonAddress;
|
||||
import com.fp.persistence.pcustomer.gene.TcustPersonDetail;
|
||||
import com.fp.persistence.pgeneral.gene.TgeneCatalogDetail;
|
||||
import com.fp.persistence.pgeneral.gene.TgeneParameters;
|
||||
import com.fp.persistence.pgeneral.gene.TgeneProvince;
|
||||
import com.fp.persistence.pgeneral.safe.TsafeUserDetail;
|
||||
import com.fp.persistence.pgeneral.safe.TsafeUserProfile;
|
||||
|
||||
|
|
@ -63,7 +69,8 @@ public class LoginController {
|
|||
private String rutaTerminos;
|
||||
private StreamedContent content;
|
||||
private boolean alertaInicio = Boolean.FALSE;
|
||||
|
||||
private List<TarmDocumentoHabilitante> ldocumentoscaducarse;
|
||||
|
||||
@PostConstruct
|
||||
private void postconstruct() {
|
||||
this.request = new Request();
|
||||
|
|
@ -232,7 +239,6 @@ public class LoginController {
|
|||
this.changepassword = userdetail.getChangepassword();
|
||||
this.lprofile = ((List) userdetail.get("lprofile"));
|
||||
this.request.setProfile(((TsafeUserProfile) this.lprofile.get(0)).getPk().getProfilecode());
|
||||
|
||||
}
|
||||
|
||||
private void obtenerCentroControl(TsafeUserDetail userdetail) {
|
||||
|
|
@ -276,12 +282,13 @@ public class LoginController {
|
|||
public void changeprofile()
|
||||
throws Exception {
|
||||
try {
|
||||
this.ldocumentoscaducarse = new ArrayList<>();
|
||||
|
||||
if (this.profilecode != null) {
|
||||
this.request.setProfile(this.profilecode);
|
||||
//generarAlertaArmas();
|
||||
}
|
||||
|
||||
|
||||
CallerHelper ch = new CallerHelper();
|
||||
Response resp = ch.menu(this.request);
|
||||
if (resp.getResponseCode().compareTo("0") == 0) {
|
||||
|
|
@ -291,12 +298,53 @@ public class LoginController {
|
|||
} else {
|
||||
MessageHelper.setMessageError(resp);
|
||||
}
|
||||
alertarPermisosCaducarse(); //alerta para permisos prontos a caducarse
|
||||
|
||||
} catch (Throwable e) {
|
||||
e.printStackTrace();
|
||||
MessageHelper.setMessageError(e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* PERMISOS PROXIMOS A CADUCARSE
|
||||
*/
|
||||
private void alertarPermisosCaducarse() throws Exception{
|
||||
ldocumentoscaducarse = new ArrayList<>();
|
||||
TsafeUserDetail tsafeUserDetail = (TsafeUserDetail) FacesContext.getCurrentInstance().getExternalContext().getSessionMap().get("TSAFEUSERDETAIL");
|
||||
TcustPersonDetail personaSesion = buscarPersonaSesion();
|
||||
PersonAddressController direccionController = new PersonAddressController();
|
||||
|
||||
TcustPersonAddress tcustPersonAddres = direccionController.findPrincipal(tsafeUserDetail.getPk().getPersoncode().toString());
|
||||
TcustPersonDetail personaPermiso = null;
|
||||
if(personaSesion != null && tcustPersonAddres.getProvincecode() != null
|
||||
&& profilecode != null && !profilecode.equals("24")&& !profilecode.equals("25")){
|
||||
TgeneParameters param = ParametersController.find("DIASPREVIOSCADUCAR", "1");
|
||||
TarmCentroControlJur jurisdiccionCentro = TarmCentroControlJurController.findxProvincia(tcustPersonAddres.getProvincecode());
|
||||
int numeroDias = param != null ? param.getNumbervalue().intValue() : 5;
|
||||
List<TarmDocumentoHabilitante>lstDocs = DocumentoHabilitanteController.
|
||||
findByCcontrolCercaCaducarse(jurisdiccionCentro.getCcentrocontrol(),numeroDias+"");
|
||||
|
||||
TgeneProvince provinciaJurisdicion = ProvinceController.findPorCodigo(jurisdiccionCentro.getCountrycode(), jurisdiccionCentro.getProvincecode()).get(0);
|
||||
|
||||
if(lstDocs != null && !lstDocs.isEmpty()){
|
||||
MessageHelper.setMessageInfo(String.format("Permisos prontos a caducarse en la jurisdiccion %s.",provinciaJurisdicion.getDescription()));
|
||||
|
||||
for (TarmDocumentoHabilitante doc : lstDocs) {
|
||||
|
||||
personaPermiso = PersonDetailController.find(doc.getPersoncode().toString());
|
||||
doc.getModifiedData().put("identificacion", personaPermiso!= null ? personaPermiso.getIdentification() : "");
|
||||
doc.getModifiedData().put("nombre", personaPermiso != null ? personaPermiso.getName() : "" );
|
||||
doc.getModifiedData().put("jurisdiccion", provinciaJurisdicion.getDescription()!= null ? provinciaJurisdicion.getDescription() : "");
|
||||
ldocumentoscaducarse.add(doc);
|
||||
MessageHelper.setMessageInfo(String.format("Documento %s, perteneciente a %s expira el %s.",doc.getNumerodocumento(), personaPermiso.getName(), doc.getFechaexpiracion()));
|
||||
|
||||
}
|
||||
//RequestContext.getCurrentInstance().execute("PF('advicesDialog').show()");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -594,6 +642,26 @@ public class LoginController {
|
|||
this.alertaInicio = alertaInicio;
|
||||
}
|
||||
|
||||
/**
|
||||
* Permisos a punto de caducarse
|
||||
* @return
|
||||
*/
|
||||
public List<TarmDocumentoHabilitante> getLdocumentoscaducarse() {
|
||||
return ldocumentoscaducarse;
|
||||
}
|
||||
|
||||
public void setLdocumentoscaducarse(List<TarmDocumentoHabilitante> ldocumentoscaducarse) {
|
||||
this.ldocumentoscaducarse = ldocumentoscaducarse;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* ACCION AL CERRARSE EL MODAL DE PERMISOS A CADUCARSE
|
||||
*/
|
||||
public void onHidePermisosCaducarse() {
|
||||
System.out.println("Hide dialog advices");
|
||||
//ldocumentoscaducarse = new ArrayList<>();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1029,3 +1029,5 @@ btn_declararperdida='ARMA PERDIDA/ROBADA'
|
|||
# * PAGO CON TARJETA
|
||||
lbl_total_pagar=Total a Pagar
|
||||
lbl_interes_tarjeta=Interes por pago con tarjeta
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -438,4 +438,7 @@ lbl_mensaje_soporte=\u00a1Queremos mejorar y estamos trabajando para ello!, Esta
|
|||
estado_display=display: block
|
||||
|
||||
# * PAGO TARJETA
|
||||
lbl_save_pay=Pagar y Guardar
|
||||
lbl_save_pay=Pagar y Guardar
|
||||
|
||||
# REPORTE PERMISOS CERCANOS A CADUCARSE
|
||||
lbl_diascaducarse=En cuantos dias debe expirar
|
||||
|
|
|
|||
|
|
@ -1,8 +1,11 @@
|
|||
#http://172.17.26.185:8084/jasperserver/flow.html?_flowId=searchFlow&lastMode=true
|
||||
#http\://172.17.26.185\:8084/jasperserver/services/repository
|
||||
#produccion
|
||||
jasperserver.repository=http\://172.17.26.75\:8081/jasperserver/services/repository
|
||||
jasperserver.reportScheduler=http\://172.17.26.75\:8081/jasperserver/services/ReportScheduler
|
||||
#jasperserver.repository=http\://172.17.26.75\:8081/jasperserver/services/repository
|
||||
#jasperserver.reportScheduler=http\://172.17.26.75\:8081/jasperserver/services/ReportScheduler
|
||||
jasperserver.repository=http\://172.17.26.182\:8081/jasperserver/services/repository
|
||||
jasperserver.reportScheduler=http\://172.17.26.182\:8081/jasperserver/services/ReportScheduler
|
||||
|
||||
#desarrollo
|
||||
#jasperserver.repository=http\://172.17.26.185\:8084/jasperserver/services/repository
|
||||
#jasperserver.reportScheduler=http\://172.17.26.185\:8084/jasperserver/services/ReportScheduler
|
||||
|
|
|
|||
|
|
@ -0,0 +1,96 @@
|
|||
<ui:composition
|
||||
xmlns="http://www.w3.org/1999/xhtml"
|
||||
xmlns:h="http://java.sun.com/jsf/html"
|
||||
xmlns:f="http://java.sun.com/jsf/core"
|
||||
xmlns:ui="http://java.sun.com/jsf/facelets"
|
||||
xmlns:p="http://primefaces.org/ui"
|
||||
xmlns:pe="http://primefaces.org/ui/extensions"
|
||||
xmlns:maia="http://java.sun.com/jsf/composite/maiaComponents"
|
||||
template="/WEB-INF/templates/template.xhtml">
|
||||
|
||||
<ui:define name="content">
|
||||
<h:form id="formTable">
|
||||
<maia:pageEvents controller="#{reportePermisosVencerce}"
|
||||
queryProcess=":formTable:filters"
|
||||
queryUpdate=":formTable:permisosVencerce :formTable:data-content"
|
||||
saveProcess=""
|
||||
saveUpdate=""
|
||||
focusContainer=":formTable:filters" />
|
||||
|
||||
<p:panelGrid id="filters" columns="5" styleClass="m-filters">
|
||||
<f:facet name="header">
|
||||
<h:outputText value="#{msg_general.lbl_filters}" />
|
||||
</f:facet>
|
||||
<p:outputLabel for="fechavencimiento" value="#{msg_armas.lbl_fechaCaducidad}:"/>
|
||||
<p:calendar id="fechavencimiento" value="#{reportePermisosVencerceController.fechavencimiento}" maxlength="30" pattern="dd-MM-yyyy" disabled="false" required="true" size="27" onkeyup="Maia.forceupper(event, this);">
|
||||
<p:ajax event="dateSelect" update="fechavencimiento" />
|
||||
</p:calendar>
|
||||
<p:outputLabel for="fautorizacion" value="#{msg_armas.lbl_jurisdiccion}:" />
|
||||
|
||||
<p:selectOneMenu id="fautorizacion" value="#{reportePermisosVencerceController.jurisdiccion}"
|
||||
style="width:190px" required="true" disabled="#{!reportePermisosVencerceController.administrador}" >
|
||||
|
||||
<f:selectItem itemLabel="TODOS" itemValue="TODOS" />
|
||||
<f:selectItems value="#{reportePermisosVencerceController.ljurisdicciones}" var="aut" itemLabel="#{aut.description}" itemValue="#{aut.pk.provincecode}"/>
|
||||
</p:selectOneMenu>
|
||||
|
||||
|
||||
|
||||
</p:panelGrid>
|
||||
|
||||
<h:panelGrid columns="7" id="controls" styleClass="m-controls">
|
||||
<maia:pageControls controller="#{reportePermisosVencerceController}"
|
||||
queryProcess=":formTable:filters"
|
||||
queryUpdate=":formTable:data-content"
|
||||
createUpdate=""
|
||||
dialogWidgetVar="" showCreateBtn="false" showSaveBtn="false"/>
|
||||
|
||||
<p:commandButton id="reporte" value="#{msg_armas.lbl_imprimir}" actionListener="#{reportePermisosVencerceController.generarReportePermisosVencerse()}" ajax="false" process="@this"/>
|
||||
|
||||
</h:panelGrid>
|
||||
|
||||
<p:panelGrid id="data-content" columns="1" styleClass="m-data-content">
|
||||
<f:facet name="header">
|
||||
<h:outputText value="#{msg_general.htbl_catalogdetail}" />
|
||||
</f:facet>
|
||||
<p:dataTable id="permisosVencerce" var="row" value="#{reportePermisosVencerceController.lrecord}"
|
||||
rows="15" style="min-width: 500px; width: auto;" rowKey="#{row.rowkey()}" selectionMode="single">
|
||||
|
||||
<p:column headerText="#{msg_general.lbl_code}" >
|
||||
<h:outputText value="#{row.pk}" />
|
||||
</p:column>
|
||||
|
||||
<p:column headerText="#{msg_armas.lbl_tipotramite}" >
|
||||
<h:outputText value="#{row.modifiedData['description']}" />
|
||||
</p:column>
|
||||
|
||||
<p:column headerText="#{msg_armas.lbl_tipoautorizacion}" >
|
||||
<h:outputText value="#{row.modifiedData['descriptionTipoAut']}" />
|
||||
</p:column>
|
||||
|
||||
<p:column headerText="#{msg_general.lbl_category}">
|
||||
<h:outputText value="#{row.modifiedData['descriptiontram']}" />
|
||||
</p:column>
|
||||
<p:column headerText="#{msg_armas.lbl_usoactividad}" >
|
||||
<h:outputText value="#{row.modifiedData['descriptionact']}" />
|
||||
</p:column>
|
||||
|
||||
<p:column headerText="#{msg_armas.lbl_fechaexpiracion}">
|
||||
<h:outputText value="#{row.fechaexpiracion}" />
|
||||
</p:column>
|
||||
<p:column headerText="#{msg_armas.lbl_identificacion}" >
|
||||
<h:outputText value="#{row.modifiedData['identificacion']}" />
|
||||
</p:column>
|
||||
<p:column headerText="#{msg_armas.lbl_nombre}" >
|
||||
<h:outputText value="#{row.modifiedData['nombre']}" />
|
||||
</p:column>
|
||||
<p:column headerText="#{msg_armas.lbl_centroControl}" >
|
||||
<h:outputText value="#{row.modifiedData['nombrecentro']}" />
|
||||
</p:column>
|
||||
</p:dataTable>
|
||||
</p:panelGrid>
|
||||
</h:form>
|
||||
|
||||
|
||||
</ui:define>
|
||||
</ui:composition>
|
||||
|
|
@ -152,6 +152,7 @@
|
|||
widgetVar="tabSide"
|
||||
onTabChange="Maiaworkspace.handleTabSideChange(index)">
|
||||
<p:tab id="tabMenu" title="#{msg_general.tab_menu}">
|
||||
|
||||
<p:panelMenu model="#{loginController.maiaMenu.menuModel}" />
|
||||
</p:tab>
|
||||
<p:tab id="tabBpm" title="#{msg_general.tab_agenda}">
|
||||
|
|
@ -321,10 +322,13 @@
|
|||
<ui:include src="/pages/security/_changepasswordExpired.xhtml" />
|
||||
</h:form>
|
||||
</p:dialog>
|
||||
<p:dialog closable="true" widgetVar="advicesDialog"
|
||||
<p:dialog closable="true" widgetVar="advicesDialog"
|
||||
modal="true" draggable="true" closeOnEscape="true"
|
||||
resizable="false" header="Aviso">
|
||||
<p:messages id="messagesError" autoUpdate="true" globalOnly="true"/>
|
||||
resizable="true" header="Notificacion" onHide="#{loginController.onHidePermisosCaducarse()}">
|
||||
<p:messages id="messagesError" autoUpdate="true" globalOnly="true" showIcon="true"/>
|
||||
|
||||
<!--<h:commandButton value="reporte"
|
||||
onclick="Maiaworkspace.loadPage('/pages/armas/reportePermisosVencerce.xhtml?m=30&t=229&v=1&autoquery=N','REPORTE')" />-->
|
||||
|
||||
</p:dialog>
|
||||
<p:dialog autosized="true" widgetVar="popupTimeout" closable="false"
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue