Commit 7d86f13e authored by neo's avatar neo

[bugfix] fixed approval uel in conditon

parent d060cf3e
......@@ -8,26 +8,26 @@
<endEvent id="_7" name="EndEvent"/>
<endEvent id="_9" name="EndEvent"/>
<exclusiveGateway gatewayDirection="Unspecified" id="_12" name="ExclusiveGateway"/>
<sequenceFlow id="_13" sourceRef="_5" targetRef="_12"/>
<sequenceFlow id="_13" name="审核" sourceRef="_5" targetRef="_12"/>
<sequenceFlow id="_8" name="通过" sourceRef="_12" targetRef="_7">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${decide == 1}]]></conditionExpression>
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${decide==1}]]></conditionExpression>
</sequenceFlow>
<sequenceFlow id="_10" name="驳回" sourceRef="_12" targetRef="_9">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${decide == 0}]]></conditionExpression>
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${decide==0}]]></conditionExpression>
</sequenceFlow>
<exclusiveGateway gatewayDirection="Unspecified" id="_11" name="ExclusiveGateway"/>
<sequenceFlow id="_14" name="提审" sourceRef="_3" targetRef="_11"/>
<sequenceFlow id="_15" name="未提交" sourceRef="_11" targetRef="_5">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${commited == 0}]]></conditionExpression>
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${committed==0}]]></conditionExpression>
</sequenceFlow>
<sequenceFlow id="_16" name="已提交" sourceRef="_11" targetRef="_9">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${commited == 1}]]></conditionExpression>
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${committed==1}]]></conditionExpression>
</sequenceFlow>
</process>
<bpmndi:BPMNDiagram documentation="background=#FFFFFF;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0" id="Diagram-_1" name="New Diagram">
<bpmndi:BPMNPlane bpmnElement="approvalProcess">
<bpmndi:BPMNShape bpmnElement="_2" id="Shape-_2">
<dc:Bounds height="32.0" width="32.0" x="55.0" y="380.0"/>
<dc:Bounds height="32.0" width="32.0" x="50.0" y="380.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
......@@ -39,7 +39,7 @@
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_5" id="Shape-_5">
<dc:Bounds height="55.0" width="85.0" x="445.0" y="235.0"/>
<dc:Bounds height="55.0" width="85.0" x="410.0" y="165.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
......@@ -51,13 +51,13 @@
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_9" id="Shape-_9">
<dc:Bounds height="32.0" width="32.0" x="765.0" y="425.0"/>
<dc:Bounds height="32.0" width="32.0" x="760.0" y="380.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_12" id="Shape-_12" isMarkerVisible="false">
<dc:Bounds height="32.0" width="32.0" x="620.0" y="245.0"/>
<dc:Bounds height="32.0" width="32.0" x="640.0" y="175.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
......@@ -69,15 +69,15 @@
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="_13" id="BPMNEdge__13" sourceElement="_5" targetElement="_12">
<di:waypoint x="545.0" y="262.5"/>
<di:waypoint x="620.0" y="261.0"/>
<di:waypoint x="510.0" y="192.5"/>
<di:waypoint x="640.0" y="191.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_15" id="BPMNEdge__15" sourceElement="_11" targetElement="_5">
<di:waypoint x="437.0" y="396.0"/>
<di:waypoint x="445.0" y="262.5"/>
<di:waypoint x="416.0" y="375.0"/>
<di:waypoint x="416.0" y="220.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
......@@ -91,28 +91,28 @@
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_16" id="BPMNEdge__16" sourceElement="_11" targetElement="_9">
<di:waypoint x="437.0" y="396.0"/>
<di:waypoint x="765.0" y="441.0"/>
<di:waypoint x="760.0" y="396.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_4" id="BPMNEdge__4" sourceElement="_2" targetElement="_3">
<di:waypoint x="102.0" y="396.0"/>
<di:waypoint x="97.0" y="396.0"/>
<di:waypoint x="190.0" y="397.5"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_8" id="BPMNEdge__8" sourceElement="_12" targetElement="_7">
<di:waypoint x="667.0" y="261.0"/>
<di:waypoint x="687.0" y="191.0"/>
<di:waypoint x="765.0" y="121.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_10" id="BPMNEdge__10" sourceElement="_12" targetElement="_9">
<di:waypoint x="667.0" y="261.0"/>
<di:waypoint x="765.0" y="441.0"/>
<di:waypoint x="687.0" y="191.0"/>
<di:waypoint x="760.0" y="396.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment