corregido estados de jbpm en solicitud
This commit is contained in:
cruales
parent
f7a7e5eedc
commit
6c4915ab55
|
|
@ -27,9 +27,11 @@ public class EstadoSolicitudQuery extends QueryRule{
|
|||
codigosolicitud=codigosolicitud.replace("TRA", "");
|
||||
}
|
||||
|
||||
StringBuilder sql = new StringBuilder("select DISTINCT ta.ACTIVITYNAME,ta.USERCODE,ta.GROUPCODE,tk.STATUS,ta.CREATED,ta.STARTED,ta.COMPLETED "
|
||||
+ " from jbpm6.VARIABLEINSTANCELOG d, TBPMACTIVITIES ta, jbpm6.TASK tk "
|
||||
+ " where d.processInstanceId = ta.internalcode and tk.id (+) = ta.TASKID ");
|
||||
StringBuilder sql = new StringBuilder("select DISTINCT ta.ACTIVITYNAME,ta.USERCODE,ta.GROUPCODE,tk.STATUS,ta.CREATED,ta.STARTED,\n" +
|
||||
"ta.COMPLETED from jbpm6.VARIABLEINSTANCELOG d, TBPMACTIVITIES ta \n" +
|
||||
"LEFT JOIN jbpm6.TASK tk\n" +
|
||||
"ON (tk.id = ta.TASKID)\n" +
|
||||
"where cast(d.processInstanceId as varchar(50))= ta.internalcode");
|
||||
|
||||
if(codigosolicitud.contains("SOL") || codigosolicitud.contains("TRA")){
|
||||
sql.append(" and (d.value like '%SOL"+codigosolicitud+"%' or d.value like '%TRA"+codigosolicitud+"%') ");//SOL-0000491173
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<bpmn2:itemDefinition id="ItemDefinition_1" structureRef="String"/>
|
||||
<bpmn2:itemDefinition id="ItemDefinition_2" structureRef="Integer"/>
|
||||
<bpmn2:itemDefinition id="ItemDefinition_3" structureRef="Boolean"/>
|
||||
<bpmn2:process id="EjecucionPermiso" tns:version="1" tns:packageName="maia.flows.comaco.ejecucionpermiso" tns:adHoc="false" name="EjecucionPermiso" isExecutable="true" processType="Private">
|
||||
<bpmn2:process id="EjecucionPermiso" tns:version="1" tns:packageName="maia.flows.ejecucionpermiso" tns:adHoc="false" name="EjecucionPermiso" isExecutable="true" processType="Private">
|
||||
<bpmn2:extensionElements>
|
||||
<tns:import name="java.util.ArrayList"/>
|
||||
<tns:import name="java.util.Map"/>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<bpmn2:itemDefinition id="_ItemDefinition_11" structureRef="com.fp.simple.flow.FlowUtil"/>
|
||||
<bpmn2:itemDefinition id="_ItemDefinition_17" structureRef="java.util.List"/>
|
||||
<bpmn2:itemDefinition id="_ItemDefinition_21" structureRef="com.fp.bpmlib.flow.FlowUtil"/>
|
||||
<bpmn2:process id="comaco.autorizarDocumento" tns:version="1" tns:packageName="comaco" tns:adHoc="false" name="autorizarDocumento" isExecutable="true" processType="Private">
|
||||
<bpmn2:process id="autorizarDocumento" tns:version="1" tns:packageName="comaco" tns:adHoc="false" name="autorizarDocumento" isExecutable="true" processType="Private">
|
||||
<bpmn2:extensionElements>
|
||||
<tns:import name="java.util.Map"/>
|
||||
<tns:import name="java.util.ArrayList"/>
|
||||
|
|
@ -198,7 +198,7 @@ tasksMetaData.put("Aprobar tramite",old);</tns:script>
|
|||
<bpmn2:sequenceFlow id="SequenceFlow_5" tns:priority="1" name="" sourceRef="CallActivity_3" targetRef="EndEvent_2"/>
|
||||
</bpmn2:process>
|
||||
<bpmndi:BPMNDiagram id="BPMNDiagram_1" name="autorizarDocumento">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="comaco.autorizarDocumento">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="autorizarDocumento">
|
||||
<bpmndi:BPMNShape id="BPMNShape_StartEvent_1" bpmnElement="StartEvent_1">
|
||||
<dc:Bounds height="36.0" width="36.0" x="50.0" y="10.0"/>
|
||||
</bpmndi:BPMNShape>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<bpmn2:itemDefinition id="_ItemDefinition_11" structureRef="com.fp.simple.flow.FlowUtil"/>
|
||||
<bpmn2:itemDefinition id="_ItemDefinition_17" structureRef="java.util.List"/>
|
||||
<bpmn2:itemDefinition id="_ItemDefinition_21" structureRef="com.fp.bpmlib.flow.FlowUtil"/>
|
||||
<bpmn2:process id="comaco.notificarDecomiso" tns:version="1" tns:packageName="comaco" tns:adHoc="false" name="notificarDecomiso" isExecutable="true" processType="Private">
|
||||
<bpmn2:process id="notificarDecomiso" tns:version="1" tns:packageName="comaco" tns:adHoc="false" name="notificarDecomiso" isExecutable="true" processType="Private">
|
||||
<bpmn2:extensionElements>
|
||||
<tns:import name="java.util.Map"/>
|
||||
<tns:import name="java.util.ArrayList"/>
|
||||
|
|
@ -144,7 +144,7 @@ FlowUtil.endFlow(kcontext);</bpmn2:script>
|
|||
</bpmn2:sequenceFlow>
|
||||
</bpmn2:process>
|
||||
<bpmndi:BPMNDiagram id="BPMNDiagram_1" name="notificarDecomiso">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="comaco.notificarDecomiso">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="notificarDecomiso">
|
||||
<bpmndi:BPMNShape id="BPMNShape_StartEvent_1" bpmnElement="StartEvent_1">
|
||||
<dc:Bounds height="36.0" width="36.0" x="50.0" y="10.0"/>
|
||||
</bpmndi:BPMNShape>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<bpmn2:itemDefinition id="_ItemDefinition_11" structureRef="com.fp.simple.flow.FlowUtil"/>
|
||||
<bpmn2:itemDefinition id="_ItemDefinition_17" structureRef="java.util.List"/>
|
||||
<bpmn2:itemDefinition id="_ItemDefinition_21" structureRef="com.fp.bpmlib.flow.FlowUtil"/>
|
||||
<bpmn2:process id="comaco.notificacionAnulacion" tns:version="1" tns:packageName="comaco" tns:adHoc="false" name="notificacionAnulacionTramite" isExecutable="true" processType="Private">
|
||||
<bpmn2:process id="notificacionAnulacion" tns:version="1" tns:packageName="comaco" tns:adHoc="false" name="notificacionAnulacionTramite" isExecutable="true" processType="Private">
|
||||
<bpmn2:extensionElements>
|
||||
<tns:import name="java.util.Map"/>
|
||||
<tns:import name="java.util.ArrayList"/>
|
||||
|
|
@ -136,7 +136,7 @@ FlowUtil.endFlow(kcontext);</bpmn2:script>
|
|||
</bpmn2:endEvent>
|
||||
</bpmn2:process>
|
||||
<bpmndi:BPMNDiagram id="BPMNDiagram_1" name="notificacionAnulacionTramite">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="comaco.notificacionAnulacion">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="notificacionAnulacion">
|
||||
<bpmndi:BPMNShape id="BPMNShape_StartEvent_1" bpmnElement="StartEvent_1">
|
||||
<dc:Bounds height="36.0" width="36.0" x="50.0" y="10.0"/>
|
||||
</bpmndi:BPMNShape>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
<itemDefinition id="_ItemDefinition_7" structureRef="java.util.ArrayList" />
|
||||
<itemDefinition id="_ItemDefinition_9" structureRef="com.fp.simple.dto.TaskInfo" />
|
||||
|
||||
<process processType="Private" isExecutable="true" id="comaco.solicitud" name="solicitud" tns:packageName="comaco" tns:version="1" >
|
||||
<process processType="Private" isExecutable="true" id="solicitud" name="solicitud" tns:packageName="comaco" tns:version="1" >
|
||||
|
||||
<extensionElements>
|
||||
<tns:import name="java.util.Map" />
|
||||
|
|
@ -190,7 +190,7 @@ tasksMetaData.put("Aprobar tramite",old);</tns:script>
|
|||
</process>
|
||||
|
||||
<bpmndi:BPMNDiagram>
|
||||
<bpmndi:BPMNPlane bpmnElement="comaco.solicitud" >
|
||||
<bpmndi:BPMNPlane bpmnElement="solicitud" >
|
||||
<bpmndi:BPMNShape bpmnElement="EndEvent_2" >
|
||||
<dc:Bounds x="792" y="114" width="48" height="48" />
|
||||
</bpmndi:BPMNShape>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<bpmn2:itemDefinition id="_ItemDefinition_11" structureRef="com.fp.simple.flow.FlowUtil"/>
|
||||
<bpmn2:itemDefinition id="_ItemDefinition_17" structureRef="java.util.List"/>
|
||||
<bpmn2:itemDefinition id="_ItemDefinition_21" structureRef="com.fp.bpmlib.flow.FlowUtil"/>
|
||||
<bpmn2:process id="comaco.carlos" tns:version="1" tns:packageName="comaco" tns:adHoc="false" name="solicitudCarlos" isExecutable="true" processType="Private">
|
||||
<bpmn2:process id="carlos" tns:version="1" tns:packageName="comaco" tns:adHoc="false" name="solicitudCarlos" isExecutable="true" processType="Private">
|
||||
<bpmn2:extensionElements>
|
||||
<tns:import name="java.util.Map"/>
|
||||
<tns:import name="java.util.ArrayList"/>
|
||||
|
|
@ -121,7 +121,7 @@ tasksMetaData.put("Notificar fecha de Emision",old);</tns:script>
|
|||
<bpmn2:sequenceFlow id="SequenceFlow_4" tns:priority="1" sourceRef="CallActivity_2" targetRef="ScriptTask_3"/>
|
||||
</bpmn2:process>
|
||||
<bpmndi:BPMNDiagram id="BPMNDiagram_1" name="solicitudCarlos">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="comaco.carlos">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="carlos">
|
||||
<bpmndi:BPMNShape id="BPMNShape_StartEvent_1" bpmnElement="StartEvent_1">
|
||||
<dc:Bounds height="36.0" width="36.0" x="50.0" y="10.0"/>
|
||||
</bpmndi:BPMNShape>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
<bpmn2:itemDefinition id="_ItemDefinition_11" structureRef="com.fp.simple.flow.FlowUtil"/>
|
||||
<bpmn2:itemDefinition id="_ItemDefinition_13" structureRef="java.util.List"/>
|
||||
<bpmn2:itemDefinition id="_ItemDefinition_23" structureRef="com.fp.bpmlib.flow.FlowUtil"/>
|
||||
<bpmn2:process id="comaco.solicitudFlow" tns:version="1" tns:packageName="comaco" tns:adHoc="true" name="solicitudFlow" isExecutable="true" processType="Private">
|
||||
<bpmn2:process id="solicitudFlow" tns:version="1" tns:packageName="comaco" tns:adHoc="true" name="solicitudFlow" isExecutable="true" processType="Private">
|
||||
<bpmn2:extensionElements>
|
||||
<tns:import name="java.util.Map"/>
|
||||
<tns:import name="java.util.ArrayList"/>
|
||||
|
|
@ -369,7 +369,7 @@ tasksMetaData.put("Aprobar tramite",old);</tns:script>
|
|||
<bpmn2:sequenceFlow id="SequenceFlow_21" tns:priority="1" sourceRef="ScriptTask_6" targetRef="CallActivity_4"/>
|
||||
</bpmn2:process>
|
||||
<bpmndi:BPMNDiagram id="BPMNDiagram_1" name="solicitudFlow">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="comaco.solicitudFlow">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="solicitudFlow">
|
||||
<bpmndi:BPMNShape id="BPMNShape_StartEvent_1" bpmnElement="StartEvent_1">
|
||||
<dc:Bounds height="36.0" width="36.0" x="50.0" y="30.0"/>
|
||||
</bpmndi:BPMNShape>
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
|
@ -8,7 +8,7 @@
|
|||
<bpmn2:itemDefinition id="ItemDefinition_1" structureRef="String"/>
|
||||
<bpmn2:itemDefinition id="ItemDefinition_2" structureRef="Integer"/>
|
||||
<bpmn2:itemDefinition id="ItemDefinition_3" structureRef="Boolean"/>
|
||||
<bpmn2:process id="EjecucionPermiso" tns:version="1" tns:packageName="maia.flows.comaco.ejecucionpermiso" tns:adHoc="false" name="EjecucionPermiso" isExecutable="true" processType="Private">
|
||||
<bpmn2:process id="EjecucionPermiso" tns:version="1" tns:packageName="maia.flows.ejecucionpermiso" tns:adHoc="false" name="EjecucionPermiso" isExecutable="true" processType="Private">
|
||||
<bpmn2:extensionElements>
|
||||
<tns:import name="java.util.ArrayList"/>
|
||||
<tns:import name="java.util.Map"/>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<bpmn2:itemDefinition id="_ItemDefinition_11" structureRef="com.fp.simple.flow.FlowUtil"/>
|
||||
<bpmn2:itemDefinition id="_ItemDefinition_17" structureRef="java.util.List"/>
|
||||
<bpmn2:itemDefinition id="_ItemDefinition_21" structureRef="com.fp.bpmlib.flow.FlowUtil"/>
|
||||
<bpmn2:process id="comaco.autorizarDocumento" tns:version="1" tns:packageName="comaco" tns:adHoc="false" name="autorizarDocumento" isExecutable="true" processType="Private">
|
||||
<bpmn2:process id="autorizarDocumento" tns:version="1" tns:packageName="comaco" tns:adHoc="false" name="autorizarDocumento" isExecutable="true" processType="Private">
|
||||
<bpmn2:extensionElements>
|
||||
<tns:import name="java.util.Map"/>
|
||||
<tns:import name="java.util.ArrayList"/>
|
||||
|
|
@ -198,7 +198,7 @@ tasksMetaData.put("Aprobar tramite",old);</tns:script>
|
|||
<bpmn2:sequenceFlow id="SequenceFlow_5" tns:priority="1" name="" sourceRef="CallActivity_3" targetRef="EndEvent_2"/>
|
||||
</bpmn2:process>
|
||||
<bpmndi:BPMNDiagram id="BPMNDiagram_1" name="autorizarDocumento">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="comaco.autorizarDocumento">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="autorizarDocumento">
|
||||
<bpmndi:BPMNShape id="BPMNShape_StartEvent_1" bpmnElement="StartEvent_1">
|
||||
<dc:Bounds height="36.0" width="36.0" x="50.0" y="10.0"/>
|
||||
</bpmndi:BPMNShape>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<bpmn2:itemDefinition id="_ItemDefinition_11" structureRef="com.fp.simple.flow.FlowUtil"/>
|
||||
<bpmn2:itemDefinition id="_ItemDefinition_17" structureRef="java.util.List"/>
|
||||
<bpmn2:itemDefinition id="_ItemDefinition_21" structureRef="com.fp.bpmlib.flow.FlowUtil"/>
|
||||
<bpmn2:process id="comaco.notificarDecomiso" tns:version="1" tns:packageName="comaco" tns:adHoc="false" name="notificarDecomiso" isExecutable="true" processType="Private">
|
||||
<bpmn2:process id="notificarDecomiso" tns:version="1" tns:packageName="comaco" tns:adHoc="false" name="notificarDecomiso" isExecutable="true" processType="Private">
|
||||
<bpmn2:extensionElements>
|
||||
<tns:import name="java.util.Map"/>
|
||||
<tns:import name="java.util.ArrayList"/>
|
||||
|
|
@ -144,7 +144,7 @@ FlowUtil.endFlow(kcontext);</bpmn2:script>
|
|||
</bpmn2:sequenceFlow>
|
||||
</bpmn2:process>
|
||||
<bpmndi:BPMNDiagram id="BPMNDiagram_1" name="notificarDecomiso">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="comaco.notificarDecomiso">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="notificarDecomiso">
|
||||
<bpmndi:BPMNShape id="BPMNShape_StartEvent_1" bpmnElement="StartEvent_1">
|
||||
<dc:Bounds height="36.0" width="36.0" x="50.0" y="10.0"/>
|
||||
</bpmndi:BPMNShape>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<bpmn2:itemDefinition id="_ItemDefinition_11" structureRef="com.fp.simple.flow.FlowUtil"/>
|
||||
<bpmn2:itemDefinition id="_ItemDefinition_17" structureRef="java.util.List"/>
|
||||
<bpmn2:itemDefinition id="_ItemDefinition_21" structureRef="com.fp.bpmlib.flow.FlowUtil"/>
|
||||
<bpmn2:process id="comaco.notificacionAnulacion" tns:version="1" tns:packageName="comaco" tns:adHoc="false" name="notificacionAnulacionTramite" isExecutable="true" processType="Private">
|
||||
<bpmn2:process id="notificacionAnulacion" tns:version="1" tns:packageName="comaco" tns:adHoc="false" name="notificacionAnulacionTramite" isExecutable="true" processType="Private">
|
||||
<bpmn2:extensionElements>
|
||||
<tns:import name="java.util.Map"/>
|
||||
<tns:import name="java.util.ArrayList"/>
|
||||
|
|
@ -136,7 +136,7 @@ FlowUtil.endFlow(kcontext);</bpmn2:script>
|
|||
</bpmn2:endEvent>
|
||||
</bpmn2:process>
|
||||
<bpmndi:BPMNDiagram id="BPMNDiagram_1" name="notificacionAnulacionTramite">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="comaco.notificacionAnulacion">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="notificacionAnulacion">
|
||||
<bpmndi:BPMNShape id="BPMNShape_StartEvent_1" bpmnElement="StartEvent_1">
|
||||
<dc:Bounds height="36.0" width="36.0" x="50.0" y="10.0"/>
|
||||
</bpmndi:BPMNShape>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
<itemDefinition id="_ItemDefinition_7" structureRef="java.util.ArrayList" />
|
||||
<itemDefinition id="_ItemDefinition_9" structureRef="com.fp.simple.dto.TaskInfo" />
|
||||
|
||||
<process processType="Private" isExecutable="true" id="comaco.solicitud" name="solicitud" tns:packageName="comaco" tns:version="1" >
|
||||
<process processType="Private" isExecutable="true" id="solicitud" name="solicitud" tns:packageName="comaco" tns:version="1" >
|
||||
|
||||
<extensionElements>
|
||||
<tns:import name="java.util.Map" />
|
||||
|
|
@ -190,7 +190,7 @@ tasksMetaData.put("Aprobar tramite",old);</tns:script>
|
|||
</process>
|
||||
|
||||
<bpmndi:BPMNDiagram>
|
||||
<bpmndi:BPMNPlane bpmnElement="comaco.solicitud" >
|
||||
<bpmndi:BPMNPlane bpmnElement="solicitud" >
|
||||
<bpmndi:BPMNShape bpmnElement="EndEvent_2" >
|
||||
<dc:Bounds x="792" y="114" width="48" height="48" />
|
||||
</bpmndi:BPMNShape>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<bpmn2:itemDefinition id="_ItemDefinition_11" structureRef="com.fp.simple.flow.FlowUtil"/>
|
||||
<bpmn2:itemDefinition id="_ItemDefinition_17" structureRef="java.util.List"/>
|
||||
<bpmn2:itemDefinition id="_ItemDefinition_21" structureRef="com.fp.bpmlib.flow.FlowUtil"/>
|
||||
<bpmn2:process id="comaco.carlos" tns:version="1" tns:packageName="comaco" tns:adHoc="false" name="solicitudCarlos" isExecutable="true" processType="Private">
|
||||
<bpmn2:process id="carlos" tns:version="1" tns:packageName="comaco" tns:adHoc="false" name="solicitudCarlos" isExecutable="true" processType="Private">
|
||||
<bpmn2:extensionElements>
|
||||
<tns:import name="java.util.Map"/>
|
||||
<tns:import name="java.util.ArrayList"/>
|
||||
|
|
@ -121,7 +121,7 @@ tasksMetaData.put("Notificar fecha de Emision",old);</tns:script>
|
|||
<bpmn2:sequenceFlow id="SequenceFlow_4" tns:priority="1" sourceRef="CallActivity_2" targetRef="ScriptTask_3"/>
|
||||
</bpmn2:process>
|
||||
<bpmndi:BPMNDiagram id="BPMNDiagram_1" name="solicitudCarlos">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="comaco.carlos">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="carlos">
|
||||
<bpmndi:BPMNShape id="BPMNShape_StartEvent_1" bpmnElement="StartEvent_1">
|
||||
<dc:Bounds height="36.0" width="36.0" x="50.0" y="10.0"/>
|
||||
</bpmndi:BPMNShape>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
<bpmn2:itemDefinition id="_ItemDefinition_11" structureRef="com.fp.simple.flow.FlowUtil"/>
|
||||
<bpmn2:itemDefinition id="_ItemDefinition_13" structureRef="java.util.List"/>
|
||||
<bpmn2:itemDefinition id="_ItemDefinition_23" structureRef="com.fp.bpmlib.flow.FlowUtil"/>
|
||||
<bpmn2:process id="comaco.solicitudFlow" tns:version="1" tns:packageName="comaco" tns:adHoc="true" name="solicitudFlow" isExecutable="true" processType="Private">
|
||||
<bpmn2:process id="solicitudFlow" tns:version="1" tns:packageName="comaco" tns:adHoc="true" name="solicitudFlow" isExecutable="true" processType="Private">
|
||||
<bpmn2:extensionElements>
|
||||
<tns:import name="java.util.Map"/>
|
||||
<tns:import name="java.util.ArrayList"/>
|
||||
|
|
@ -369,7 +369,7 @@ tasksMetaData.put("Aprobar tramite",old);</tns:script>
|
|||
<bpmn2:sequenceFlow id="SequenceFlow_21" tns:priority="1" sourceRef="ScriptTask_6" targetRef="CallActivity_4"/>
|
||||
</bpmn2:process>
|
||||
<bpmndi:BPMNDiagram id="BPMNDiagram_1" name="solicitudFlow">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="comaco.solicitudFlow">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="solicitudFlow">
|
||||
<bpmndi:BPMNShape id="BPMNShape_StartEvent_1" bpmnElement="StartEvent_1">
|
||||
<dc:Bounds height="36.0" width="36.0" x="50.0" y="30.0"/>
|
||||
</bpmndi:BPMNShape>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:16:55 ECT 2022
|
||||
#Fri Nov 18 16:48:26 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base.bpm
|
||||
artifactId=bpmlib
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:16:50 ECT 2022
|
||||
#Fri Nov 18 16:48:19 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base.bpm
|
||||
artifactId=simple
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:17:18 ECT 2022
|
||||
#Fri Nov 18 16:48:53 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base.business
|
||||
artifactId=armas
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:17:09 ECT 2022
|
||||
#Fri Nov 18 16:48:46 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base.business
|
||||
artifactId=general
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:17:12 ECT 2022
|
||||
#Fri Nov 18 16:48:48 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base.business
|
||||
artifactId=log
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:17:07 ECT 2022
|
||||
#Fri Nov 18 16:48:42 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base.business
|
||||
artifactId=person
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:17:11 ECT 2022
|
||||
#Fri Nov 18 16:48:47 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base.business
|
||||
artifactId=report
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:17:14 ECT 2022
|
||||
#Fri Nov 18 16:48:50 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base.business
|
||||
artifactId=viaticos
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:17:04 ECT 2022
|
||||
#Fri Nov 18 16:48:38 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base.core
|
||||
artifactId=alfresco-client
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:16:52 ECT 2022
|
||||
#Fri Nov 18 16:48:21 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base.core
|
||||
artifactId=bpm
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:17:03 ECT 2022
|
||||
#Fri Nov 18 16:48:37 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base.core
|
||||
artifactId=firmas
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:16:37 ECT 2022
|
||||
#Fri Nov 18 16:48:02 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base.dto
|
||||
artifactId=common
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:16:35 ECT 2022
|
||||
#Fri Nov 18 16:47:59 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base.dto
|
||||
artifactId=dto
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@ public class QueryBean extends BeanHelper implements FacadeBeanJsfRemote {
|
|||
BeanHelper.cleanThreadLocal();
|
||||
// PersistenceHelper.beginTransaction();
|
||||
QueryAction qa = new QueryAction();
|
||||
|
||||
resp = qa.process(request);
|
||||
// PersistenceHelper.commitTransaction();
|
||||
return resp;
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:17:20 ECT 2022
|
||||
#Fri Nov 18 16:48:56 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base
|
||||
artifactId=facade
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:17:19 ECT 2022
|
||||
#Fri Nov 18 16:48:55 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base
|
||||
artifactId=facadeclient
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:16:46 ECT 2022
|
||||
#Fri Nov 18 16:48:12 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base.persistence
|
||||
artifactId=commondb
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:17:02 ECT 2022
|
||||
#Fri Nov 18 16:48:35 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base.persistence
|
||||
artifactId=parmas
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:16:39 ECT 2022
|
||||
#Fri Nov 18 16:48:04 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base.persistence
|
||||
artifactId=pbpm
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:16:48 ECT 2022
|
||||
#Fri Nov 18 16:48:16 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base.persistence
|
||||
artifactId=pcustomer
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:16:59 ECT 2022
|
||||
#Fri Nov 18 16:48:31 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base.persistence
|
||||
artifactId=pfirmas
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:16:44 ECT 2022
|
||||
#Fri Nov 18 16:48:10 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base.persistence
|
||||
artifactId=pgeneral
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:16:56 ECT 2022
|
||||
#Fri Nov 18 16:48:28 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base.persistence
|
||||
artifactId=plog
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:16:58 ECT 2022
|
||||
#Fri Nov 18 16:48:30 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base.persistence
|
||||
artifactId=pviaticos
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:16:49 ECT 2022
|
||||
#Fri Nov 18 16:48:17 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base.persistence
|
||||
artifactId=util
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:17:05 ECT 2022
|
||||
#Fri Nov 18 16:48:40 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.base
|
||||
artifactId=sessionbeans
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:17:21 ECT 2022
|
||||
#Fri Nov 18 16:48:56 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.clients.maia
|
||||
artifactId=maiaear
|
||||
|
|
|
|||
|
|
@ -21,6 +21,14 @@
|
|||
</basic>
|
||||
</attributes>
|
||||
</entity>
|
||||
<entity class="org.jbpm.services.task.impl.model.I18NTextImpl" name="I18NTextImpl" access="FIELD">
|
||||
<table name="i18ntext"/>
|
||||
<attributes>
|
||||
<basic name="text" access="FIELD">
|
||||
<column name="text" column-definition="text"/>
|
||||
</basic>
|
||||
</attributes>
|
||||
</entity>
|
||||
<entity class="org.jbpm.executor.entities.RequestInfo" name="RequestInfo" access="FIELD">
|
||||
<table name="requestinfo"/>
|
||||
<attributes>
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
<property name="hibernate.show_sql" value="true"/>
|
||||
<property name="hibernate.format_sql" value="true"/>
|
||||
<property name="hibernate.max_fetch_depth" value="3" />
|
||||
<!--<property name="hibernate.hbm2ddl.auto" value="update" /> -->
|
||||
<property name="hibernate.hbm2ddl.auto" value="update" />
|
||||
<!-- BZ 841786: AS7/EAP 6/Hib 4 uses new (sequence) generators which seem to cause problems -->
|
||||
<property name="hibernate.id.new_generator_mappings" value="false" />
|
||||
<property name="hibernate.transaction.jta.platform" value="org.hibernate.service.jta.platform.internal.JBossAppServerJtaPlatform" />
|
||||
|
|
@ -78,10 +78,12 @@
|
|||
<provider>org.hibernate.ejb.HibernatePersistence</provider>
|
||||
<jta-data-source>java:jboss/datasources/FLIPDS1</jta-data-source>
|
||||
<properties>
|
||||
<property name="hibernate.default_schema" value="comaco"/>
|
||||
<property name="hibernate.show_sql" value="false"/>
|
||||
<property name="hibernate.connection.autocommit" value="false"/>
|
||||
<property name="hibernate.jdbc.fetch_size" value="50"/>
|
||||
<property name="hibernate.jdbc.batch_size" value="200"/>
|
||||
|
||||
<property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
|
||||
<!--property name="hibernate.ejb.cfgfile" value="hibernateFlipMapping.cfg.xml"/-->
|
||||
<!-- Para hibernate 4 -->
|
||||
|
|
|
|||
|
|
@ -21,6 +21,14 @@
|
|||
</basic>
|
||||
</attributes>
|
||||
</entity>
|
||||
<entity class="org.jbpm.services.task.impl.model.I18NTextImpl" name="I18NTextImpl" access="FIELD">
|
||||
<table name="i18ntext"/>
|
||||
<attributes>
|
||||
<basic name="text" access="FIELD">
|
||||
<column name="text" column-definition="text"/>
|
||||
</basic>
|
||||
</attributes>
|
||||
</entity>
|
||||
<entity class="org.jbpm.executor.entities.RequestInfo" name="RequestInfo" access="FIELD">
|
||||
<table name="requestinfo"/>
|
||||
<attributes>
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
<property name="hibernate.show_sql" value="true"/>
|
||||
<property name="hibernate.format_sql" value="true"/>
|
||||
<property name="hibernate.max_fetch_depth" value="3" />
|
||||
<!--<property name="hibernate.hbm2ddl.auto" value="update" /> -->
|
||||
<property name="hibernate.hbm2ddl.auto" value="update" />
|
||||
<!-- BZ 841786: AS7/EAP 6/Hib 4 uses new (sequence) generators which seem to cause problems -->
|
||||
<property name="hibernate.id.new_generator_mappings" value="false" />
|
||||
<property name="hibernate.transaction.jta.platform" value="org.hibernate.service.jta.platform.internal.JBossAppServerJtaPlatform" />
|
||||
|
|
@ -78,10 +78,12 @@
|
|||
<provider>org.hibernate.ejb.HibernatePersistence</provider>
|
||||
<jta-data-source>java:jboss/datasources/FLIPDS1</jta-data-source>
|
||||
<properties>
|
||||
<property name="hibernate.default_schema" value="comaco"/>
|
||||
<property name="hibernate.show_sql" value="false"/>
|
||||
<property name="hibernate.connection.autocommit" value="false"/>
|
||||
<property name="hibernate.jdbc.fetch_size" value="50"/>
|
||||
<property name="hibernate.jdbc.batch_size" value="200"/>
|
||||
|
||||
<property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
|
||||
<!--property name="hibernate.ejb.cfgfile" value="hibernateFlipMapping.cfg.xml"/-->
|
||||
<!-- Para hibernate 4 -->
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Nov 16 14:17:20 ECT 2022
|
||||
#Fri Nov 18 16:48:56 ECT 2022
|
||||
version=2.1
|
||||
groupId=com.fp.clients.maia
|
||||
artifactId=environment-eap6
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ import com.fp.persistence.parmas.fun.TarmRegistroArmas;
|
|||
import com.fp.persistence.parmas.param.TarmTipoArmaExplosivo;
|
||||
import com.fp.persistence.parmas.param.TarmTramite;
|
||||
import com.fp.persistence.parmas.soli.TarmArmas;
|
||||
import com.fp.persistence.parmas.soli.TarmDocumentoHabilitante;
|
||||
import com.fp.persistence.pcustomer.gene.TcustPersonDetail;
|
||||
import com.fp.persistence.pgeneral.gene.TgeneCanton;
|
||||
import com.fp.persistence.pgeneral.gene.TgeneCatalogDetail;
|
||||
|
|
@ -235,7 +236,11 @@ public class ArmasController extends AbstractController<TarmArmas> {
|
|||
private String tipoSeleccionado;
|
||||
|
||||
private Integer seleccionados;
|
||||
|
||||
/**
|
||||
* Obtener datos de consulta en armas
|
||||
*/
|
||||
private String descategoria;
|
||||
private String usoActividad;
|
||||
@ManagedProperty(value = "#{alfrescoController}")
|
||||
private AlfrescoController alfrescoController;
|
||||
|
||||
|
|
@ -684,6 +689,7 @@ public class ArmasController extends AbstractController<TarmArmas> {
|
|||
|
||||
@Override
|
||||
public void update() throws Exception {
|
||||
System.out.println(" Estamos en la matrix");
|
||||
TgeneCatalogDetail estado = CatalogDetailController.findxCodigoCodcatalogo(record.getEstado(), record.getEstadocodigo());
|
||||
TgeneCatalogDetail marca = CatalogDetailController.findxCodigoCodcatalogo(record.getMarca(), record.getMarcacodigo());
|
||||
record.getModifiedData().put("estado", estado.getDescription());
|
||||
|
|
@ -1589,6 +1595,7 @@ public class ArmasController extends AbstractController<TarmArmas> {
|
|||
public void actualizar(TarmArmas arma) throws Exception {
|
||||
record = arma;
|
||||
super.update();
|
||||
super.save();
|
||||
}
|
||||
|
||||
/*Busca un arma por código
|
||||
|
|
@ -2325,6 +2332,70 @@ public class ArmasController extends AbstractController<TarmArmas> {
|
|||
|
||||
querydatabase();
|
||||
}
|
||||
|
||||
/**
|
||||
* Ejecucion para mostrar el arma que se va a definir como perdida robada
|
||||
*/
|
||||
public void loadAlertLose(){
|
||||
record.getModifiedData().put("estado", CatalogDetailController.findCatalogo("ESTADOARMA", "RPER").getDescription());
|
||||
record.setEstadocodigo("ESTADOARMA");
|
||||
record.setEstado("RPER");
|
||||
|
||||
record.getModifiedData().put("provincia",
|
||||
ProvinceController.getDescProvByCodigo(record.getCountrycode(), record.getProvincecode()));
|
||||
record.getModifiedData().put("canton", CantonController.getDescCantonByCodigo(record.getCountrycode(),
|
||||
record.getProvincecode(), record.getCantoncode()));
|
||||
record.getModifiedData().put("ciudad", CityController.getDescCiudadByCodigo(record.getCountrycode(),
|
||||
record.getProvincecode(), record.getCantoncode(), record.getCitycode()));
|
||||
record.getModifiedData().put("parroquia", ParroquiaController.getDescParroquiaByCodigo(record.getCountrycode(),
|
||||
record.getProvincecode(), record.getCantoncode(), record.getParroquiacode()));
|
||||
if (record.getModifiedData().get("paisorigencode") != null) {
|
||||
record.getModifiedData().put("paisorigen", CountryController
|
||||
.findcountry(record.getModifiedData().get("paisorigencode").toString()).getDescription());
|
||||
}
|
||||
if (record.getColor() != null) {
|
||||
record.getModifiedData().put("colorD", CatalogDetailController
|
||||
.findxCodigoCodcatalogo(record.getColor(), record.getColorcodigo()).getDescription());
|
||||
}
|
||||
/* Aumentado */
|
||||
TarmDocumentoHabilitante documento = DocumentoHabilitanteController
|
||||
.findxarma(record.getCodigoarma().toString());
|
||||
|
||||
if (documento != null) {
|
||||
TarmTramite tramite = TarmTramiteController.find(documento.getCtramite().toString());
|
||||
if (tramite != null) {
|
||||
TgeneCatalogDetail catalogo = CatalogDetailController.findxCodigoCodcatalogo(tramite.getCategoria(),
|
||||
tramite.getCategoriacodigo());
|
||||
descategoria = catalogo.getDescription();
|
||||
TgeneCatalogDetail uso = CatalogDetailController.findxCodigoCodcatalogo(tramite.getUsoactividad(),
|
||||
tramite.getUsoactividadcodigo());
|
||||
usoActividad = uso.getDescription();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* de consultaArmasController
|
||||
*/
|
||||
|
||||
|
||||
public void setUsoActividad(String usoActividad) {
|
||||
this.usoActividad = usoActividad;
|
||||
}
|
||||
|
||||
public String getUsoActividad() {
|
||||
return usoActividad;
|
||||
}
|
||||
|
||||
public void setDescategoria(String descategoria) {
|
||||
this.descategoria = descategoria;
|
||||
}
|
||||
|
||||
public String getDescategoria() {
|
||||
return descategoria;
|
||||
}
|
||||
|
||||
public UploadedFile getUploadedFile() {
|
||||
return uploadedFile;
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue