diff --git a/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/query/inbox/TransactionList.java b/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/query/inbox/TransactionList.java index 63ee297..74b5dfb 100644 --- a/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/query/inbox/TransactionList.java +++ b/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/query/inbox/TransactionList.java @@ -80,7 +80,14 @@ public class TransactionList extends QueryRule { htc.close(); } } - + + + + /** + * METODO PARA OBTENER EL TIPO DE AUTORIZACION CON LOGSOLICITUDE + */ + + /** * Prepara la lista de Tareas. * @@ -89,12 +96,17 @@ public class TransactionList extends QueryRule { @SuppressWarnings("unchecked") private void addTransactionList(String language) throws Exception { List t = htc.getUnfinishedTasksByUser(request.getUser()); + Task task = null; + TaskUtil tu = null; + TransactionDTO tr = null; + Integer count = null; + Map mtran = null; for (Object[] obj : t) { - Task task = (Task) obj[0]; - TaskUtil tu = new TaskUtil(task, htc); + task = (Task) obj[0]; + tu = new TaskUtil(task, htc); - TransactionDTO tr = tu.getTransaction(); - Integer count = trn.get(tr.toString()); + tr= tu.getTransaction(); + count = trn.get(tr.toString()); if (count == null) { count = 1; } else { @@ -102,7 +114,7 @@ public class TransactionList extends QueryRule { } trn.put(tr.toString(), count); - Map mtran = (Map) mtransaux.get(tr.toString()); + mtran = (Map) mtransaux.get(tr.toString()); if (mtran == null) { mtran = this.addTransactionData(tu); mtransaux.put(tr.toString(), mtran); @@ -117,13 +129,20 @@ public class TransactionList extends QueryRule { @SuppressWarnings({ "unchecked", "unused", "rawtypes" }) private void addTransactionList(String language, String codSolicitud) throws Exception { List t = htc.getUnfinishedTasksByUser(request.getUser()); + Task task ; + Content c; + TaskUtil tu; + TransactionDTO tr ; + String codS ; + Integer count; + Map mtran; for (Object[] obj : t) { - Task task = (Task) obj[0]; - Content c = (Content) obj[1]; - TaskUtil tu = new TaskUtil(task, htc); + task = (Task) obj[0]; + c = (Content) obj[1]; + tu = new TaskUtil(task, htc); ((SaveRequest)(((Map)tu.getActualData().get("maia")).get("request"))).get("csolicitud"); - TransactionDTO tr = tu.getTransaction(); + tr = tu.getTransaction(); if(tu.getActualData().get("maia") instanceof Map) { if(((Map)tu.getActualData().get("maia")).get("request") != null) @@ -132,7 +151,7 @@ public class TransactionList extends QueryRule { { Object csolicitud = ((SaveRequest)(((Map)tu.getActualData().get("maia")).get("request"))).get("csolicitud"); if(csolicitud!=null){ - String codS = csolicitud.toString(); + codS = csolicitud.toString(); if(!codS.equals(codSolicitud)) { continue; @@ -142,7 +161,7 @@ public class TransactionList extends QueryRule { } } - Integer count = trn.get(tr.toString()); + count = trn.get(tr.toString()); if (count == null) { count = 1; } else { @@ -150,7 +169,7 @@ public class TransactionList extends QueryRule { } trn.put(tr.toString(), count); - Map mtran = (Map) mtransaux.get(tr.toString()); + mtran = (Map) mtransaux.get(tr.toString()); if (mtran == null) { mtran = this.addTransactionData(tu); mtransaux.put(tr.toString(), mtran); @@ -161,6 +180,7 @@ public class TransactionList extends QueryRule { TransactionTasks.addTask(mtran, tu, language); } } + private Map addTransactionData(TaskUtil tu) throws Exception { Map rec = new HashMap(); diff --git a/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/query/inbox/TransactionTasks.java b/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/query/inbox/TransactionTasks.java index f7dada5..49278ea 100644 --- a/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/query/inbox/TransactionTasks.java +++ b/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/query/inbox/TransactionTasks.java @@ -89,5 +89,7 @@ public class TransactionTasks extends QueryRule { TaskDetail.addTaskDetail(rec, taskUtil, language); ltasks.add(rec); } - + + + } \ No newline at end of file diff --git a/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/query/task/AsignedTasks.java b/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/query/task/AsignedTasks.java index f106bf1..46ed9b1 100644 --- a/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/query/task/AsignedTasks.java +++ b/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/query/task/AsignedTasks.java @@ -41,10 +41,15 @@ public class AsignedTasks extends QueryRule { try { List t = htc.getAsignedTasks(pQueryRequest.getString("userCri")); List> data = new ArrayList>(); + Task task; + TaskUtil tu; + Map rec; + List> data1; + for (Object[] obj : t) { - Task task = (Task) obj[0]; - TaskUtil tu = new TaskUtil(task, htc); - Map rec = new HashMap(); + task = (Task) obj[0]; + tu = new TaskUtil(task, htc); + rec = new HashMap(); rec.put("tid", tu.getTid()); rec.put("workItem", task.getTaskData().getWorkItemId()); rec.put("detail", tu.getSubject()); @@ -52,7 +57,7 @@ public class AsignedTasks extends QueryRule { rec.put("nameasigned", GeneralDescriptions.getOfficername(task.getTaskData().getActualOwner().getId())); rec.put("logsolicitude", tu.getRequest().get("logsolicitude")); rec.put("rulename", task.getName()); - List> data1 = ProcessUtil.getInstance().transactionData(tu.getRequest().getJournalId(), pQueryRequest, false); + data1 = ProcessUtil.getInstance().transactionData(tu.getRequest().getJournalId(), pQueryRequest, false); for (Map map : data1) { rec.put((String) map.get("NAME"), map.get("VALUE")); } diff --git a/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/task/client/HumanTaskClient.java b/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/task/client/HumanTaskClient.java index 151c92f..12f1ee4 100644 --- a/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/task/client/HumanTaskClient.java +++ b/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/task/client/HumanTaskClient.java @@ -423,10 +423,13 @@ public class HumanTaskClient { List list; try { list = taskService.getTasksOwnedByStatus(pUserCri, lestatus, "en-UK"); + Object o[] = null; + Task task = null; + Content c = null; for (TaskSummary obj : list) { - Object o[] = new Object[2]; - Task task = this.getTaskById(obj.getId()); - Content c = this.getContentById(task.getTaskData().getDocumentContentId()); + o = new Object[2]; + task = this.getTaskById(obj.getId()); + c = this.getContentById(task.getTaskData().getDocumentContentId()); o[0] = task; o[1] = c; lresp.add(o); @@ -453,10 +456,13 @@ public class HumanTaskClient { List list = new ArrayList<>(); try { list = taskService.getTasksOwnedByStatus(pUserId, lestatus, "en-UK"); + Object o[]; + Task task; + Content c; for (TaskSummary obj : list) { - Object o[] = new Object[2]; - Task task = this.getTaskById(obj.getId()); - Content c = this.getContentById(task.getTaskData().getDocumentContentId()); + o = new Object[2]; + task = this.getTaskById(obj.getId()); + c = this.getContentById(task.getTaskData().getDocumentContentId()); o[0] = task; o[1] = c; lresp.add(o); @@ -509,8 +515,9 @@ public class HumanTaskClient { * JPQL JPQL_TASK_NOT_COMPLETEBYGROUP */ private static final String TAREAS_GRUPO = "select t, potentialOwners.id from TaskImpl t, OrganizationalEntityImpl potentialOwners " - + "where potentialOwners.id = :groupIds and potentialOwners in elements ( t.peopleAssignments.potentialOwners ) and t.archived = 0 " - + "and t.taskData.actualOwner = null and t.taskData.status in ('Created', 'Ready', 'Reserved', 'InProgress', 'Suspended')"; + + "where potentialOwners.id = :groupIds and potentialOwners in elements ( t.peopleAssignments.potentialOwners) and t.archived = 0 " + + "and t.taskData.actualOwner = null and t.taskData.status in ('Created', 'Ready', 'Reserved', 'InProgress', 'Suspended') " + + "order by t.id desc"; /** * Obtiene el valor de unfinished tasks por Grupo. @@ -528,7 +535,6 @@ public class HumanTaskClient { em = PersistenceManager.getInstance().getEntityManagerFactoryAuxiliar("org.jbpm.domain").createEntityManager(); Query qry = em.createQuery(HumanTaskClient.TAREAS_GRUPO); //Query qry = em.createNativeQuery(TAREAS_GRUPO_NATIVO); - System.out.println("GROUPS IDS "+pGroupId); qry.setParameter("groupIds", pGroupId); ldatos = qry.getResultList(); } catch (Exception e) { diff --git a/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/task/client/TaskUtil.java b/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/task/client/TaskUtil.java index c10a105..d88b85f 100644 --- a/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/task/client/TaskUtil.java +++ b/base/bpm/bpmlib/src/main/java/com/fp/bpmlib/task/client/TaskUtil.java @@ -473,4 +473,7 @@ public class TaskUtil { } return mdata; } + + + } \ No newline at end of file diff --git a/base/bpm/bpmlib/target/bpmlib-2.1.jar b/base/bpm/bpmlib/target/bpmlib-2.1.jar index 212b4f0..53437e1 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/query/inbox/TransactionList.class b/base/bpm/bpmlib/target/classes/com/fp/bpmlib/query/inbox/TransactionList.class index 5dd2687..156d26f 100644 Binary files a/base/bpm/bpmlib/target/classes/com/fp/bpmlib/query/inbox/TransactionList.class and b/base/bpm/bpmlib/target/classes/com/fp/bpmlib/query/inbox/TransactionList.class differ diff --git a/base/bpm/bpmlib/target/classes/com/fp/bpmlib/query/task/AsignedTasks.class b/base/bpm/bpmlib/target/classes/com/fp/bpmlib/query/task/AsignedTasks.class index e993b79..e5ecec7 100644 Binary files a/base/bpm/bpmlib/target/classes/com/fp/bpmlib/query/task/AsignedTasks.class and b/base/bpm/bpmlib/target/classes/com/fp/bpmlib/query/task/AsignedTasks.class differ diff --git a/base/bpm/bpmlib/target/classes/com/fp/bpmlib/task/client/HumanTaskClient.class b/base/bpm/bpmlib/target/classes/com/fp/bpmlib/task/client/HumanTaskClient.class index 94fedb7..e3164bc 100644 Binary files a/base/bpm/bpmlib/target/classes/com/fp/bpmlib/task/client/HumanTaskClient.class and b/base/bpm/bpmlib/target/classes/com/fp/bpmlib/task/client/HumanTaskClient.class differ diff --git a/base/bpm/bpmlib/target/maven-archiver/pom.properties b/base/bpm/bpmlib/target/maven-archiver/pom.properties index c96f974..575fb35 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 -#Mon Jan 30 15:40:56 ECT 2023 +#Wed Feb 01 10:42:16 ECT 2023 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 8870198..db752ed 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 -#Mon Jan 30 15:40:51 ECT 2023 +#Wed Feb 01 10:42:11 ECT 2023 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 f8561ad..51b1db6 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/target/armas-2.1.jar b/base/business/armas/target/armas-2.1.jar index aa0c643..2a273a9 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/maven-archiver/pom.properties b/base/business/armas/target/maven-archiver/pom.properties index 5211fc0..3776560 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 -#Mon Jan 30 15:41:17 ECT 2023 +#Wed Feb 01 10:42:37 ECT 2023 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 51d6b44..0f95e81 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 0afc0ff..234c220 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 -#Mon Jan 30 15:41:10 ECT 2023 +#Wed Feb 01 10:42:30 ECT 2023 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 e25f20c..33b8de7 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 14a182b..b514415 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 -#Mon Jan 30 15:41:12 ECT 2023 +#Wed Feb 01 10:42:32 ECT 2023 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 5340798..325cfd5 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 -#Mon Jan 30 15:41:07 ECT 2023 +#Wed Feb 01 10:42:28 ECT 2023 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 000870e..7f06d0e 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 070bd7f..2c0d0d4 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 -#Mon Jan 30 15:41:11 ECT 2023 +#Wed Feb 01 10:42:31 ECT 2023 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 798c96d..9493355 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 e59b5a2..0e8d255 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 -#Mon Jan 30 15:41:14 ECT 2023 +#Wed Feb 01 10:42:34 ECT 2023 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 52ee510..258bcd9 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 ecbbe6b..52bd3d1 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 c2996e4..4cea723 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 -#Mon Jan 30 15:41:04 ECT 2023 +#Wed Feb 01 10:42:25 ECT 2023 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 1b341c3..af18e8f 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 045e237..65e87bd 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 -#Mon Jan 30 15:40:52 ECT 2023 +#Wed Feb 01 10:42:13 ECT 2023 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 6897474..3c2a6b1 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 c486771..39b8ba6 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 -#Mon Jan 30 15:41:03 ECT 2023 +#Wed Feb 01 10:42:24 ECT 2023 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 9346364..966e8da 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 4d49138..958f01e 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 -#Mon Jan 30 15:40:38 ECT 2023 +#Wed Feb 01 10:41:58 ECT 2023 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 6986b17..925db7d 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 ca63430..ce8290b 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 -#Mon Jan 30 15:40:36 ECT 2023 +#Wed Feb 01 10:41:56 ECT 2023 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 f3223c6..67bb84f 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 5e26900..e030b89 100644 --- a/base/facade/target/maven-archiver/pom.properties +++ b/base/facade/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Mon Jan 30 15:41:20 ECT 2023 +#Wed Feb 01 10:42:39 ECT 2023 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 5d07271..b4b5c81 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 772c7b5..51ded58 100644 --- a/base/facadeclient/target/maven-archiver/pom.properties +++ b/base/facadeclient/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Mon Jan 30 15:41:18 ECT 2023 +#Wed Feb 01 10:42:38 ECT 2023 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 155125d..1e07e42 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 2b48bfd..26a008f 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 -#Mon Jan 30 15:40:46 ECT 2023 +#Wed Feb 01 10:42:07 ECT 2023 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 9fa72bc..5ffb5f0 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 -#Mon Jan 30 15:41:02 ECT 2023 +#Wed Feb 01 10:42:22 ECT 2023 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 120fd4b..086d5cb 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 8b10679..1869973 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 -#Mon Jan 30 15:40:40 ECT 2023 +#Wed Feb 01 10:42:00 ECT 2023 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 4b08412..ff4f2b4 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 d88d532..6752510 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 -#Mon Jan 30 15:40:49 ECT 2023 +#Wed Feb 01 10:42:09 ECT 2023 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 06bcd5f..f7adad3 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 170b541..7a9920d 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 -#Mon Jan 30 15:40:59 ECT 2023 +#Wed Feb 01 10:42:20 ECT 2023 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 c56844e..55334b9 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 0433ca1..256402f 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 -#Mon Jan 30 15:40:45 ECT 2023 +#Wed Feb 01 10:42:05 ECT 2023 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 057220e..9c4885b 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 eeb7b33..c6afc21 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 -#Mon Jan 30 15:40:57 ECT 2023 +#Wed Feb 01 10:42:17 ECT 2023 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 83aeff5..de46789 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 3f43509..6402f97 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 -#Mon Jan 30 15:40:58 ECT 2023 +#Wed Feb 01 10:42:19 ECT 2023 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 1c11b89..840757a 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 3c5873b..bd13ba8 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 -#Mon Jan 30 15:40:50 ECT 2023 +#Wed Feb 01 10:42:10 ECT 2023 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 5ca8764..0d87df5 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 0f9088c..221d8a7 100644 --- a/base/sessionbeans/target/maven-archiver/pom.properties +++ b/base/sessionbeans/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Mon Jan 30 15:41:05 ECT 2023 +#Wed Feb 01 10:42:26 ECT 2023 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 5be3849..f982074 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 b3660d8..51c480a 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 aa0c643..2a273a9 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 1b341c3..af18e8f 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 212b4f0..53437e1 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 9346364..966e8da 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 155125d..1e07e42 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 6986b17..925db7d 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 be796a7..0da6c4a 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 f3223c6..67bb84f 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 5d07271..b4b5c81 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 6897474..3c2a6b1 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 51d6b44..0f95e81 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 e25f20c..33b8de7 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 120fd4b..086d5cb 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 4b08412..ff4f2b4 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 06bcd5f..f7adad3 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 000870e..7f06d0e 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 c56844e..55334b9 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 057220e..9c4885b 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 83aeff5..de46789 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 798c96d..9493355 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 5be3849..f982074 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 f8561ad..51b1db6 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 5ca8764..0d87df5 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 8eea7e1..81f3f42 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 -#Mon Jan 30 15:41:20 ECT 2023 +#Wed Feb 01 10:42:39 ECT 2023 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 be796a7..0da6c4a 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 754756c..b811398 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 -#Mon Jan 30 15:41:20 ECT 2023 +#Wed Feb 01 10:42:39 ECT 2023 version=2.1 groupId=com.fp.clients.maia artifactId=environment-eap6 diff --git a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ArmasController.java b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ArmasController.java index 386be10..39e27c9 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ArmasController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ArmasController.java @@ -1412,6 +1412,7 @@ private String descategoria; */ public void onReturnCambioUsuario(SelectEvent event) { nuevoPropietarioArma = (TcustPersonDetail) event.getObject(); + } /** @@ -1527,7 +1528,33 @@ private String descategoria; return null; } } + + + /** + * Buscar armas por carma + * Usado para buscar armas provinientes de solicitudArmas + * + * @param carma + * @return + */ + public static List findxCarma(String carma) { + try { + ArmasController cc = new ArmasController(); + cc.init(); + cc.recperpage = 1000; + cc.addFilter("carma", carma); + cc.querydatabaseFechaMax(); + if ((cc.lrecord != null) && !cc.lrecord.isEmpty()) { + return cc.lrecord; + } + return null; + } catch (Throwable e) { + MessageHelper.setMessageError(e); + return null; + } + } + /** * Metodo para obtener el listado de las armas por la lote * @@ -2329,8 +2356,9 @@ private String descategoria; numeroDocumento = personaDetailSelecionada.getIdentification(); filtroPersona = " and t.cregistro in (select i.pk from TarmRegistroArmas i where i.personcode =" + personaDetailSelecionada.getPk().getPersoncode() + ")"; - querydatabase(); + obtenerArmas(personaDetailSelecionada); + } /** @@ -2378,25 +2406,41 @@ private String descategoria; } /** *ALERTA NUMERO DE ARMAS POR NUMERO DE SOLICITUD + * @param persona */ - public void obtenerArmas(){ - List lSolicitud = SolicitudController.findSolicitudxPersona(nuevoPropietarioArma.getPk().getPersoncode().toString()); - TarmTramite tramite = null; - Integer numMaxArmas = null; - List lstSolicitudArmas = null; + public void obtenerArmas(TcustPersonDetail persona){ + List lSolicitud = SolicitudController.findSolicitudxPersona(persona.getPk().getPersoncode().toString() ); + TarmTramite tramite; + TarmDocumentoHabilitante documentoHabilitante; + Integer numMaxArmas; + int numArmas; + List lArmasSolicitud ; + List lstSolicitudArmas; + String alerta = "Número de armas en la solicitud %s de la persona %s, %s de %s permitidas"; for (TarmSolicitud tarmSolicitud : lSolicitud) { - tramite = TarmTramiteController.findSimple(tarmSolicitud.getCtramite().toString()); - if(tramite.getNumeromaxarmas() != null){ - numMaxArmas = tramite.getNumeromaxarmas().intValue(); - lstSolicitudArmas = TarmSolicitudArmasController.findPorCSolicitud(longitud); - if(lstSolicitudArmas!= null && !lstSolicitudArmas.isEmpty()){ - for (TarmSolicitudArmas lstSolicitudArma : lstSolicitudArmas) { - + numArmas = 0; + documentoHabilitante = DocumentoHabilitanteController.findPorSolicitud(tarmSolicitud.getPk()); + if(!tarmSolicitud.getEstado().startsWith("ANU") && + (documentoHabilitante != null && documentoHabilitante.getEstado().equals("APR") && documentoHabilitante.getFechaexpiracion().after(fechaActual) )){ + tramite = TarmTramiteController.findSimple(tarmSolicitud.getCtramite().toString()); + if(tramite.getNumeromaxarmas() != null){ + numMaxArmas = tramite.getNumeromaxarmas().intValue(); + lstSolicitudArmas = TarmSolicitudArmasController.findPorCSolicitud(longitud); + if(lstSolicitudArmas!= null && !lstSolicitudArmas.isEmpty()){ + for (TarmSolicitudArmas solicitudArma : lstSolicitudArmas) { + lArmasSolicitud = ArmasController.findxCarma(solicitudArma.getPk().getCarma()); + if(lArmasSolicitud!=null && !lArmasSolicitud.isEmpty()){ + numArmas += lArmasSolicitud.size(); + } + } + if(numArmas >= numMaxArmas){ + MessageHelper.setMessageWarn(String.format(alerta, tarmSolicitud.getNumerosolicitud(),persona.getName(),numArmas, numMaxArmas)); + } } - + } - } + } } diff --git a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ReporteEstadisticasTramitesController.java b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ReporteEstadisticasTramitesController.java index bf22f67..a7ed05e 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ReporteEstadisticasTramitesController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ReporteEstadisticasTramitesController.java @@ -160,8 +160,16 @@ public class ReporteEstadisticasTramitesController extends AbstractController { } else { //Manipular la respuesta de transacciones 'No conozco la base del jbpm' List> lstAux = (List>) resp.get("transactions"); - List> lTasks = null; + List> lTasks; + Map mapaPadre; + Map lTask; for (int i = 0; i < lstAux.size(); i++) { - Map mapaPadre = lstAux.get(i); + mapaPadre = lstAux.get(i); lTasks =(List>) mapaPadre.get("tasks"); if(lTasks !=null){ for (int j = 0; j < lTasks.size(); j++) { logSolicitude = lTasks.get(j).get("logsolicitude").toString(); tipoAutorizacion = verificarTipoAutorizacion(logSolicitude, solicitud, tramite, tipoAutorizacionAux); - Map lTask = (Map) lTasks.get(j); + lTask = (Map) lTasks.get(j); lTask.put("tipoAutorizacion", tipoAutorizacion); lTasks.set(j, lTask); } @@ -240,10 +242,13 @@ public class InboxController extends AbstractController { return tipoAutorizacion; } private void fillTransactions(List> lTransactions, boolean isGroup) { + String tModule; + Integer tCode; + Integer tVersion; for (Map map : lTransactions) { - String tModule = (String) map.get("m"); - Integer tCode = (Integer) map.get("t"); - Integer tVersion = (Integer) map.get("v"); + tModule = (String) map.get("m"); + tCode = (Integer) map.get("t"); + tVersion = (Integer) map.get("v"); this.fillTasks(map, tModule, tCode, tVersion, isGroup); } } @@ -276,8 +281,8 @@ public class InboxController extends AbstractController { /** * BUSCANDO EL TIPO AUTORIZACION */ - String logSolicitude = null; - String tipoAutorizacion = null; + String logSolicitude; + String tipoAutorizacion; TarmSolicitud solicitud= null; TarmTramite tramite = null; String tipoAutorizacionAux = null; @@ -308,11 +313,7 @@ public class InboxController extends AbstractController { MessageHelper.setMessageError(resp); } else { Map param = (Map) resp.get("param"); - for (Map.Entry entry : mapTask.entrySet()) { - String key = entry.getKey(); - Object value = entry.getValue(); - - } + param.put("TID", mapTask.get("tid")); param.put("KIND", resp.get("k")); mapTask.put("taskDetail", resp); @@ -415,10 +416,14 @@ public class InboxController extends AbstractController { } private Map getTransactionMap(List> lTransactions, String tModule, Integer tCode, Integer tVersion) { + String module = null; + Integer transaction = null; + Integer version = null; for (Map map : lTransactions) { - String module = (String) map.get("m"); - Integer transaction = (Integer) map.get("t"); - Integer version = (Integer) map.get("v"); + + module = (String) map.get("m"); + transaction = (Integer) map.get("t"); + version = (Integer) map.get("v"); if ((tModule.compareTo(module) == 0) && (tCode.compareTo(transaction) == 0) && (tVersion.compareTo(version) == 0)) { return map; 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 1a48616..1e1395e 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 @@ -341,7 +341,7 @@ public class LoginController { MessageHelper.setMessageInfo(String.format("Documento %s, perteneciente a %s expira el %s.",doc.getNumerodocumento(), personaPermiso.getName(), doc.getFechaexpiracion())); } - //RequestContext.getCurrentInstance().execute("PF('advicesDialog').show()"); + RequestContext.getCurrentInstance().execute("PF('advicesDialog').show()"); } } } diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class index a2834ea..4bf148f 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class differ diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ReporteEstadisticasTramitesController.class b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ReporteEstadisticasTramitesController.class index 7f73f11..1708193 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ReporteEstadisticasTramitesController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ReporteEstadisticasTramitesController.class differ diff --git a/frontend/target/classes/com/fp/frontend/controller/bpm/InboxController.class b/frontend/target/classes/com/fp/frontend/controller/bpm/InboxController.class index 8294a2d..9ca7c0b 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/bpm/InboxController.class and b/frontend/target/classes/com/fp/frontend/controller/bpm/InboxController.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 bbe92c6..8ad61cb 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/maia.war b/frontend/target/maia.war index 5b751d1..140a6bd 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/solicitud/ArmasController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class index a2834ea..4bf148f 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ArmasController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ReporteEstadisticasTramitesController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ReporteEstadisticasTramitesController.class index 7f73f11..1708193 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ReporteEstadisticasTramitesController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ReporteEstadisticasTramitesController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/bpm/InboxController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/bpm/InboxController.class index 8294a2d..9ca7c0b 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/bpm/InboxController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/bpm/InboxController.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 bbe92c6..8ad61cb 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/lib/bpm-2.1.jar b/frontend/target/maia/WEB-INF/lib/bpm-2.1.jar index 1b341c3..af18e8f 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 9346364..966e8da 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 155125d..1e07e42 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 6986b17..925db7d 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 5d07271..b4b5c81 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 6897474..3c2a6b1 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 120fd4b..086d5cb 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 4b08412..ff4f2b4 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 06bcd5f..f7adad3 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 c56844e..55334b9 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 057220e..9c4885b 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 f8561ad..51b1db6 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 5ca8764..0d87df5 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 5d15b76..ec48a4a 100644 --- a/frontend/target/maven-archiver/pom.properties +++ b/frontend/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Mon Jan 30 15:41:35 ECT 2023 +#Wed Feb 01 10:42:57 ECT 2023 version=2.1 groupId=com.fp artifactId=frontend