correccion Jaime bpm

base/bpm/bpmlib/src/main/java/com/fp/bpmlib/task/client/HumanTaskClient.java

@@ -45,17 +45,32 @@ import com.fp.persistence.commondb.PersistenceHelper;
 import com.fp.persistence.commondb.PersistenceManager;
 import com.fp.persistence.pbpm.gene.TbpmGroupsUsers;
 import com.fp.simple.dto.TaskInfo;
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.jbpm.services.task.impl.model.DeadlinesImpl;
+import org.jbpm.services.task.impl.model.DelegationImpl;
+import org.jbpm.services.task.impl.model.PeopleAssignmentsImpl;
+import org.jbpm.services.task.impl.model.TaskDataImpl;
+import org.jbpm.services.task.impl.model.TaskImpl;
+import org.kie.internal.task.api.model.AccessType;
+import org.kie.internal.task.api.model.AllowedToDelegate;
+import org.kie.internal.task.api.model.SubTasksStrategy;
 
 //
 /**
  * Class HumanTaskClient encargada de acceder al Servidor de Tareas.
- * 
+ *
  * @author Jvaca
  * @version 2.1
  */
 public class HumanTaskClient {
 
-    /** El valor de language. */
+    /**
+     * El valor de language.
+     */
     private String language = "en-UK";
 
     private final TaskService taskService;
@@ -64,7 +79,7 @@ public class HumanTaskClient {
 
     /**
      * Crea una nueva instancia de human task client.
-     * 
+     *
      * @throws Exception la exception
      */
     public HumanTaskClient() throws Exception {
@@ -80,7 +95,7 @@ public class HumanTaskClient {
 
     /**
      * Adiciona listener, para el manejo del bam de tareas.
-     * 
+     *
      * @param engine
      */
     @SuppressWarnings("unchecked")
@@ -101,7 +116,7 @@ public class HumanTaskClient {
 
     /**
      * Activate task.
-     * 
+     *
      * @param pTask the task
      * @param pUserId the user id
      * @throws Exception la exception
@@ -113,7 +128,7 @@ public class HumanTaskClient {
 
     /**
      * Claim task.
-     * 
+     *
      * @param pTask the task
      * @param pUserId the user id
      * @throws Exception la exception
@@ -125,7 +140,7 @@ public class HumanTaskClient {
 
     /**
      * Entrega lsita de grupos bpm al que pertenece el usuario.
-     * 
+     *
      * @param pUser Codigo de usuario a buscar los grupos a los que pertenece.
      * @return List<String>
      * @throws Exception la exception
@@ -141,7 +156,7 @@ public class HumanTaskClient {
 
     /**
      * Close.
-     * 
+     *
      * @throws Exception la exception
      */
     public void close() throws Exception {
@@ -150,7 +165,7 @@ public class HumanTaskClient {
 
     /**
      * Complete task.
-     * 
+     *
      * @param pTask the task
      * @param pJournalId the journal id
      * @param data the data
@@ -167,7 +182,6 @@ public class HumanTaskClient {
         ti.setResponse(pResultado);
         ti.setTaskId(pTask);
         ti.setJournalId(pJournalId);
-        System.out.println(pObs);
         if (ti.getUserId() == null && t.getTaskData().getActualOwner() != null) {
             ti.setUserId(t.getTaskData().getActualOwner().getId());
         }
@@ -183,7 +197,7 @@ public class HumanTaskClient {
 
     /**
      * Adiciona un comment.
-     * 
+     *
      * @param pTask the task
      * @param pUserId the user id
      * @param pComment the comment
@@ -201,7 +215,7 @@ public class HumanTaskClient {
 
     /**
      * Delegate task.
-     * 
+     *
      * @param pTask the task
      * @param pUserId the user id
      * @param pTargetUserId the target user id
@@ -214,7 +228,7 @@ public class HumanTaskClient {
 
     /**
      * Obtiene el valor de assigned tasks.
-     * 
+     *
      * @return Valor de assigned tasks
      * @throws Exception la exception
      */
@@ -224,7 +238,7 @@ public class HumanTaskClient {
 
     /**
      * Obtiene el valor de assigned tasks.
-     * 
+     *
      * @param pUserId the user id
      * @return Valor de assigned tasks
      * @throws Exception la exception
@@ -236,7 +250,7 @@ public class HumanTaskClient {
 
     /**
      * Obtiene el valor de content by id.
-     * 
+     *
      * @param pId the id
      * @return Valor de content by id
      * @throws Exception la exception
@@ -247,7 +261,7 @@ public class HumanTaskClient {
 
     /**
      * Obtiene el valor de input data.
-     * 
+     *
      * @param pTask the task
      * @return Valor de input data
      * @throws Exception la exception
@@ -259,7 +273,7 @@ public class HumanTaskClient {
 
     /**
      * Obtiene el valor de output data.
-     * 
+     *
      * @param pTask the task
      * @return Valor de output data
      * @throws Exception la exception
@@ -271,7 +285,7 @@ public class HumanTaskClient {
 
     /**
      * Entrega el contenido asociado al workitem.
-     * 
+     *
      * @param task Datos de la tarea
      * @return Map<String, Object>
      * @throws Exception
@@ -288,7 +302,7 @@ public class HumanTaskClient {
 
     /**
      * Obtiene el valor de input data.
-     * 
+     *
      * @param pTask the task
      * @return Valor de input data
      * @throws Exception la exception
@@ -326,7 +340,7 @@ public class HumanTaskClient {
 
     /**
      * Obtiene el valor de task by id.
-     * 
+     *
      * @param pId the id
      * @return Valor de task by id
      * @throws Exception la exception
@@ -337,7 +351,7 @@ public class HumanTaskClient {
 
     /**
      * Obtiene el valor de task by work item id.
-     * 
+     *
      * @param pWorkId the work id
      * @return Valor de task by work item id
      * @throws Exception la exception
@@ -348,7 +362,7 @@ public class HumanTaskClient {
 
     /**
      * Obtiene el valor de task content input.
-     * 
+     *
      * @param taskSum the task sum
      * @return Valor de task content input
      */
@@ -395,7 +409,7 @@ public class HumanTaskClient {
 
     /**
      * Obtiene el valor de task data.
-     * 
+     *
      * @param pTask the task
      * @return Valor de task data
      * @throws Exception la exception
@@ -407,7 +421,7 @@ public class HumanTaskClient {
 
     /**
      * Obtiene el listado de tareas Asignadas.
-     * 
+     *
      * @param pUserCri the user cri
      * @param pCriteria the criteria
      * @param pPage the page
@@ -423,13 +437,10 @@ public class HumanTaskClient {
         List<TaskSummary> list;
         try {
             list = taskService.getTasksOwnedByStatus(pUserCri, lestatus, "en-UK");
-            Object o[] = null;
-            Task task = null;
-            Content c = null;
             for (TaskSummary obj : list) {
-                o = new Object[2];
-                 task = this.getTaskById(obj.getId());
-                 c = this.getContentById(task.getTaskData().getDocumentContentId());
+                Object o[] = new Object[2];
+                Task task = this.getTaskById(obj.getId());
+                Content c = this.getContentById(task.getTaskData().getDocumentContentId());
                 o[0] = task;
                 o[1] = c;
                 lresp.add(o);
@@ -442,7 +453,7 @@ public class HumanTaskClient {
 
     /**
      * Obtiene el valor de unfinished tasks.
-     * 
+     *
      * @param pUserId the user id
      * @param pCri the cri
      * @return Valor de unfinished tasks
@@ -453,16 +464,13 @@ public class HumanTaskClient {
         List<Object[]> lresp = new ArrayList<>();
         lestatus.add(Status.Reserved);
         lestatus.add(Status.InProgress);
-        List<TaskSummary> list = new ArrayList<>();
+        List<TaskSummary> list = taskService.getTasksOwnedByStatus(pUserId, lestatus, "en-UK");
         try {
             list = taskService.getTasksOwnedByStatus(pUserId, lestatus, "en-UK");
-            Object o[];
-            Task task;
-            Content c;
             for (TaskSummary obj : list) {
-                o = new Object[2];
-                task = this.getTaskById(obj.getId());
-                 c = this.getContentById(task.getTaskData().getDocumentContentId());
+                Object o[] = new Object[2];
+                Task task = this.getTaskById(obj.getId());
+                Content c = this.getContentById(task.getTaskData().getDocumentContentId());
                 o[0] = task;
                 o[1] = c;
                 lresp.add(o);
@@ -473,55 +481,26 @@ public class HumanTaskClient {
         return lresp;
 
     }
-    
-    /**
-     * QUERY NATIVO DE TAREAS NO COMPLETADAS
-     */
-    private static final String TAREAS_GRUPO_NATIVO = "select\n" +
-            "         taskimpl0_,\n"+
-"          organizati1_.id\n" +
-"     from\n" +
-"         jbpm6.Task taskimpl0_ cross \n" +
-"     join\n" +
-"         jbpm6.OrganizationalEntity organizati1_ \n" +
-"     where\n" +
-"         (\n" +
-"             organizati1_.id in (\n" +
-"                 :groupIds\n" +
-"             )\n" +
-"         ) \n" +
-"         and (\n" +
-"             organizati1_.id in (\n" +
-"                 select\n" +
-"                     potentialo2_.entity_id \n" +
-"                 from\n" +
-"                     jbpm6.PeopleAssignments_PotOwners potentialo2_ \n" +
-"                 where\n" +
-"                     taskimpl0_.id=potentialo2_.task_id\n" +
-"             )\n" +
-"         ) \n" +
-"         and taskimpl0_.archived=0 \n" +
-"         and (\n" +
-"             taskimpl0_.actualOwner_id is null\n" +
-"         ) \n" +
-"         and (\n" +
-"             taskimpl0_.status in (\n" +
-"                 'Created' , 'Ready' , 'Reserved' , 'InProgress' , 'Suspended'\n" +
-"             )\n" +
-"         )";
-    
-    
+
     /**
      * JPQL JPQL_TASK_NOT_COMPLETEBYGROUP
      */
-    private static final String TAREAS_GRUPO = "select t, potentialOwners.id from TaskImpl t, OrganizationalEntityImpl potentialOwners "
-            + "where potentialOwners.id = :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";
+//    private static final String TAREAS_GRUPO = "select t, potentialOwners.id from TaskImpl t, OrganizationalEntityImpl potentialOwners "
+//            + "where potentialOwners.id in (:groupIds) and potentialOwners in elements ( t.peopleAssignments.potentialOwners ) and t.archived = 0 "
+//            + "and t.taskData.actualOwner = null and t.taskData.status in ('Created', 'Ready', 'Reserved', 'InProgress', 'Suspended')";
+    private static final String TAREAS_GRUPO = "SELECT t.id as taskId, t.archived , t.allowedtodelegate , t.description , t.formname , t.NAME , t.taskinitiator_id , "
+            + "t.priority , t.subtaskstrategy , t.subject , t.activationtime , t.actualowner_id , t.createdby_id , t.createdon , t.deploymentid , "
+            + "t.documentaccesstype , t.documentcontentid , t.documenttype , t.expirationtime , t.faultaccesstype , t.faultcontentid , t.faultname , "
+            + "t.faulttype , t.outputaccesstype , t.outputcontentid , t.outputtype , t.parentid , t.previousstatus , t.processid , t.processinstanceid , "
+            + "t.processsessionid , t.skipable , t.status , t.workitemid , t.tasktype , t.optlock , o.id as orgId "
+            + "FROM jbpm6.task t "
+            + "CROSS JOIN jbpm6.organizationalentity o "
+            + "INNER JOIN jbpm6.peopleassignments_potowners po ON po.task_id = t.id AND po.entity_id = o.id "
+            + "WHERE(o.id IN (:groupIds)) AND t.archived = 0 AND (t.actualowner_id IS NULL) AND (t.status IN ( 'Created', 'Ready', 'Reserved', 'InProgress','Suspended')) order by t.id";
 
     /**
      * Obtiene el valor de unfinished tasks por Grupo.
-     * 
+     *
      * @param pGroupId the user id
      * @param pCri the cri
      * @return Valor de unfinished tasks
@@ -530,15 +509,22 @@ public class HumanTaskClient {
     @SuppressWarnings(Constant.WARN_UNCHECKED)
     public List<Object[]> getTasksByGroup(String pGroupId, String pCri) throws Exception {
         List<Object[]> ldatos = new ArrayList<Object[]>();
+        TaskImpl t;
+        TaskDataImpl td;
+
         EntityManager em = null;
         try {
             em = PersistenceManager.getInstance().getEntityManagerFactoryAuxiliar("org.jbpm.domain").createEntityManager();
-            Query qry = em.createQuery(HumanTaskClient.TAREAS_GRUPO);
-            //Query qry = em.createNativeQuery(TAREAS_GRUPO_NATIVO);
+//            Query qry = em.createQuery(HumanTaskClient.TAREAS_GRUPO);
+            Query qry = em.createNativeQuery(HumanTaskClient.TAREAS_GRUPO);
             qry.setParameter("groupIds", pGroupId);
-            ldatos = qry.getResultList();
+            List<Fila> data = ejecutarConsultaNativaList(qry);
+
+            for (Fila row : data) {
+                ldatos.add(new Object[]{mapTask(row), row.get(36)});
+            }
         } catch (Exception e) {
-            throw new RuntimeException(e);
+            e.printStackTrace(System.err);
         } finally {
             if (em.isOpen()) {
                 em.close();
@@ -547,9 +533,183 @@ public class HumanTaskClient {
         return ldatos;
     }
 
+    /**
+     *
+     * @param query
+     * @param consulta
+     * @return
+     */
+    public List<Fila> ejecutarConsultaNativaList(Query query) {
+        List<Fila> resultado = new ArrayList<>();
+        List datos = query.getResultList();
+        if (datos == null || datos.isEmpty()) {
+            return resultado;
+        }
+
+        for (Object row : datos) {
+            Fila fila = new Fila();
+            if (row.getClass().isArray()) {
+                Object[] orow = (Object[]) row;
+                for (Object val : orow) {
+                    fila.add(val);
+                }
+            } else {
+                fila.add(row);
+            }
+            resultado.add(fila);
+        }
+        return resultado;
+    }
+
+    public TaskImpl mapTask(Fila row) {
+        TaskImpl ti = new TaskImpl();
+        PeopleAssignmentsImpl pa = new PeopleAssignmentsImpl();
+        DelegationImpl di = new DelegationImpl();
+        TaskDataImpl tdi = new TaskDataImpl();
+        DeadlinesImpl dli = new DeadlinesImpl();
+        ti.setId(evalLong(row.get(0)));
+        ti.setArchived(evalInt(row.get(1)) == 1);
+        di.setAllowed(evaluateATD(row.get(2)));
+        ti.setDescription((String) row.get(3));
+        ti.setFormName((String) row.get(4));
+        ti.setName((String) row.get(5));
+        pa.setTaskInitiator(new UserImpl((String) row.get(6)));
+        ti.setPriority(evalInt(row.get(7)));
+        ti.setSubTaskStrategy(evaluateSub(row.get(8)));
+        ti.setSubject((String) row.get(9));
+        tdi.setActivationTime(evaluateDate(row.get(10)));
+        tdi.setActualOwner(new UserImpl((String) row.get(11)));
+        tdi.setCreatedBy(new UserImpl((String) row.get(12)));
+        tdi.setCreatedOn(evaluateDate(row.get(13)));
+        tdi.setDeploymentId((String) row.get(14));
+        tdi.setDocumentAccessType(evaluateAT(row.get(15)));
+        tdi.setDocumentContentId(evalLong(row.get(16)));
+        tdi.setDocumentType((String) row.get(17));
+        tdi.setExpirationTime(evaluateDate(row.get(18)));
+        tdi.setFaultAccessType(evaluateAT(row.get(19)));
+        tdi.setFaultContentId(evalLong(row.get(20)));
+        tdi.setFaultName((String) row.get(21));
+        tdi.setFaultType((String) row.get(22));
+        tdi.setOutputAccessType(evaluateAT(row.get(23)));
+        tdi.setOutputContentId(evalLong(row.get(24)));
+        tdi.setOutputType((String) row.get(25));
+        tdi.setParentId(evalLong(row.get(26)));
+        tdi.setPreviousStatus(evaluateStatus(row.get(27)));
+        tdi.setProcessId((String) row.get(28));
+        tdi.setProcessInstanceId(evalLong(row.get(29)));
+        tdi.setProcessSessionId(evalInt(row.get(30)));
+        tdi.setSkipable((Boolean)row.get(31));
+        tdi.setStatus(evaluateStatus(row.get(32)));
+        tdi.setWorkItemId(evalLong(row.get(33)));
+        ti.setTaskType((String) row.get(34));
+
+        ti.setPeopleAssignments(pa);
+        ti.setDelegation(di);
+        ti.setTaskData(tdi);
+        ti.setDeadlines(dli);
+        return ti;
+    }
+
+    public Integer evalInt(Object data) {
+        Integer result = null;
+        if (data != null) {
+            result = ((BigDecimal) data).intValue();
+        }
+        return result;
+    }
+
+    public Long evalLong(Object data) {
+        Long result = null;
+        if (data != null) {
+            result = ((BigDecimal) data).longValue();
+        }
+        return result;
+    }
+
+    public static Status evaluateStatus(Object data) {
+        Status at = null;
+        if (data != null) {
+            if (data instanceof Status) {
+                at = (Status) data;
+            } else {
+                try {
+                    at = Status.valueOf(data.toString());
+                } catch (RuntimeException ex) {
+                    at = null;
+                }
+            }
+        }
+        return at;
+    }
+
+    public static AccessType evaluateAT(Object data) {
+        AccessType at = null;
+        if (data != null) {
+            if (data instanceof AccessType) {
+                at = (AccessType) data;
+            } else {
+                try {
+                    at = AccessType.valueOf(data.toString());
+                } catch (RuntimeException ex) {
+                    at = null;
+                }
+            }
+        }
+        return at;
+    }
+
+    public static SubTasksStrategy evaluateSub(Object data) {
+        SubTasksStrategy st = null;
+        if (data != null) {
+            if (data instanceof SubTasksStrategy) {
+                st = (SubTasksStrategy) data;
+            } else {
+                try {
+                    st = SubTasksStrategy.valueOf(data.toString());
+                } catch (RuntimeException ex) {
+                    st = null;
+                }
+            }
+        }
+        return st;
+    }
+
+    public static AllowedToDelegate evaluateATD(Object data) {
+        AllowedToDelegate del = null;
+        if (data != null) {
+            if (data instanceof AllowedToDelegate) {
+                del = (AllowedToDelegate) data;
+            } else {
+                try {
+                    del = AllowedToDelegate.valueOf(data.toString());
+                } catch (RuntimeException ex) {
+                    del = null;
+                }
+            }
+        }
+        return del;
+    }
+
+    public static Date evaluateDate(Object date) {
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+        Date fecha = null;
+        if (date != null) {
+            if (date instanceof Date) {
+                fecha = (Date) date;
+            } else {
+                try {
+                    fecha = df.parse(date.toString());
+                } catch (ParseException ex) {
+                    fecha = null;
+                }
+            }
+        }
+        return fecha;
+    }
+
     /**
      * Release task.
-     * 
+     *
      * @param pTask the task
      * @param pUserId the user id
      * @throws Exception la exception
@@ -560,7 +720,7 @@ public class HumanTaskClient {
 
     /**
      * Resume task.
-     * 
+     *
      * @param pTask the task
      * @param pUserId the user id
      * @throws Exception la exception
@@ -571,14 +731,14 @@ public class HumanTaskClient {
 
     /**
      * Start task.
-     * 
+     *
      * @param pTask the task
      * @throws Exception la exception
      */
     public void startTask(long pTask) throws Exception {
         Task task = this.getTaskById(pTask);
         APPLogger.getLogger().debug("Starting task " + pTask);
-         Map<String, Object> input = this.getInputData(task);
+        Map<String, Object> input = this.getInputData(task);
         // com.fp.bpmlib.Process p = this.findProcess(task.getTaskData(), snapshot);
         // TaskInfo ti = (TaskInfo) input.get(ProcessUtil.TASK_METADATA);
         // ti.setTaskId(pTask);
@@ -592,9 +752,7 @@ public class HumanTaskClient {
         // Elimina el content anterior y remplaza por un nuevo content.
         // its.deleteContent(pTask, task.getTaskData().getDocumentContentId());
         // its.addContent(pTask, input);
-
         // ***** LA FECHA DE CREACION E INICIO SE TOMA DE LA BAMTASKSUMMARY PARA PRESENTAR EN EL MONITOR.
-
         taskService.start(pTask, task.getTaskData().getActualOwner().getId());
         FlowActivitySave.actualizarActividadStart(pTask);
         APPLogger.getLogger().debug("Started task " + pTask);
@@ -602,7 +760,7 @@ public class HumanTaskClient {
 
     /**
      * Stop task.
-     * 
+     *
      * @param pTask the task
      * @param pUserId the user id
      * @throws Exception la exception
@@ -613,7 +771,7 @@ public class HumanTaskClient {
 
     /**
      * Suspend task.
-     * 
+     *
      * @param pTask the task
      * @param pUserId the user id
      * @throws Exception la exception
@@ -622,4 +780,8 @@ public class HumanTaskClient {
         taskService.suspend(pTask, pUserId);
     }
 
-}
+    class Fila extends ArrayList<Object> {
+
+    }
+
+}

base/bpm/bpmlib/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:25 ECT 2023
+#Fri Feb 03 15:45:11 ECT 2023
 version=2.1
 groupId=com.fp.base.bpm
 artifactId=bpmlib

base/bpm/simple/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:19 ECT 2023
+#Fri Feb 03 15:45:06 ECT 2023
 version=2.1
 groupId=com.fp.base.bpm
 artifactId=simple

base/business/armas/src/main/java/com/fp/armas/rules/query/solicitud/CashManagementQuery.java

@@ -40,7 +40,7 @@ public class CashManagementQuery extends QueryRule {
 			+ "left join tarmtramite tra on tra.ctramite = sol.ctramite "
 			+ "left join tgenecatalogdetail tipaut on tra.tipoautorizacion = tipaut.catalog and tra.tipoautorizacioncodigo = tipaut.catalogcode "
 			+ "where soltra.INCASHREPORT is null and soltra.numerocomprobante is null and soltra.estadotramite='REG' and soltra.valorapagar>0 "
-			+ "and sol.fverificarequisitos >= to_date(':fechaInicialStr','DD/MM/RRRR') and sol.fverificarequisitos <= to_date(':fechaFinalStr','DD/MM/RRRR')";
+			+ "and sol.fverificarequisitos >= to_date(':fechaInicialStr','DD/MM/YYYY') and sol.fverificarequisitos <= to_date(':fechaFinalStr','DD/MM/YYYY')";
 
 	/**
 	 * Completa datos del arma

base/business/armas/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:46 ECT 2023
+#Fri Feb 03 15:45:32 ECT 2023
 version=2.1
 groupId=com.fp.base.business
 artifactId=armas

base/business/general/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:40 ECT 2023
+#Fri Feb 03 15:45:25 ECT 2023
 version=2.1
 groupId=com.fp.base.business
 artifactId=general

base/business/log/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:42 ECT 2023
+#Fri Feb 03 15:45:27 ECT 2023
 version=2.1
 groupId=com.fp.base.business
 artifactId=log

base/business/person/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:37 ECT 2023
+#Fri Feb 03 15:45:22 ECT 2023
 version=2.1
 groupId=com.fp.base.business
 artifactId=person

base/business/report/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:41 ECT 2023
+#Fri Feb 03 15:45:26 ECT 2023
 version=2.1
 groupId=com.fp.base.business
 artifactId=report

base/business/viaticos/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:43 ECT 2023
+#Fri Feb 03 15:45:29 ECT 2023
 version=2.1
 groupId=com.fp.base.business
 artifactId=viaticos

base/core/alfresco-client/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:34 ECT 2023
+#Fri Feb 03 15:45:19 ECT 2023
 version=2.1
 groupId=com.fp.base.core
 artifactId=alfresco-client

base/core/bpm/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:21 ECT 2023
+#Fri Feb 03 15:45:07 ECT 2023
 version=2.1
 groupId=com.fp.base.core
 artifactId=bpm

base/core/firmas/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:33 ECT 2023
+#Fri Feb 03 15:45:18 ECT 2023
 version=2.1
 groupId=com.fp.base.core
 artifactId=firmas

base/dto/common/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:07 ECT 2023
+#Fri Feb 03 15:44:52 ECT 2023
 version=2.1
 groupId=com.fp.base.dto
 artifactId=common

base/dto/dto/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:04 ECT 2023
+#Fri Feb 03 15:44:50 ECT 2023
 version=2.1
 groupId=com.fp.base.dto
 artifactId=dto

base/facade/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:48 ECT 2023
+#Fri Feb 03 15:45:33 ECT 2023
 version=2.1
 groupId=com.fp.base
 artifactId=facade

base/facadeclient/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:47 ECT 2023
+#Fri Feb 03 15:45:32 ECT 2023
 version=2.1
 groupId=com.fp.base
 artifactId=facadeclient

base/persistence/commondb/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:15 ECT 2023
+#Fri Feb 03 15:45:01 ECT 2023
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=commondb

base/persistence/parmas/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:32 ECT 2023
+#Fri Feb 03 15:45:17 ECT 2023
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=parmas

base/persistence/pbpm/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:08 ECT 2023
+#Fri Feb 03 15:44:54 ECT 2023
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=pbpm

base/persistence/pcustomer/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:17 ECT 2023
+#Fri Feb 03 15:45:04 ECT 2023
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=pcustomer

base/persistence/pfirmas/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:29 ECT 2023
+#Fri Feb 03 15:45:14 ECT 2023
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=pfirmas

base/persistence/pgeneral/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:13 ECT 2023
+#Fri Feb 03 15:44:59 ECT 2023
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=pgeneral

base/persistence/plog/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:26 ECT 2023
+#Fri Feb 03 15:45:12 ECT 2023
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=plog

base/persistence/pviaticos/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:28 ECT 2023
+#Fri Feb 03 15:45:13 ECT 2023
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=pviaticos

base/persistence/util/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:18 ECT 2023
+#Fri Feb 03 15:45:05 ECT 2023
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=util

base/sessionbeans/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:35 ECT 2023
+#Fri Feb 03 15:45:20 ECT 2023
 version=2.1
 groupId=com.fp.base
 artifactId=sessionbeans

clients/comaco/ear/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:49 ECT 2023
+#Fri Feb 03 15:45:34 ECT 2023
 version=2.1
 groupId=com.fp.clients.maia
 artifactId=maiaear

clients/comaco/environment-eap6/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:10:48 ECT 2023
+#Fri Feb 03 15:45:33 ECT 2023
 version=2.1
 groupId=com.fp.clients.maia
 artifactId=environment-eap6

frontend/src/test/java/testFactura.java

@@ -11,8 +11,11 @@ import com.fp.frontend.controller.pcustomer.PersonPhoneController;
 import com.fp.frontend.controller.pgeneral.gene.CatalogDetailController;
 import com.fp.frontend.controller.pgeneral.gene.CityController;
 import com.fp.firma.common.CertificateUtils;
+import com.fp.frontend.controller.armas.parametros.CashManagementHistoryController;
 
 import com.fp.frontend.controller.pgeneral.gene.ParametersController;
+import com.fp.frontend.utility.Utilidades;
+import com.fp.persistence.parmas.fun.TarmCashManagementHistory;
 import com.fp.persistence.parmas.param.TarmCentroControl;
 import com.fp.persistence.parmas.soli.TarmSolicitud;
 import com.fp.persistence.parmas.soli.TarmSolicitudTramite;
@@ -23,6 +26,7 @@ import com.fp.persistence.pcustomer.gene.TcustPersonPhone;
 import com.fp.persistence.pgeneral.gene.TgeneCatalogDetail;
 import com.fp.persistence.pgeneral.gene.TgeneCity;
 import com.fp.persistence.pgeneral.gene.TgeneParameters;
+import com.fp.persistence.pgeneral.safe.TsafeUserDetail;
 import com.itextpdf.text.DocumentException;
 import com.itextpdf.text.Font;
 import com.itextpdf.text.Rectangle;
@@ -51,13 +55,16 @@ import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
 import java.security.cert.CertificateException;
+import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Scanner;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.servlet.http.HttpServletResponse;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -284,6 +291,13 @@ public class testFactura {
         }
         
     }
+    /**
+     * Arma la petición al core para solicitar un número de
+     * secuencial para la solicitud antes de guardarla
+     *
+     * @throws Throwable
+     */
+   
     public static void main(String[] args) {
         //correrClase();
         Map<String,String> sexo = new HashMap();

frontend/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 02 15:11:04 ECT 2023
+#Fri Feb 03 15:45:48 ECT 2023
 version=2.1
 groupId=com.fp
 artifactId=frontend