فهرست منبع

git-svn-id: https://192.168.57.71/svn/jsgkj@462 931142cf-59ea-a443-aa0e-51397b428577

ld_xuhx 9 سال پیش
والد
کامیت
250a9e1c20

+ 16 - 4
gkjsjy/trunk/resources/deployments/lhbg.bpmn

@@ -2,7 +2,7 @@
 <definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
   <process id="lhbg" name="理货变更" isExecutable="true">
     <startEvent id="startevent1" name="Start" activiti:initiator="applyUserId"></startEvent>
-    <userTask id="sljbr" name="受理经办人" activiti:assignee="${applyUserId}">
+    <userTask id="sljbr" name="经办人受理" activiti:assignee="${applyUserId}">
       <extensionElements>
         <activiti:taskListener event="create" delegateExpression="${taskVarBean}">
           <activiti:field name="varName">
@@ -15,9 +15,21 @@
       </extensionElements>
     </userTask>
     <sequenceFlow id="flow1" sourceRef="startevent1" targetRef="sljbr"></sequenceFlow>
-    <userTask id="kssc" name="科室审查" activiti:candidateGroups="${role_ks}"></userTask>
-    <userTask id="fgldsp" name="分管领导审批" activiti:candidateGroups="${role_fgld}"></userTask>
-    <userTask id="ldpz" name="领导批准" activiti:candidateGroups="${role_ld}"></userTask>
+    <userTask id="kssc" name="科室审查" activiti:assignee="${assignee}">
+      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="assigneeList" activiti:elementVariable="assignee">
+        <completionCondition>${nrOfInstances!=nrOfCompletedInstances}</completionCondition>
+      </multiInstanceLoopCharacteristics>
+    </userTask>
+    <userTask id="fgldsp" name="分管领导审批" activiti:assignee="${assignee}">
+      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="assigneeList" activiti:elementVariable="assignee">
+        <completionCondition>${nrOfInstances!=nrOfCompletedInstances}</completionCondition>
+      </multiInstanceLoopCharacteristics>
+    </userTask>
+    <userTask id="ldpz" name="领导批准" activiti:assignee="${assignee}">
+      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="assigneeList" activiti:elementVariable="assignee">
+        <completionCondition>${nrOfInstances!=nrOfCompletedInstances}</completionCondition>
+      </multiInstanceLoopCharacteristics>
+    </userTask>
     <endEvent id="endevent1" name="End"></endEvent>
     <exclusiveGateway id="exclusivegateway16" name="Exclusive Gateway"></exclusiveGateway>
     <sequenceFlow id="flow57" sourceRef="sljbr" targetRef="exclusivegateway16"></sequenceFlow>

+ 16 - 4
gkjsjy/trunk/resources/deployments/lhsq.bpmn

@@ -2,7 +2,7 @@
 <definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
   <process id="lhsq" name="理货申请" isExecutable="true">
     <startEvent id="startevent1" name="Start" activiti:initiator="applyUserId"></startEvent>
-    <userTask id="sljbr" name="受理经办人" activiti:assignee="${applyUserId}">
+    <userTask id="sljbr" name="经办人受理" activiti:assignee="${applyUserId}">
       <extensionElements>
         <activiti:taskListener event="create" delegateExpression="${taskVarBean}">
           <activiti:field name="varName">
@@ -15,9 +15,21 @@
       </extensionElements>
     </userTask>
     <sequenceFlow id="flow1" sourceRef="startevent1" targetRef="sljbr"></sequenceFlow>
-    <userTask id="kssc" name="科室审查" activiti:candidateGroups="${role_ks}"></userTask>
-    <userTask id="fgldsp" name="分管领导审批" activiti:candidateGroups="${role_fgld}"></userTask>
-    <userTask id="ldpz" name="领导批准" activiti:candidateGroups="${role_ld}"></userTask>
+    <userTask id="kssc" name="科室审查" activiti:assignee="${assignee}">
+      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="assigneeList" activiti:elementVariable="assignee">
+        <completionCondition>${nrOfInstances!=nrOfCompletedInstances}</completionCondition>
+      </multiInstanceLoopCharacteristics>
+    </userTask>
+    <userTask id="fgldsp" name="分管领导审批" activiti:assignee="${assignee}">
+      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="assigneeList" activiti:elementVariable="assignee">
+        <completionCondition>${nrOfInstances!=nrOfCompletedInstances}</completionCondition>
+      </multiInstanceLoopCharacteristics>
+    </userTask>
+    <userTask id="ldpz" name="领导批准" activiti:assignee="${assignee}">
+      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="assigneeList" activiti:elementVariable="assignee">
+        <completionCondition>${nrOfInstances!=nrOfCompletedInstances}</completionCondition>
+      </multiInstanceLoopCharacteristics>
+    </userTask>
     <endEvent id="endevent1" name="End"></endEvent>
     <exclusiveGateway id="exclusivegateway16" name="Exclusive Gateway"></exclusiveGateway>
     <sequenceFlow id="flow57" sourceRef="sljbr" targetRef="exclusivegateway16"></sequenceFlow>

+ 18 - 6
gkjsjy/trunk/resources/deployments/lhyx.bpmn

@@ -2,7 +2,7 @@
 <definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
   <process id="lhyx" name="理货延续" isExecutable="true">
     <startEvent id="startevent1" name="Start" activiti:initiator="applyUserId"></startEvent>
-    <userTask id="sljbr" name="受理经办人" activiti:assignee="${applyUserId}">
+    <userTask id="sljbr" name="经办人受理" activiti:assignee="${applyUserId}">
       <extensionElements>
         <activiti:taskListener event="create" delegateExpression="${taskVarBean}">
           <activiti:field name="varName">
@@ -15,9 +15,21 @@
       </extensionElements>
     </userTask>
     <sequenceFlow id="flow1" sourceRef="startevent1" targetRef="sljbr"></sequenceFlow>
-    <userTask id="kssc" name="科室审查" activiti:candidateGroups="${role_ks}"></userTask>
-    <userTask id="fgldsp" name="分管领导审批" activiti:candidateGroups="${role_fgld}"></userTask>
-    <userTask id="ldpz" name="领导批准" activiti:candidateGroups="${role_ld}"></userTask>
+    <userTask id="kssc" name="科室审查" activiti:assignee="${assignee}">
+      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="assigneeList" activiti:elementVariable="assignee">
+        <completionCondition>${nrOfInstances!=nrOfCompletedInstances}</completionCondition>
+      </multiInstanceLoopCharacteristics>
+    </userTask>
+    <userTask id="fgldsp" name="分管领导审批" activiti:assignee="${assignee}">
+      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="assigneeList" activiti:elementVariable="assignee">
+        <completionCondition>${nrOfInstances!=nrOfCompletedInstances}</completionCondition>
+      </multiInstanceLoopCharacteristics>
+    </userTask>
+    <userTask id="ldpz" name="领导批准" activiti:assignee="${assignee}">
+      <multiInstanceLoopCharacteristics isSequential="false" activiti:collection="assigneeList" activiti:elementVariable="assignee">
+        <completionCondition>${nrOfInstances!=nrOfCompletedInstances}</completionCondition>
+      </multiInstanceLoopCharacteristics>
+    </userTask>
     <endEvent id="endevent1" name="End"></endEvent>
     <exclusiveGateway id="exclusivegateway16" name="Exclusive Gateway"></exclusiveGateway>
     <sequenceFlow id="flow57" sourceRef="sljbr" targetRef="exclusivegateway16"></sequenceFlow>
@@ -116,7 +128,7 @@
         <omgdi:waypoint x="708.0" y="180.0"></omgdi:waypoint>
         <omgdi:waypoint x="708.0" y="264.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="432.0" y="180.0"></omgdc:Bounds>
+          <omgdc:Bounds height="14.0" width="24.0" x="432.0" y="180.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow62" id="BPMNEdge_flow62">
@@ -124,7 +136,7 @@
         <omgdi:waypoint x="142.0" y="180.0"></omgdi:waypoint>
         <omgdi:waypoint x="142.0" y="260.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="281.0" y="180.0"></omgdc:Bounds>
+          <omgdc:Bounds height="14.0" width="36.0" x="281.0" y="180.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow63" id="BPMNEdge_flow63">