diff --git a/base/bpm/bpmlib/target/bpmlib-2.1.jar b/base/bpm/bpmlib/target/bpmlib-2.1.jar index b9bab4f..6eaba3b 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/maven-archiver/pom.properties b/base/bpm/bpmlib/target/maven-archiver/pom.properties index 39848d3..c321614 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 -#Wed Dec 14 14:28:24 ECT 2022 +#Wed Dec 21 09:05:10 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 eeb1a65..7238055 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 -#Wed Dec 14 14:28:19 ECT 2022 +#Wed Dec 21 09:05:04 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 63f5454..8bee1e5 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/VerificarArmaQuery.java b/base/business/armas/src/main/java/com/fp/armas/rules/query/solicitud/VerificarArmaQuery.java index d00c7ba..f7f4f72 100644 --- a/base/business/armas/src/main/java/com/fp/armas/rules/query/solicitud/VerificarArmaQuery.java +++ b/base/business/armas/src/main/java/com/fp/armas/rules/query/solicitud/VerificarArmaQuery.java @@ -49,7 +49,7 @@ public class VerificarArmaQuery extends QueryRule { //Filtro por estados, fecha, enBodega bufferFiltro.append("select t.* from tarmdecomisoarma t join tarmdecomiso td on t.cdecomiso = td.cdecomiso join tarmarmas ta on t.carma = ta.carma " - + "where t.fdecomiso <= TO_DATE('"+fechacorte+"','yyyy-mm-dd') and abs(TO_DATE('"+fechacorte+"','yyyy-mm-dd') - t.fdecomiso)>= "+codigoDiasDecomiso); + + "where t.fdecomiso <= TO_DATE('"+fechacorte+"','yyyy-mm-dd') and abs(TO_DATE('"+fechacorte+"','yyyy-mm-dd') - to_date(to_char(t.fdecomiso,'yyyy-mm-dd'),'yyyy-mm-dd'))>= "+codigoDiasDecomiso); bufferFiltro.append(" and (t.estado='"+codigoDecomiso+"' or t.estado='"+codigoIncautacion+"' or t.estado='"+codigoEntVol+"' or t.estado='"+codigoAbandono+"' or t.estado='"+codigoReclamo+"') and t.enbodega= 'Y'"); diff --git a/base/business/armas/target/armas-2.1.jar b/base/business/armas/target/armas-2.1.jar index 94d70cf..a3eb7c8 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/VerificarArmaQuery.class b/base/business/armas/target/classes/com/fp/armas/rules/query/solicitud/VerificarArmaQuery.class index bf20123..6948470 100644 Binary files a/base/business/armas/target/classes/com/fp/armas/rules/query/solicitud/VerificarArmaQuery.class and b/base/business/armas/target/classes/com/fp/armas/rules/query/solicitud/VerificarArmaQuery.class differ diff --git a/base/business/armas/target/maven-archiver/pom.properties b/base/business/armas/target/maven-archiver/pom.properties index 1dbb3f5..71927b2 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 -#Wed Dec 14 14:28:44 ECT 2022 +#Wed Dec 21 09:05:31 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 7fd34d8..06aba69 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 843beda..081efda 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 -#Wed Dec 14 14:28:38 ECT 2022 +#Wed Dec 21 09:05:24 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 d0eef8d..534268c 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 3be926d..eb0696a 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 -#Wed Dec 14 14:28:40 ECT 2022 +#Wed Dec 21 09:05:26 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 baf32e6..ed4527c 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 -#Wed Dec 14 14:28:35 ECT 2022 +#Wed Dec 21 09:05:21 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 137a7da..3bc2fdd 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 1513d80..4629778 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 -#Wed Dec 14 14:28:39 ECT 2022 +#Wed Dec 21 09:05:25 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 818c77d..ba96666 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 673b7e3..0a7b49f 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 -#Wed Dec 14 14:28:42 ECT 2022 +#Wed Dec 21 09:05:28 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 1f53d41..659dc58 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/target/alfresco-client-2.1.jar b/base/core/alfresco-client/target/alfresco-client-2.1.jar index d1b2fce..1cd29f3 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/maven-archiver/pom.properties b/base/core/alfresco-client/target/maven-archiver/pom.properties index a0a266d..40eb414 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 -#Wed Dec 14 14:28:32 ECT 2022 +#Wed Dec 21 09:05:18 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 2233e9d..5e590b4 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 309b7f7..12f08d7 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 -#Wed Dec 14 14:28:20 ECT 2022 +#Wed Dec 21 09:05:06 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 18abf8a..be43b8d 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 ee36614..7401e6b 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 -#Wed Dec 14 14:28:31 ECT 2022 +#Wed Dec 21 09:05:17 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 9cb0926..a12fc24 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 8ac31c5..aabc8c9 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 -#Wed Dec 14 14:28:06 ECT 2022 +#Wed Dec 21 09:04:49 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 bbe2ac4..700c7c7 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 25961c9..8699b97 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 -#Wed Dec 14 14:28:04 ECT 2022 +#Wed Dec 21 09:04:47 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 33d10cb..61f6d15 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 ff7fda1..0dbc912 100644 --- a/base/facade/target/maven-archiver/pom.properties +++ b/base/facade/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Dec 14 14:28:46 ECT 2022 +#Wed Dec 21 09:05:33 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 2659e9e..d755bfc 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 74cf838..4cb4fad 100644 --- a/base/facadeclient/target/maven-archiver/pom.properties +++ b/base/facadeclient/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Dec 14 14:28:45 ECT 2022 +#Wed Dec 21 09:05:32 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 38e4571..9ea2c70 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 3b06242..b00594a 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 -#Wed Dec 14 14:28:14 ECT 2022 +#Wed Dec 21 09:04:59 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 31206c8..9af4b75 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 -#Wed Dec 14 14:28:30 ECT 2022 +#Wed Dec 21 09:05:16 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 d3dcee2..5d5e68d 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 eafbea2..86983e5 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 -#Wed Dec 14 14:28:07 ECT 2022 +#Wed Dec 21 09:04:51 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 a506952..7488bfc 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 26889d4..0e63a3c 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 -#Wed Dec 14 14:28:17 ECT 2022 +#Wed Dec 21 09:05:02 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 2396258..2b13515 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 70ed989..79b4386 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 -#Wed Dec 14 14:28:27 ECT 2022 +#Wed Dec 21 09:05:13 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 cdd2c5e..9d000a5 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 db46293..42a0b70 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 -#Wed Dec 14 14:28:12 ECT 2022 +#Wed Dec 21 09:04:57 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 5c02e62..118b032 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 1a8faa5..102ac55 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 -#Wed Dec 14 14:28:25 ECT 2022 +#Wed Dec 21 09:05:11 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 5c58103..84f82ef 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 5e2236d..b5f5633 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 -#Wed Dec 14 14:28:26 ECT 2022 +#Wed Dec 21 09:05:13 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 aca8381..411bd5b 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 4c7abd8..e644a2a 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 -#Wed Dec 14 14:28:18 ECT 2022 +#Wed Dec 21 09:05:03 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 1d4fffa..9141cf7 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 bb91bd8..f02433b 100644 --- a/base/sessionbeans/target/maven-archiver/pom.properties +++ b/base/sessionbeans/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Dec 14 14:28:33 ECT 2022 +#Wed Dec 21 09:05:19 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 ed9f535..4737a46 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 327f434..e520cf3 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 94d70cf..a3eb7c8 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 2233e9d..5e590b4 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 b9bab4f..6eaba3b 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 9cb0926..a12fc24 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 38e4571..9ea2c70 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 bbe2ac4..700c7c7 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 d92dcbc..78afc9b 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 33d10cb..61f6d15 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 2659e9e..d755bfc 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 18abf8a..be43b8d 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 7fd34d8..06aba69 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 d0eef8d..534268c 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 d3dcee2..5d5e68d 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 a506952..7488bfc 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 2396258..2b13515 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 137a7da..3bc2fdd 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 cdd2c5e..9d000a5 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 5c02e62..118b032 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 5c58103..84f82ef 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 818c77d..ba96666 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 ed9f535..4737a46 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 63f5454..8bee1e5 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 1d4fffa..9141cf7 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 86de327..6026047 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 -#Wed Dec 14 14:28:47 ECT 2022 +#Wed Dec 21 09:05:33 ECT 2022 version=2.1 groupId=com.fp.clients.maia artifactId=maiaear 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 d92dcbc..78afc9b 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 a6e634d..d8eebd3 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 -#Wed Dec 14 14:28:47 ECT 2022 +#Wed Dec 21 09:05:33 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/DocumentoHabilitanteController.java b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/DocumentoHabilitanteController.java index 4380c35..bbf2f76 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/DocumentoHabilitanteController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/DocumentoHabilitanteController.java @@ -1127,7 +1127,9 @@ public class DocumentoHabilitanteController extends return null; } } - + /** + * BUSCAR PERMISOS A PUNTO DE CADUCARSE + */ public static List findpersoncode(String personcode, String categoria) { try { DocumentoHabilitanteController cc = new DocumentoHabilitanteController(); @@ -1204,6 +1206,7 @@ public class DocumentoHabilitanteController extends return null; } } + /** * Metodo que busca los documentos habilitantes por persona cercano a fecha de expiracion * @param personCode @@ -1219,8 +1222,7 @@ public class DocumentoHabilitanteController extends 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.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; @@ -1360,6 +1362,7 @@ public class DocumentoHabilitanteController extends } } + public static List findByPersonCode(Integer personcode) { try { DocumentoHabilitanteController cc = new DocumentoHabilitanteController(); diff --git a/frontend/src/main/java/com/fp/frontend/controller/bpm/InboxController.java b/frontend/src/main/java/com/fp/frontend/controller/bpm/InboxController.java index bc31eb3..c04fac1 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/bpm/InboxController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/bpm/InboxController.java @@ -19,9 +19,17 @@ 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.solicitud.DocumentoHabilitanteController; +import com.fp.frontend.controller.pcustomer.PersonDetailController; +import com.fp.frontend.controller.pgeneral.gene.ParametersController; import com.fp.frontend.helper.MessageHelper; +import com.fp.persistence.parmas.soli.TarmDocumentoHabilitante; 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.log.TgeneTransactionLog; +import com.fp.persistence.pgeneral.safe.TsafeUserDetail; +import org.primefaces.context.RequestContext; /** * Clase que muestra @@ -78,6 +86,8 @@ public class InboxController extends AbstractController { try { beanGroupsName = "BPMGROUPS"; this.listGroups(); + alertarPermisosCaducarse(); //alerta para permisos prontos a caducarse + } catch (Exception e) { MessageHelper.setMessageError(e); } @@ -558,5 +568,52 @@ public class InboxController extends AbstractController { fc.getExternalContext().invalidateSession(); } } + + /** + ================== 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; + ListlstDocs = 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()); + System.out.println("Mensaje: "+mensaje); + + MessageHelper.setMessageInfo(mensaje); + RequestContext.getCurrentInstance().execute("PF('advicesDialog').show()"); + + } + + } + } + + + } + + /** + * OBTENER PERSONA DE USUARIO LOGEADO + */ + private TcustPersonDetail buscarPersonaSesion(){ + TcustPersonDetail person = null; + try { + TsafeUserDetail tsafeUserDetail = (TsafeUserDetail) FacesContext.getCurrentInstance().getExternalContext().getSessionMap().get("TSAFEUSERDETAIL"); + person = PersonDetailController.find(tsafeUserDetail.getPk().getPersoncode().toString()); + + } catch (Exception e) { + MessageHelper.setMessageError(String.format("Verifique que el usuario este asociado a una persona: %s", e.getMessage())); + } + return person; + } } diff --git a/frontend/src/main/java/com/fp/frontend/controller/pgeneral/gene/TerminosCondicionesController.java b/frontend/src/main/java/com/fp/frontend/controller/pgeneral/gene/TerminosCondicionesController.java index b8fed19..2604111 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/pgeneral/gene/TerminosCondicionesController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/pgeneral/gene/TerminosCondicionesController.java @@ -123,5 +123,6 @@ public class TerminosCondicionesController extends AbstractController lstSolicitudes = SolicitudController.findSolicitudxPersona(tsafeUserDetail.getPk().getPersoncode().toString()); + List lstSolicitudes = SolicitudController.findSolicitudxPersona(buscarPersonaSesion().getPk().getPersoncode().toString()); if(lstSolicitudes != null && !lstSolicitudes.isEmpty()){ for (TarmSolicitud sol : lstSolicitudes) { validarArmas(sol); @@ -314,8 +323,16 @@ public class LoginController { 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; - + int narmas = 0; + if(lstDocs != null && !lstDocs.isEmpty()){ + String[] armas = new String[lstDocs.size()]; + for (int i = 0; i < lstDocs.size(); i++) { + armas[i]=lstDocs.get(i).getCarma(); + } + narmas = eliminarDuplicados(armas).size(); + + } + 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)); } @@ -323,29 +340,35 @@ public class LoginController { } /** - * PERMISOS PROXIMOS A CADUCARSE + * Eliminar elementos duplicados jdk7 */ - 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); - } - - } - } - - } + + public static List eliminarDuplicados(String[] arreglo){ + List arregloLista = Arrays.asList(arreglo); + Set hashSet = new HashSet(arregloLista); + arregloLista.clear(); + arregloLista.addAll(hashSet); + return arregloLista; } + /** + * OBTENER PERSONA DE USUARIO LOGEADO + */ + + private TcustPersonDetail buscarPersonaSesion(){ + TcustPersonDetail person = null; + try { + TsafeUserDetail tsafeUserDetail = (TsafeUserDetail) FacesContext.getCurrentInstance().getExternalContext().getSessionMap().get("TSAFEUSERDETAIL"); + person = PersonDetailController.find(tsafeUserDetail.getPk().getPersoncode().toString()); + + } catch (Exception e) { + MessageHelper.setMessageError(String.format("Verifique que el usuario este asociado a una persona: %s", e.getMessage())); + } + return person; + } + + + private void fillCompanies() { try { CallerHelper ch = new CallerHelper(); @@ -562,4 +585,15 @@ public class LoginController { public void setContent(StreamedContent content) { this.content = content; } + + public boolean isAlertaInicio() { + return alertaInicio; + } + + public void setAlertaInicio(boolean alertaInicio) { + this.alertaInicio = alertaInicio; + } + + + } diff --git a/frontend/src/main/webapp/WEB-INF/templates/template.xhtml b/frontend/src/main/webapp/WEB-INF/templates/template.xhtml index 1581227..6ba10e9 100644 --- a/frontend/src/main/webapp/WEB-INF/templates/template.xhtml +++ b/frontend/src/main/webapp/WEB-INF/templates/template.xhtml @@ -14,6 +14,7 @@ $(document).ready(function() { top.showTimer(#{request.session.maxInactiveInterval}*1000); }); + /** INTENTAMOS MOSTRAR LA ALERTA*/ @@ -33,7 +34,7 @@ closable="false"> - +