diff --git a/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/query/solicitud/EstadoSolicitudQuery.java b/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/query/solicitud/EstadoSolicitudQuery.java index 7f8620a..4e758c9 100644 --- a/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/query/solicitud/EstadoSolicitudQuery.java +++ b/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/query/solicitud/EstadoSolicitudQuery.java @@ -39,7 +39,7 @@ public class EstadoSolicitudQuery extends QueryRule{ sql.append(" and d.value like '%"+codigosolicitud+"%' "); } - sql.append( " order by ta.CREATED "); + sql.append(" order by ta.CREATED "); System.out.println("SQL_ESTADOS_SOLICITUDBPM: "+sql); List listaVariables=PersistenceHelper.getEntityManager(). diff --git a/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/task/TaskCleaner.java b/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/task/TaskCleaner.java index 020c6ff..2ac0daa 100644 --- a/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/task/TaskCleaner.java +++ b/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/task/TaskCleaner.java @@ -46,25 +46,25 @@ public class TaskCleaner { * @throws Exception la exception */ private void deleteTask(long pTask) throws Exception { - Query q = this.em.createNativeQuery("delete from PeopleAssignments_PotOwners where task_id= :tid"); + Query q = this.em.createNativeQuery("delete from jbpm6.PeopleAssignments_PotOwners where task_id= :tid"); q.setParameter(TaskCleaner.TID, pTask); q.executeUpdate(); - q = this.em.createNativeQuery("delete from I18NText where Task_Names_Id= :tid or Task_Subjects_Id= :tid or Task_Descriptions_Id= :tid "); + q = this.em.createNativeQuery("delete from jbpm6.I18NText where Task_Names_Id= :tid or Task_Subjects_Id= :tid or Task_Descriptions_Id= :tid "); q.setParameter(TaskCleaner.TID, pTask); q.executeUpdate(); - q = this.em.createNativeQuery("delete from task_comment where TaskData_Comments_Id= :tid"); + q = this.em.createNativeQuery("delete from jbpm6.task_comment where TaskData_Comments_Id= :tid"); q.setParameter(TaskCleaner.TID, pTask); q.executeUpdate(); - q = this.em.createNativeQuery("delete from PeopleAssignments_BAs where task_id= :tid"); + q = this.em.createNativeQuery("delete from jbpm6.PeopleAssignments_BAs where task_id= :tid"); q.setParameter(TaskCleaner.TID, pTask); q.executeUpdate(); - q = this.em.createNativeQuery("delete from Content where id in (select DOCUMENTCONTENTID from Task where id=:tid)"); + q = this.em.createNativeQuery("delete from jbpm6.Content where id in (select DOCUMENTCONTENTID from jbpm6.Task where id=:tid)"); q.setParameter(TaskCleaner.TID, pTask); q.executeUpdate(); - q = this.em.createNativeQuery("delete from Content where id in (select outputcontentid from Task where id=:tid)"); + q = this.em.createNativeQuery("delete from jbpm6.Content where id in (select outputcontentid from jbpm6.Task where id=:tid)"); q.setParameter(TaskCleaner.TID, pTask); q.executeUpdate(); - q = this.em.createNativeQuery("delete from Task where id = :tid "); + q = this.em.createNativeQuery("delete from jbpm6.Task where id = :tid "); q.setParameter(TaskCleaner.TID, pTask); q.executeUpdate(); } @@ -77,7 +77,7 @@ public class TaskCleaner { public void deleteTasks() throws Exception { try { Query q = this.em - .createNativeQuery("select id from Task t where not exists( select 1 from processinstanceinfo p where p.instanceid = t.processinstanceid)"); + .createNativeQuery("select id from jbpm6.Task t where not exists( select 1 from jbpm6.processinstanceinfo p where p.instanceid = t.processinstanceid)"); @SuppressWarnings("unchecked") List l = q.getResultList(); for (BigDecimal id : l) { @@ -88,7 +88,7 @@ public class TaskCleaner { APPLogger.getLogger().error(e); } finally { if (em.isOpen()) { - // em.close(); + //em.close(); // TODO } } diff --git a/base/bpm/bpmlib/target/bpmlib-2.1.jar b/base/bpm/bpmlib/target/bpmlib-2.1.jar index d0f9b5a..e0c2f87 100644 Binary files a/base/bpm/bpmlib/target/bpmlib-2.1.jar and b/base/bpm/bpmlib/target/bpmlib-2.1.jar differ diff --git a/base/bpm/bpmlib/target/classes/com/fp/bpmlib/task/TaskCleaner.class b/base/bpm/bpmlib/target/classes/com/fp/bpmlib/task/TaskCleaner.class index a2ca535..675f3fe 100644 Binary files a/base/bpm/bpmlib/target/classes/com/fp/bpmlib/task/TaskCleaner.class and b/base/bpm/bpmlib/target/classes/com/fp/bpmlib/task/TaskCleaner.class differ diff --git a/base/bpm/bpmlib/target/maven-archiver/pom.properties b/base/bpm/bpmlib/target/maven-archiver/pom.properties index c7f23e1..91993b8 100644 --- a/base/bpm/bpmlib/target/maven-archiver/pom.properties +++ b/base/bpm/bpmlib/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:32:48 ECT 2022 +#Wed Nov 30 16:44:14 ECT 2022 version=2.1 groupId=com.fp.base.bpm artifactId=bpmlib diff --git a/base/bpm/simple/target/maven-archiver/pom.properties b/base/bpm/simple/target/maven-archiver/pom.properties index 15311a2..6492d70 100644 --- a/base/bpm/simple/target/maven-archiver/pom.properties +++ b/base/bpm/simple/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:32:42 ECT 2022 +#Wed Nov 30 16:44:09 ECT 2022 version=2.1 groupId=com.fp.base.bpm artifactId=simple diff --git a/base/bpm/simple/target/simple-2.1.jar b/base/bpm/simple/target/simple-2.1.jar index 178f493..ea880f1 100644 Binary files a/base/bpm/simple/target/simple-2.1.jar and b/base/bpm/simple/target/simple-2.1.jar differ diff --git a/base/business/armas/src/main/java/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.java b/base/business/armas/src/main/java/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.java index 4b201ec..6c488da 100644 --- a/base/business/armas/src/main/java/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.java +++ b/base/business/armas/src/main/java/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.java @@ -324,7 +324,7 @@ public class ScheduleXMLSolicitud { return TgeneParameters.find(entityManager, new TgeneParametersKey(code, 1)); } - @Schedule( hour = "*",second = "0", minute = "1,10,20,30,40,50", persistent = false) + @Schedule( dayOfWeek = "4", hour = "10",second = "0", minute = "1", persistent = false) public void generarXMLs() { try { diff --git a/base/business/armas/src/main/java/com/fp/armas/rules/save/webservices/DocumentoHabilitanteDatos.java b/base/business/armas/src/main/java/com/fp/armas/rules/save/webservices/DocumentoHabilitanteDatos.java index adc62bc..993b5a3 100644 --- a/base/business/armas/src/main/java/com/fp/armas/rules/save/webservices/DocumentoHabilitanteDatos.java +++ b/base/business/armas/src/main/java/com/fp/armas/rules/save/webservices/DocumentoHabilitanteDatos.java @@ -35,7 +35,7 @@ public class DocumentoHabilitanteDatos extends TransactionRule { List ltarmSolicitud = query.getResultList(); if ( ltarmSolicitud != null && !ltarmSolicitud.isEmpty() ) { TarmSolicitud tarmSolicitud = ltarmSolicitud.iterator().next(); - Query queryDoc = PersistenceHelper.createQuery("SELECT o FROM TarmDocumentoHabilitante o WHERE o.csolicitud=:csolicitud "); + Query queryDoc = PersistenceHelper.createQuery("SELECT o FROM TarmDocumentoHabilitante o WHERE o.csolicitud=:csolicitud"); queryDoc.setParameter("csolicitud", tarmSolicitud.getPk()); List documentoHabilitantes = queryDoc.getResultList(); if(documentoHabilitantes != null && !documentoHabilitantes.isEmpty()){ diff --git a/base/business/armas/target/armas-2.1.jar b/base/business/armas/target/armas-2.1.jar index 5651920..90cba14 100644 Binary files a/base/business/armas/target/armas-2.1.jar and b/base/business/armas/target/armas-2.1.jar differ diff --git a/base/business/armas/target/classes/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.class b/base/business/armas/target/classes/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.class index 3089f9b..c0bd368 100644 Binary files a/base/business/armas/target/classes/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.class and b/base/business/armas/target/classes/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.class differ diff --git a/base/business/armas/target/classes/com/fp/armas/rules/save/webservices/DocumentoHabilitanteDatos.class b/base/business/armas/target/classes/com/fp/armas/rules/save/webservices/DocumentoHabilitanteDatos.class index d35f6e3..7c79ef3 100644 Binary files a/base/business/armas/target/classes/com/fp/armas/rules/save/webservices/DocumentoHabilitanteDatos.class and b/base/business/armas/target/classes/com/fp/armas/rules/save/webservices/DocumentoHabilitanteDatos.class differ diff --git a/base/business/armas/target/maven-archiver/pom.properties b/base/business/armas/target/maven-archiver/pom.properties index ee26e00..977faa8 100644 --- a/base/business/armas/target/maven-archiver/pom.properties +++ b/base/business/armas/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:33:10 ECT 2022 +#Wed Nov 30 16:44:34 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=armas diff --git a/base/business/general/target/general-2.1.jar b/base/business/general/target/general-2.1.jar index 6d70909..dad9088 100644 Binary files a/base/business/general/target/general-2.1.jar and b/base/business/general/target/general-2.1.jar differ diff --git a/base/business/general/target/maven-archiver/pom.properties b/base/business/general/target/maven-archiver/pom.properties index e31b773..babd888 100644 --- a/base/business/general/target/maven-archiver/pom.properties +++ b/base/business/general/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:33:04 ECT 2022 +#Wed Nov 30 16:44:28 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=general diff --git a/base/business/log/target/log-2.1.jar b/base/business/log/target/log-2.1.jar index 9b7d340..16fde1c 100644 Binary files a/base/business/log/target/log-2.1.jar and b/base/business/log/target/log-2.1.jar differ diff --git a/base/business/log/target/maven-archiver/pom.properties b/base/business/log/target/maven-archiver/pom.properties index 40f2d1a..3212795 100644 --- a/base/business/log/target/maven-archiver/pom.properties +++ b/base/business/log/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:33:06 ECT 2022 +#Wed Nov 30 16:44:30 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=log diff --git a/base/business/person/target/maven-archiver/pom.properties b/base/business/person/target/maven-archiver/pom.properties index ebc0149..132e6cc 100644 --- a/base/business/person/target/maven-archiver/pom.properties +++ b/base/business/person/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:33:01 ECT 2022 +#Wed Nov 30 16:44:25 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=person diff --git a/base/business/person/target/person-2.1.jar b/base/business/person/target/person-2.1.jar index a00d315..f6ddfa2 100644 Binary files a/base/business/person/target/person-2.1.jar and b/base/business/person/target/person-2.1.jar differ diff --git a/base/business/report/target/maven-archiver/pom.properties b/base/business/report/target/maven-archiver/pom.properties index 2e36c6f..690dcbe 100644 --- a/base/business/report/target/maven-archiver/pom.properties +++ b/base/business/report/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:33:05 ECT 2022 +#Wed Nov 30 16:44:29 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=report diff --git a/base/business/report/target/report-2.1.jar b/base/business/report/target/report-2.1.jar index ebbd461..1b52eb4 100644 Binary files a/base/business/report/target/report-2.1.jar and b/base/business/report/target/report-2.1.jar differ diff --git a/base/business/viaticos/target/maven-archiver/pom.properties b/base/business/viaticos/target/maven-archiver/pom.properties index 027b1e9..81d6386 100644 --- a/base/business/viaticos/target/maven-archiver/pom.properties +++ b/base/business/viaticos/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:33:07 ECT 2022 +#Wed Nov 30 16:44:31 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=viaticos diff --git a/base/business/viaticos/target/viaticos-2.1.jar b/base/business/viaticos/target/viaticos-2.1.jar index a7e0613..a902b81 100644 Binary files a/base/business/viaticos/target/viaticos-2.1.jar and b/base/business/viaticos/target/viaticos-2.1.jar differ diff --git a/base/core/alfresco-client/src/main/resources/alfresco-api.properties b/base/core/alfresco-client/src/main/resources/alfresco-api.properties index 7bee032..01b649e 100644 --- a/base/core/alfresco-client/src/main/resources/alfresco-api.properties +++ b/base/core/alfresco-client/src/main/resources/alfresco-api.properties @@ -1,7 +1,8 @@ #Configuracion APP -api.user=jasperadmin -api.password=jasperadmin -api.uri.base=http://172.17.26.75:8081/alfresco/service +api.user=admin +api.password=admin +#api.uri.base=http://172.17.26.184:8080/alfresco/service +api.url.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 diff --git a/base/core/alfresco-client/target/alfresco-client-2.1.jar b/base/core/alfresco-client/target/alfresco-client-2.1.jar index 3fd820f..fc782a4 100644 Binary files a/base/core/alfresco-client/target/alfresco-client-2.1.jar and b/base/core/alfresco-client/target/alfresco-client-2.1.jar differ diff --git a/base/core/alfresco-client/target/classes/alfresco-api.properties b/base/core/alfresco-client/target/classes/alfresco-api.properties index 7bee032..01b649e 100644 --- a/base/core/alfresco-client/target/classes/alfresco-api.properties +++ b/base/core/alfresco-client/target/classes/alfresco-api.properties @@ -1,7 +1,8 @@ #Configuracion APP -api.user=jasperadmin -api.password=jasperadmin -api.uri.base=http://172.17.26.75:8081/alfresco/service +api.user=admin +api.password=admin +#api.uri.base=http://172.17.26.184:8080/alfresco/service +api.url.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 diff --git a/base/core/alfresco-client/target/maven-archiver/pom.properties b/base/core/alfresco-client/target/maven-archiver/pom.properties index 2d04ac7..9c090b2 100644 --- a/base/core/alfresco-client/target/maven-archiver/pom.properties +++ b/base/core/alfresco-client/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:32:57 ECT 2022 +#Wed Nov 30 16:44:23 ECT 2022 version=2.1 groupId=com.fp.base.core artifactId=alfresco-client diff --git a/base/core/bpm/target/bpm-2.1.jar b/base/core/bpm/target/bpm-2.1.jar index 854e3cc..50d4522 100644 Binary files a/base/core/bpm/target/bpm-2.1.jar and b/base/core/bpm/target/bpm-2.1.jar differ diff --git a/base/core/bpm/target/maven-archiver/pom.properties b/base/core/bpm/target/maven-archiver/pom.properties index c9d4067..b2cdf8e 100644 --- a/base/core/bpm/target/maven-archiver/pom.properties +++ b/base/core/bpm/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:32:44 ECT 2022 +#Wed Nov 30 16:44:11 ECT 2022 version=2.1 groupId=com.fp.base.core artifactId=bpm diff --git a/base/core/firmas/target/firmas-2.1.jar b/base/core/firmas/target/firmas-2.1.jar index 80dd724..b5e82a8 100644 Binary files a/base/core/firmas/target/firmas-2.1.jar and b/base/core/firmas/target/firmas-2.1.jar differ diff --git a/base/core/firmas/target/maven-archiver/pom.properties b/base/core/firmas/target/maven-archiver/pom.properties index fadc9d8..75fb82d 100644 --- a/base/core/firmas/target/maven-archiver/pom.properties +++ b/base/core/firmas/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:32:56 ECT 2022 +#Wed Nov 30 16:44:21 ECT 2022 version=2.1 groupId=com.fp.base.core artifactId=firmas diff --git a/base/dto/common/target/common-2.1.jar b/base/dto/common/target/common-2.1.jar index 2f24b8a..59edc8c 100644 Binary files a/base/dto/common/target/common-2.1.jar and b/base/dto/common/target/common-2.1.jar differ diff --git a/base/dto/common/target/maven-archiver/pom.properties b/base/dto/common/target/maven-archiver/pom.properties index 5d8332a..b2ba532 100644 --- a/base/dto/common/target/maven-archiver/pom.properties +++ b/base/dto/common/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:32:29 ECT 2022 +#Wed Nov 30 16:43:57 ECT 2022 version=2.1 groupId=com.fp.base.dto artifactId=common diff --git a/base/dto/dto/target/dto-2.1.jar b/base/dto/dto/target/dto-2.1.jar index 294ee69..d7b818a 100644 Binary files a/base/dto/dto/target/dto-2.1.jar and b/base/dto/dto/target/dto-2.1.jar differ diff --git a/base/dto/dto/target/maven-archiver/pom.properties b/base/dto/dto/target/maven-archiver/pom.properties index dc9a1f1..1ea6c84 100644 --- a/base/dto/dto/target/maven-archiver/pom.properties +++ b/base/dto/dto/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:32:27 ECT 2022 +#Wed Nov 30 16:43:54 ECT 2022 version=2.1 groupId=com.fp.base.dto artifactId=dto diff --git a/base/facade/target/facade-2.1.jar b/base/facade/target/facade-2.1.jar index ffc012f..ba3d63f 100644 Binary files a/base/facade/target/facade-2.1.jar and b/base/facade/target/facade-2.1.jar differ diff --git a/base/facade/target/maven-archiver/pom.properties b/base/facade/target/maven-archiver/pom.properties index 95a6421..03af98b 100644 --- a/base/facade/target/maven-archiver/pom.properties +++ b/base/facade/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:33:12 ECT 2022 +#Wed Nov 30 16:44:36 ECT 2022 version=2.1 groupId=com.fp.base artifactId=facade diff --git a/base/facadeclient/target/facadeclient-2.1.jar b/base/facadeclient/target/facadeclient-2.1.jar index d226d2d..a8c9c30 100644 Binary files a/base/facadeclient/target/facadeclient-2.1.jar and b/base/facadeclient/target/facadeclient-2.1.jar differ diff --git a/base/facadeclient/target/maven-archiver/pom.properties b/base/facadeclient/target/maven-archiver/pom.properties index 3bdfe50..499d1af 100644 --- a/base/facadeclient/target/maven-archiver/pom.properties +++ b/base/facadeclient/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:33:11 ECT 2022 +#Wed Nov 30 16:44:35 ECT 2022 version=2.1 groupId=com.fp.base artifactId=facadeclient diff --git a/base/persistence/commondb/target/commondb-2.1.jar b/base/persistence/commondb/target/commondb-2.1.jar index 04ffa20..612dffa 100644 Binary files a/base/persistence/commondb/target/commondb-2.1.jar and b/base/persistence/commondb/target/commondb-2.1.jar differ diff --git a/base/persistence/commondb/target/maven-archiver/pom.properties b/base/persistence/commondb/target/maven-archiver/pom.properties index c292478..d6e3f68 100644 --- a/base/persistence/commondb/target/maven-archiver/pom.properties +++ b/base/persistence/commondb/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:32:38 ECT 2022 +#Wed Nov 30 16:44:05 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=commondb diff --git a/base/persistence/parmas/target/maven-archiver/pom.properties b/base/persistence/parmas/target/maven-archiver/pom.properties index 30d5fa9..e0d95af 100644 --- a/base/persistence/parmas/target/maven-archiver/pom.properties +++ b/base/persistence/parmas/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:32:54 ECT 2022 +#Wed Nov 30 16:44:20 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=parmas diff --git a/base/persistence/parmas/target/parmas-2.1.jar b/base/persistence/parmas/target/parmas-2.1.jar index 80ac4ef..469d379 100644 Binary files a/base/persistence/parmas/target/parmas-2.1.jar and b/base/persistence/parmas/target/parmas-2.1.jar differ diff --git a/base/persistence/pbpm/target/maven-archiver/pom.properties b/base/persistence/pbpm/target/maven-archiver/pom.properties index 23d61db..b278603 100644 --- a/base/persistence/pbpm/target/maven-archiver/pom.properties +++ b/base/persistence/pbpm/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:32:31 ECT 2022 +#Wed Nov 30 16:43:58 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=pbpm diff --git a/base/persistence/pbpm/target/pbpm-2.1.jar b/base/persistence/pbpm/target/pbpm-2.1.jar index 7ee08c3..d70c1b9 100644 Binary files a/base/persistence/pbpm/target/pbpm-2.1.jar and b/base/persistence/pbpm/target/pbpm-2.1.jar differ diff --git a/base/persistence/pcustomer/target/maven-archiver/pom.properties b/base/persistence/pcustomer/target/maven-archiver/pom.properties index 63ea021..f06eb46 100644 --- a/base/persistence/pcustomer/target/maven-archiver/pom.properties +++ b/base/persistence/pcustomer/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:32:40 ECT 2022 +#Wed Nov 30 16:44:07 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=pcustomer diff --git a/base/persistence/pcustomer/target/pcustomer-2.1.jar b/base/persistence/pcustomer/target/pcustomer-2.1.jar index 1f9068a..94236dc 100644 Binary files a/base/persistence/pcustomer/target/pcustomer-2.1.jar and b/base/persistence/pcustomer/target/pcustomer-2.1.jar differ diff --git a/base/persistence/pfirmas/target/maven-archiver/pom.properties b/base/persistence/pfirmas/target/maven-archiver/pom.properties index 8ed330a..f80580f 100644 --- a/base/persistence/pfirmas/target/maven-archiver/pom.properties +++ b/base/persistence/pfirmas/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:32:51 ECT 2022 +#Wed Nov 30 16:44:17 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=pfirmas diff --git a/base/persistence/pfirmas/target/pfirmas-2.1.jar b/base/persistence/pfirmas/target/pfirmas-2.1.jar index 4e8f3e4..e7e965a 100644 Binary files a/base/persistence/pfirmas/target/pfirmas-2.1.jar and b/base/persistence/pfirmas/target/pfirmas-2.1.jar differ diff --git a/base/persistence/pgeneral/target/maven-archiver/pom.properties b/base/persistence/pgeneral/target/maven-archiver/pom.properties index 2f27a11..a91f3c3 100644 --- a/base/persistence/pgeneral/target/maven-archiver/pom.properties +++ b/base/persistence/pgeneral/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:32:36 ECT 2022 +#Wed Nov 30 16:44:03 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=pgeneral diff --git a/base/persistence/pgeneral/target/pgeneral-2.1.jar b/base/persistence/pgeneral/target/pgeneral-2.1.jar index 01f95b4..164f7a9 100644 Binary files a/base/persistence/pgeneral/target/pgeneral-2.1.jar and b/base/persistence/pgeneral/target/pgeneral-2.1.jar differ diff --git a/base/persistence/plog/target/maven-archiver/pom.properties b/base/persistence/plog/target/maven-archiver/pom.properties index 9f78e1f..7b68162 100644 --- a/base/persistence/plog/target/maven-archiver/pom.properties +++ b/base/persistence/plog/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:32:49 ECT 2022 +#Wed Nov 30 16:44:15 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=plog diff --git a/base/persistence/plog/target/plog-2.1.jar b/base/persistence/plog/target/plog-2.1.jar index faaab4a..b422dd2 100644 Binary files a/base/persistence/plog/target/plog-2.1.jar and b/base/persistence/plog/target/plog-2.1.jar differ diff --git a/base/persistence/pviaticos/target/maven-archiver/pom.properties b/base/persistence/pviaticos/target/maven-archiver/pom.properties index d532101..394e55b 100644 --- a/base/persistence/pviaticos/target/maven-archiver/pom.properties +++ b/base/persistence/pviaticos/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:32:50 ECT 2022 +#Wed Nov 30 16:44:17 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=pviaticos diff --git a/base/persistence/pviaticos/target/pviaticos-2.1.jar b/base/persistence/pviaticos/target/pviaticos-2.1.jar index 7fbc48c..2744d3f 100644 Binary files a/base/persistence/pviaticos/target/pviaticos-2.1.jar and b/base/persistence/pviaticos/target/pviaticos-2.1.jar differ diff --git a/base/persistence/util/target/maven-archiver/pom.properties b/base/persistence/util/target/maven-archiver/pom.properties index 87321f7..912a685 100644 --- a/base/persistence/util/target/maven-archiver/pom.properties +++ b/base/persistence/util/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:32:41 ECT 2022 +#Wed Nov 30 16:44:08 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=util diff --git a/base/persistence/util/target/util-2.1.jar b/base/persistence/util/target/util-2.1.jar index 7573158..49f25f9 100644 Binary files a/base/persistence/util/target/util-2.1.jar and b/base/persistence/util/target/util-2.1.jar differ diff --git a/base/sessionbeans/target/maven-archiver/pom.properties b/base/sessionbeans/target/maven-archiver/pom.properties index a9e767a..41b9cf1 100644 --- a/base/sessionbeans/target/maven-archiver/pom.properties +++ b/base/sessionbeans/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:32:58 ECT 2022 +#Wed Nov 30 16:44:24 ECT 2022 version=2.1 groupId=com.fp.base artifactId=sessionbeans diff --git a/base/sessionbeans/target/sessionbeans-2.1.jar b/base/sessionbeans/target/sessionbeans-2.1.jar index ff051e5..2402bad 100644 Binary files a/base/sessionbeans/target/sessionbeans-2.1.jar and b/base/sessionbeans/target/sessionbeans-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1.ear b/clients/comaco/ear/target/maiaear-2.1.ear index 371b216..a764f7e 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1.ear and b/clients/comaco/ear/target/maiaear-2.1.ear differ diff --git a/clients/comaco/ear/target/maiaear-2.1/armas-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/armas-2.1.jar index 5651920..90cba14 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/armas-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/armas-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/bpm-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/bpm-2.1.jar index 854e3cc..50d4522 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/bpm-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/bpm-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/bpmlib.jar b/clients/comaco/ear/target/maiaear-2.1/bpmlib.jar index d0f9b5a..e0c2f87 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/bpmlib.jar and b/clients/comaco/ear/target/maiaear-2.1/bpmlib.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/common-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/common-2.1.jar index 2f24b8a..59edc8c 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/common-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/common-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/commondb-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/commondb-2.1.jar index 04ffa20..612dffa 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/commondb-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/commondb-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/dto-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/dto-2.1.jar index 294ee69..d7b818a 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/dto-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/dto-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/environment-eap6-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/environment-eap6-2.1.jar index b695505..20e4c51 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/environment-eap6-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/environment-eap6-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/facade.jar b/clients/comaco/ear/target/maiaear-2.1/facade.jar index ffc012f..ba3d63f 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/facade.jar and b/clients/comaco/ear/target/maiaear-2.1/facade.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/facadeclient.jar b/clients/comaco/ear/target/maiaear-2.1/facadeclient.jar index d226d2d..a8c9c30 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/facadeclient.jar and b/clients/comaco/ear/target/maiaear-2.1/facadeclient.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/firmas-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/firmas-2.1.jar index 80dd724..b5e82a8 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/firmas-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/firmas-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/general-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/general-2.1.jar index 6d70909..dad9088 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/general-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/general-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/log-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/log-2.1.jar index 9b7d340..16fde1c 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/log-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/log-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/parmas-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/parmas-2.1.jar index 80ac4ef..469d379 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/parmas-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/parmas-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/pbpm-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/pbpm-2.1.jar index 7ee08c3..d70c1b9 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/pbpm-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/pbpm-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/pcustomer-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/pcustomer-2.1.jar index 1f9068a..94236dc 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/pcustomer-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/pcustomer-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/person-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/person-2.1.jar index a00d315..f6ddfa2 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/person-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/person-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/pfirmas-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/pfirmas-2.1.jar index 4e8f3e4..e7e965a 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/pfirmas-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/pfirmas-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/pgeneral-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/pgeneral-2.1.jar index 01f95b4..164f7a9 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/pgeneral-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/pgeneral-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/plog-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/plog-2.1.jar index faaab4a..b422dd2 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/plog-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/plog-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/report-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/report-2.1.jar index ebbd461..1b52eb4 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/report-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/report-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/sessionbeans.jar b/clients/comaco/ear/target/maiaear-2.1/sessionbeans.jar index ff051e5..2402bad 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/sessionbeans.jar and b/clients/comaco/ear/target/maiaear-2.1/sessionbeans.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/simple-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/simple-2.1.jar index 178f493..ea880f1 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/simple-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/simple-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/util-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/util-2.1.jar index 7573158..49f25f9 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/util-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/util-2.1.jar differ diff --git a/clients/comaco/ear/target/maven-archiver/pom.properties b/clients/comaco/ear/target/maven-archiver/pom.properties index 3e708fe..1aea710 100644 --- a/clients/comaco/ear/target/maven-archiver/pom.properties +++ b/clients/comaco/ear/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:33:12 ECT 2022 +#Wed Nov 30 16:44:36 ECT 2022 version=2.1 groupId=com.fp.clients.maia artifactId=maiaear diff --git a/clients/comaco/environment-eap6/src/main/resources/META-INF/persistence.xml b/clients/comaco/environment-eap6/src/main/resources/META-INF/persistence.xml index f765756..e7d52e7 100644 --- a/clients/comaco/environment-eap6/src/main/resources/META-INF/persistence.xml +++ b/clients/comaco/environment-eap6/src/main/resources/META-INF/persistence.xml @@ -64,16 +64,9 @@ - - + - - - - - + diff --git a/clients/comaco/environment-eap6/target/classes/META-INF/persistence.xml b/clients/comaco/environment-eap6/target/classes/META-INF/persistence.xml index f765756..e7d52e7 100644 --- a/clients/comaco/environment-eap6/target/classes/META-INF/persistence.xml +++ b/clients/comaco/environment-eap6/target/classes/META-INF/persistence.xml @@ -64,16 +64,9 @@ - - + - - - - - + diff --git a/clients/comaco/environment-eap6/target/environment-eap6-2.1.jar b/clients/comaco/environment-eap6/target/environment-eap6-2.1.jar index b695505..20e4c51 100644 Binary files a/clients/comaco/environment-eap6/target/environment-eap6-2.1.jar and b/clients/comaco/environment-eap6/target/environment-eap6-2.1.jar differ diff --git a/clients/comaco/environment-eap6/target/maven-archiver/pom.properties b/clients/comaco/environment-eap6/target/maven-archiver/pom.properties index 165ab17..6dfa8e8 100644 --- a/clients/comaco/environment-eap6/target/maven-archiver/pom.properties +++ b/clients/comaco/environment-eap6/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:33:12 ECT 2022 +#Wed Nov 30 16:44:36 ECT 2022 version=2.1 groupId=com.fp.clients.maia artifactId=environment-eap6 diff --git a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/CargarDepositoController.java b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/CargarDepositoController.java index b0d7791..3fd5a74 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/CargarDepositoController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/CargarDepositoController.java @@ -159,7 +159,6 @@ public class CargarDepositoController extends AbstractController findByPersonCercaCaducarse(String personCode, String numeroDias){ + try { + DocumentoHabilitanteController cc = new DocumentoHabilitanteController(); + cc.init(); + cc.recperpage = 5000; + cc.addFilter("personcode", personCode); + cc.addFilter("estado", "APR"); + // FILTROS: tipoautorizacion='1' --> 1 AUTORIZACION + // FILTROS: tra.categoria='8' --> 8 IMPORTADOR + cc.getMfilelds().put("fechafiltro",String.format("extract(day from (t.fechaexpiracion - now())) <= %s and extract(day from (t.fechaexpiracion - now()))>=0", 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 @@ -1221,7 +1247,7 @@ public class DocumentoHabilitanteController extends cc.addFilter("estado", "APR"); // FILTROS: tipoautorizacion='1' --> 1 AUTORIZACION // FILTROS: tra.categoria='8' --> 8 IMPORTADOR - cc.getMfilelds().put("fechafiltro", "t.fechaexpiracion >=to_date(now(),'dd/MM/yyyy') and" + cc.getMfilelds().put("fechafiltro", "t.fechaexpiracion >= now() and" + " ctramite in (select tra.pk from TarmTramite tra where tra.categoria='8' and tipoautorizacion='1')"); cc.querybasesimle(); @@ -1310,6 +1336,30 @@ public class DocumentoHabilitanteController extends } } + /*** + * BUSCAR DOCUMENTOS POR ESTADO Y HABILES + */ + public static List findByCsolicitud(String csolicitud, String estado) { + try { + DocumentoHabilitanteController cc = new DocumentoHabilitanteController(); + cc.init(); + cc.recperpage = 5000; + cc.addFilter("csolicitud", csolicitud); + if(estado!= null && !estado.trim().equals("")){ + cc.addFilter("estado", estado); + } + cc.getMfilelds().put("fechafiltro","t.fechaexpiracion >= now() and t.pathSuspencion is null and t.carma is not null"); + // cc.querydocumhabsusp(); + if (cc.lrecord != null) { + return cc.lrecord; + } + return null; + } catch (Throwable e) { + MessageHelper.setMessageError(e); + return null; + } + } + public static List findByPersonCode(Integer personcode) { try { DocumentoHabilitanteController cc = new DocumentoHabilitanteController(); diff --git a/frontend/src/main/java/com/fp/frontend/controller/security/LoginController.java b/frontend/src/main/java/com/fp/frontend/controller/security/LoginController.java index 930a9c8..000b8bc 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/security/LoginController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/security/LoginController.java @@ -5,6 +5,11 @@ 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.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.PersonDetailController; import com.fp.frontend.controller.pgeneral.gene.CatalogDetailController; import com.fp.frontend.controller.pgeneral.gene.ParametersController; import com.fp.frontend.controller.pgeneral.gene.TerminosCondicionesController; @@ -13,7 +18,11 @@ 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.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.TcustPersonDetail; import com.fp.persistence.pgeneral.gene.TgeneCatalogDetail; import com.fp.persistence.pgeneral.gene.TgeneParameters; import com.fp.persistence.pgeneral.safe.TsafeUserDetail; @@ -266,6 +275,8 @@ public class LoginController { try { if (this.profilecode != null) { this.request.setProfile(this.profilecode); + //generarAlertaArmas(); + alertarPermisosCaducarse(); } CallerHelper ch = new CallerHelper(); Response resp = ch.menu(this.request); @@ -280,7 +291,64 @@ public class LoginController { MessageHelper.setMessageError(e); } } - + /** + * GENERA ALERTA DE MAXIMO DE ARMAS + * unicamente en el perfil de CLIENTE + */ + private void generarAlertaArmas(){ + + if(profilecode != null && profilecode.equals("24")){ + TsafeUserDetail tsafeUserDetail = (TsafeUserDetail) FacesContext.getCurrentInstance().getExternalContext().getSessionMap().get("TSAFEUSERDETAIL"); + TcustPersonDetail persona = PersonDetailController.find(tsafeUserDetail.getPk().getPersoncode().toString()); + List lstSolicitudes = SolicitudController.findSolicitudxPersona(tsafeUserDetail.getPk().getPersoncode().toString()); + if(lstSolicitudes != null && !lstSolicitudes.isEmpty()){ + for (TarmSolicitud sol : lstSolicitudes) { + validarArmas(sol); + } + } + } + + } + /** + * VALIDA ARMAS POR SOLICITUD + * que no posea mas armas que las que el tipo de tramite lo tiene permitido + */ + private void validarArmas(TarmSolicitud solicitud){ + TarmTramite tramite = TarmTramiteController.findSimple(solicitud.getCtramite().toString()); + int maxArmas = tramite.getNumeromaxarmas() != null ? tramite.getNumeromaxarmas().intValue() : 0; + ListlstDocs = DocumentoHabilitanteController.findByCsolicitud(solicitud.getPk(),"APR"); + int narmas = lstDocs != null ? lstDocs.size() : 0; + + if(tramite.getNumeromaxarmas() != null && narmas > maxArmas){ + MessageHelper.setMessageWarn(String.format("La solicitud %s posee %s armas registradas, Máximas permitidas %s", solicitud.getNumerosolicitud(),narmas, maxArmas)); + } + + } + + /** + * PERMISOS PROXIMOS A CADUCARSE + */ + private void alertarPermisosCaducarse(){ + if(profilecode != null && profilecode.equals("24")){ + TsafeUserDetail tsafeUserDetail = (TsafeUserDetail) FacesContext.getCurrentInstance().getExternalContext().getSessionMap().get("TSAFEUSERDETAIL"); + if(tsafeUserDetail != null){ + TgeneParameters param = ParametersController.find("DIASPREVIOSCADUCAR", "1"); + int numeroDias = param != null ? param.getNumbervalue().intValue() : 5; + ListlstDocs = DocumentoHabilitanteController.findByPersonCercaCaducarse(tsafeUserDetail.getPk().getPersoncode().toString(),numeroDias+""); + if(lstDocs != null && !lstDocs.isEmpty()){ + for (TarmDocumentoHabilitante doc : lstDocs) { + String mensaje = param != null ? + String.format(param.getTextvalue(), doc.getPk().intValue(),doc.getFechacambioexpiracion()) : + String.format("Su permiso código %s esta a punto de caducar en la fecha %s", doc.getPk().intValue(),doc.getFechacambioexpiracion()); + MessageHelper.setMessageWarn(mensaje); + } + + } + } + + } + } + private void fillCompanies() { try { CallerHelper ch = new CallerHelper(); diff --git a/frontend/src/main/java/com/fp/frontend/helper/MessageHelper.java b/frontend/src/main/java/com/fp/frontend/helper/MessageHelper.java index 4478382..5efa2ae 100644 --- a/frontend/src/main/java/com/fp/frontend/helper/MessageHelper.java +++ b/frontend/src/main/java/com/fp/frontend/helper/MessageHelper.java @@ -138,6 +138,17 @@ public class MessageHelper { public static void setMessageWarn(Response response) { MessageHelper.setMessage(response, FacesMessage.SEVERITY_WARN); } + + public static void setMessageWarn(String message){ + try { + FacesMessage fm = new FacesMessage(); + fm.setSummary(message); + fm.setSeverity(FacesMessage.SEVERITY_WARN); + FacesContext.getCurrentInstance().addMessage(null, fm); + } catch (Exception e) { + e.printStackTrace(); + } + } /** * Manejo de mensaje de error cuando en el core una transaccion no finaliza diff --git a/frontend/src/main/resources/jasper.properties b/frontend/src/main/resources/jasper.properties index 8854a88..36a5479 100644 --- a/frontend/src/main/resources/jasper.properties +++ b/frontend/src/main/resources/jasper.properties @@ -2,7 +2,7 @@ #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.182\:8081/jasperserver/services/ReportScheduler +jasperserver.reportScheduler=http\://172.17.26.75\: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 diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/eval/ConocimientoLovController.class b/frontend/target/classes/com/fp/frontend/controller/armas/eval/ConocimientoLovController.class index 7799d93..2752bc9 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/eval/ConocimientoLovController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/eval/ConocimientoLovController.class differ diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/eval/TestConocimientosController.class b/frontend/target/classes/com/fp/frontend/controller/armas/eval/TestConocimientosController.class index 77da3fa..b2c6eee 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/eval/TestConocimientosController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/eval/TestConocimientosController.class differ diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/funcionalidad/VentaController.class b/frontend/target/classes/com/fp/frontend/controller/armas/funcionalidad/VentaController.class index 1b67404..fa53f99 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/funcionalidad/VentaController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/funcionalidad/VentaController.class differ diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/funcionalidad/VentasVariasArmasController.class b/frontend/target/classes/com/fp/frontend/controller/armas/funcionalidad/VentasVariasArmasController.class index a03cb26..868702c 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/funcionalidad/VentasVariasArmasController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/funcionalidad/VentasVariasArmasController.class differ diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/AutorizacionDevolucionController.class b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/AutorizacionDevolucionController.class index 3b2be43..d08e124 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/AutorizacionDevolucionController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/AutorizacionDevolucionController.class differ diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/CargarDepositoController.class b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/CargarDepositoController.class index 5b2d14f..ac2f428 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/CargarDepositoController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/CargarDepositoController.class differ diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/DocumentoHabilitanteController.class b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/DocumentoHabilitanteController.class index dc023b7..8110a7c 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/DocumentoHabilitanteController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/DocumentoHabilitanteController.class differ diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudClienteController.class b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudClienteController.class index 1d215e3..7b8739d 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudClienteController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudClienteController.class differ diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/TramiteArmasController.class b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/TramiteArmasController.class index 062aee8..a814c31 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/TramiteArmasController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/TramiteArmasController.class differ diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/VerificacionInformacionDevolucionController.class b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/VerificacionInformacionDevolucionController.class index 95c4511..ae2f20d 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/VerificacionInformacionDevolucionController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/VerificacionInformacionDevolucionController.class differ diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/VerificarMaterialDecomisadoController.class b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/VerificarMaterialDecomisadoController.class index 3ba22aa..7a593e0 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/VerificarMaterialDecomisadoController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/VerificarMaterialDecomisadoController.class differ diff --git a/frontend/target/classes/com/fp/frontend/controller/security/LoginController.class b/frontend/target/classes/com/fp/frontend/controller/security/LoginController.class index 7fa8ca6..11dac7c 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/security/LoginController.class and b/frontend/target/classes/com/fp/frontend/controller/security/LoginController.class differ diff --git a/frontend/target/classes/com/fp/frontend/helper/MessageHelper.class b/frontend/target/classes/com/fp/frontend/helper/MessageHelper.class index dc020ac..f2f8e45 100644 Binary files a/frontend/target/classes/com/fp/frontend/helper/MessageHelper.class and b/frontend/target/classes/com/fp/frontend/helper/MessageHelper.class differ diff --git a/frontend/target/classes/jasper.properties b/frontend/target/classes/jasper.properties index 8854a88..36a5479 100644 --- a/frontend/target/classes/jasper.properties +++ b/frontend/target/classes/jasper.properties @@ -2,7 +2,7 @@ #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.182\:8081/jasperserver/services/ReportScheduler +jasperserver.reportScheduler=http\://172.17.26.75\: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 diff --git a/frontend/target/maia.war b/frontend/target/maia.war index ea584c0..eebd4e7 100644 Binary files a/frontend/target/maia.war and b/frontend/target/maia.war differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/eval/ConocimientoLovController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/eval/ConocimientoLovController.class index 7799d93..2752bc9 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/eval/ConocimientoLovController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/eval/ConocimientoLovController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/eval/TestConocimientosController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/eval/TestConocimientosController.class index 77da3fa..b2c6eee 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/eval/TestConocimientosController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/eval/TestConocimientosController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/funcionalidad/VentaController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/funcionalidad/VentaController.class index 1b67404..fa53f99 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/funcionalidad/VentaController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/funcionalidad/VentaController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/funcionalidad/VentasVariasArmasController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/funcionalidad/VentasVariasArmasController.class index a03cb26..868702c 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/funcionalidad/VentasVariasArmasController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/funcionalidad/VentasVariasArmasController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/AutorizacionDevolucionController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/AutorizacionDevolucionController.class index 3b2be43..d08e124 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/AutorizacionDevolucionController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/AutorizacionDevolucionController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/CargarDepositoController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/CargarDepositoController.class index 5b2d14f..ac2f428 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/CargarDepositoController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/CargarDepositoController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/DocumentoHabilitanteController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/DocumentoHabilitanteController.class index dc023b7..8110a7c 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/DocumentoHabilitanteController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/DocumentoHabilitanteController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudClienteController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudClienteController.class index 1d215e3..7b8739d 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudClienteController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudClienteController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/TramiteArmasController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/TramiteArmasController.class index 062aee8..a814c31 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/TramiteArmasController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/TramiteArmasController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/VerificacionInformacionDevolucionController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/VerificacionInformacionDevolucionController.class index 95c4511..ae2f20d 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/VerificacionInformacionDevolucionController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/VerificacionInformacionDevolucionController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/VerificarMaterialDecomisadoController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/VerificarMaterialDecomisadoController.class index 3ba22aa..7a593e0 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/VerificarMaterialDecomisadoController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/VerificarMaterialDecomisadoController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/security/LoginController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/security/LoginController.class index 7fa8ca6..11dac7c 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/security/LoginController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/security/LoginController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/helper/MessageHelper.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/helper/MessageHelper.class index dc020ac..f2f8e45 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/helper/MessageHelper.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/helper/MessageHelper.class differ diff --git a/frontend/target/maia/WEB-INF/classes/jasper.properties b/frontend/target/maia/WEB-INF/classes/jasper.properties index 8854a88..36a5479 100644 --- a/frontend/target/maia/WEB-INF/classes/jasper.properties +++ b/frontend/target/maia/WEB-INF/classes/jasper.properties @@ -2,7 +2,7 @@ #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.182\:8081/jasperserver/services/ReportScheduler +jasperserver.reportScheduler=http\://172.17.26.75\: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 diff --git a/frontend/target/maia/WEB-INF/lib/bpm-2.1.jar b/frontend/target/maia/WEB-INF/lib/bpm-2.1.jar index 854e3cc..50d4522 100644 Binary files a/frontend/target/maia/WEB-INF/lib/bpm-2.1.jar and b/frontend/target/maia/WEB-INF/lib/bpm-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/common-2.1.jar b/frontend/target/maia/WEB-INF/lib/common-2.1.jar index 2f24b8a..59edc8c 100644 Binary files a/frontend/target/maia/WEB-INF/lib/common-2.1.jar and b/frontend/target/maia/WEB-INF/lib/common-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/commondb-2.1.jar b/frontend/target/maia/WEB-INF/lib/commondb-2.1.jar index 04ffa20..612dffa 100644 Binary files a/frontend/target/maia/WEB-INF/lib/commondb-2.1.jar and b/frontend/target/maia/WEB-INF/lib/commondb-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/dto-2.1.jar b/frontend/target/maia/WEB-INF/lib/dto-2.1.jar index 294ee69..d7b818a 100644 Binary files a/frontend/target/maia/WEB-INF/lib/dto-2.1.jar and b/frontend/target/maia/WEB-INF/lib/dto-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/facadeclient-2.1.jar b/frontend/target/maia/WEB-INF/lib/facadeclient-2.1.jar index d226d2d..a8c9c30 100644 Binary files a/frontend/target/maia/WEB-INF/lib/facadeclient-2.1.jar and b/frontend/target/maia/WEB-INF/lib/facadeclient-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/firmas-2.1.jar b/frontend/target/maia/WEB-INF/lib/firmas-2.1.jar index 80dd724..b5e82a8 100644 Binary files a/frontend/target/maia/WEB-INF/lib/firmas-2.1.jar and b/frontend/target/maia/WEB-INF/lib/firmas-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/parmas-2.1.jar b/frontend/target/maia/WEB-INF/lib/parmas-2.1.jar index 80ac4ef..469d379 100644 Binary files a/frontend/target/maia/WEB-INF/lib/parmas-2.1.jar and b/frontend/target/maia/WEB-INF/lib/parmas-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/pbpm-2.1.jar b/frontend/target/maia/WEB-INF/lib/pbpm-2.1.jar index 7ee08c3..d70c1b9 100644 Binary files a/frontend/target/maia/WEB-INF/lib/pbpm-2.1.jar and b/frontend/target/maia/WEB-INF/lib/pbpm-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/pcustomer-2.1.jar b/frontend/target/maia/WEB-INF/lib/pcustomer-2.1.jar index 1f9068a..94236dc 100644 Binary files a/frontend/target/maia/WEB-INF/lib/pcustomer-2.1.jar and b/frontend/target/maia/WEB-INF/lib/pcustomer-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/pfirmas-2.1.jar b/frontend/target/maia/WEB-INF/lib/pfirmas-2.1.jar index 4e8f3e4..e7e965a 100644 Binary files a/frontend/target/maia/WEB-INF/lib/pfirmas-2.1.jar and b/frontend/target/maia/WEB-INF/lib/pfirmas-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/pgeneral-2.1.jar b/frontend/target/maia/WEB-INF/lib/pgeneral-2.1.jar index 01f95b4..164f7a9 100644 Binary files a/frontend/target/maia/WEB-INF/lib/pgeneral-2.1.jar and b/frontend/target/maia/WEB-INF/lib/pgeneral-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/simple-2.1.jar b/frontend/target/maia/WEB-INF/lib/simple-2.1.jar index 178f493..ea880f1 100644 Binary files a/frontend/target/maia/WEB-INF/lib/simple-2.1.jar and b/frontend/target/maia/WEB-INF/lib/simple-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/util-2.1.jar b/frontend/target/maia/WEB-INF/lib/util-2.1.jar index 7573158..49f25f9 100644 Binary files a/frontend/target/maia/WEB-INF/lib/util-2.1.jar and b/frontend/target/maia/WEB-INF/lib/util-2.1.jar differ diff --git a/frontend/target/maven-archiver/pom.properties b/frontend/target/maven-archiver/pom.properties index 0c73bad..37f0105 100644 --- a/frontend/target/maven-archiver/pom.properties +++ b/frontend/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Nov 25 15:33:30 ECT 2022 +#Wed Nov 30 16:44:51 ECT 2022 version=2.1 groupId=com.fp artifactId=frontend