Skip to content

D
datacollector
Commit 35d8a5f9 by chenweisong
Options

更新

parent 8a66fd97
Showing with 310 additions and 4 deletions
src/main/resources/MoreSubProcess.bpmn 0 → 100644
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:tns="http://www.activiti.org/testm1585201515028" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" expressionLanguage="http://www.w3.org/1999/XPath" id="m1585201515028" name="" targetNamespace="http://www.activiti.org/testm1585201515028" typeLanguage="http://www.w3.org/2001/XMLSchema">
<process id="MoreSubProcess" isClosed="false" isExecutable="true" processType="None">
<startEvent id="_2" name="StartEvent"/>
<userTask activiti:assignee="${inputUser}" activiti:exclusive="true" id="StartMission" name="启动补录任务"/>
<sequenceFlow id="_4" sourceRef="_2" targetRef="StartMission"/>
<subProcess activiti:exclusive="true" id="_5" triggeredByEvent="false">
<multiInstanceLoopCharacteristics activiti:collection="candidateUsers" activiti:elementVariable="candiateUser" isSequential="false"/>
<startEvent id="_7" name="StartEvent"/>
<userTask activiti:assignee="${candiateUser}" activiti:candidateUsers="${candiateUser}" activiti:exclusive="true" id="DataEnter" name="填写补录数据"/>
<exclusiveGateway gatewayDirection="Unspecified" id="_9"/>
<endEvent id="_10" name="EndEvent"/>
<sequenceFlow id="_11" sourceRef="DataEnter" targetRef="_9"/>
<sequenceFlow id="_12" sourceRef="_9" targetRef="_10">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${needDataAudit == 'false'}]]>
</conditionExpression>
</sequenceFlow>
<userTask activiti:assignee="${auditUser}" activiti:exclusive="true" id="DataAudit" name="审核数据"/>
<sequenceFlow id="_14" sourceRef="_9" targetRef="DataAudit">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${needDataAudit == 'true'}]]>
</conditionExpression>
</sequenceFlow>
<exclusiveGateway gatewayDirection="Unspecified" id="_15"/>
<sequenceFlow id="_16" sourceRef="DataAudit" targetRef="_15"/>
<sequenceFlow id="_17" sourceRef="_15" targetRef="DataEnter">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${dataAudit == 'false'}]]>
</conditionExpression>
</sequenceFlow>
<sequenceFlow id="_18" sourceRef="_15" targetRef="_10">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${needDataAudit == 'true'}]]>
</conditionExpression>
</sequenceFlow>
<sequenceFlow id="_35" sourceRef="_7" targetRef="DataEnter"/>
</subProcess>
<sequenceFlow id="_6" sourceRef="StartMission" targetRef="_5"/>
<exclusiveGateway gatewayDirection="Unspecified" id="_19"/>
<sequenceFlow id="_20" sourceRef="_5" targetRef="_19"/>
<userTask activiti:assignee="${inputUser}" activiti:exclusive="true" id="UserAudit" name="负责人审核"/>
<exclusiveGateway gatewayDirection="Unspecified" id="_22"/>
<sequenceFlow id="_23" sourceRef="UserAudit" targetRef="_22"/>
<endEvent id="_24" name="EndEvent"/>
<exclusiveGateway gatewayDirection="Unspecified" id="_25"/>
<sequenceFlow id="_26" sourceRef="_19" targetRef="UserAudit">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${needConfirm == 'true'}]]>
</conditionExpression>
</sequenceFlow>
<sequenceFlow id="_27" sourceRef="_19" targetRef="_25">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${needConfirm == 'false'}]]>
</conditionExpression>
</sequenceFlow>
<userTask activiti:exclusive="true" id="DataBackFlow" name="数据回流"/>
<sequenceFlow id="_29" sourceRef="_25" targetRef="DataBackFlow">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${needDataBackflow == 'true'}]]>
</conditionExpression>
</sequenceFlow>
<sequenceFlow id="_31" sourceRef="_22" targetRef="_24">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${signConfirm == 'false'}]]>
</conditionExpression>
</sequenceFlow>
<sequenceFlow id="_32" sourceRef="DataBackFlow" targetRef="_24"/>
<sequenceFlow id="_33" sourceRef="_22" targetRef="_25">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${signConfirm == 'true'}]]>
</conditionExpression>
</sequenceFlow>
<sequenceFlow id="_34" sourceRef="_25" targetRef="_24">
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${needDataBackflow == 'false'}]]>
</conditionExpression>
</sequenceFlow>
</process>
<bpmndi:BPMNDiagram documentation="background=#3C3F41;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="MoreSubProcess">
<bpmndi:BPMNShape bpmnElement="_2" id="Shape-_2">
<dc:Bounds height="32.0" width="32.0" x="10.0" y="55.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="StartMission" id="Shape-StartMission">
<dc:Bounds height="55.0" width="85.0" x="95.0" y="45.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_5" id="Shape-_5" isExpanded="true">
<dc:Bounds height="250.0" width="400.0" x="275.0" y="35.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="250.0" width="400.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_19" id="Shape-_19" isMarkerVisible="false">
<dc:Bounds height="32.0" width="32.0" x="745.0" y="60.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="UserAudit" id="Shape-UserAudit">
<dc:Bounds height="55.0" width="85.0" x="720.0" y="200.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_22" id="Shape-_22" isMarkerVisible="false">
<dc:Bounds height="32.0" width="32.0" x="740.0" y="335.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_24" id="Shape-_24">
<dc:Bounds height="32.0" width="32.0" x="875.0" y="415.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_25" id="Shape-_25" isMarkerVisible="false">
<dc:Bounds height="32.0" width="32.0" x="870.0" y="200.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="DataBackFlow" id="Shape-DataBackFlow">
<dc:Bounds height="55.0" width="85.0" x="1040.0" y="115.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_7" id="Shape-_7">
<dc:Bounds height="32.0" width="32.0" x="300.0" y="70.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="DataEnter" id="Shape-DataEnter">
<dc:Bounds height="55.0" width="85.0" x="375.0" y="65.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_9" id="Shape-_9" isMarkerVisible="false">
<dc:Bounds height="32.0" width="32.0" x="510.0" y="70.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_10" id="Shape-_10">
<dc:Bounds height="32.0" width="32.0" x="605.0" y="195.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="DataAudit" id="Shape-DataAudit">
<dc:Bounds height="55.0" width="85.0" x="445.0" y="150.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_15" id="Shape-_15" isMarkerVisible="false">
<dc:Bounds height="32.0" width="32.0" x="365.0" y="155.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="_35" id="BPMNEdge__35" sourceElement="_7" targetElement="DataEnter">
<di:waypoint x="332.0" y="86.0"/>
<di:waypoint x="375.0" y="92.5"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_12" id="BPMNEdge__12" sourceElement="_9" targetElement="_10">
<di:waypoint x="542.0" y="86.0"/>
<di:waypoint x="618.0" y="114.0"/>
<di:waypoint x="618.0" y="195.28376635449828"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="-38.0" width="-34.0" x="0.0" y="21.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_34" id="BPMNEdge__34" sourceElement="_25" targetElement="_24">
<di:waypoint x="902.0" y="216.0"/>
<di:waypoint x="973.0" y="299.0"/>
<di:waypoint x="907.0" y="431.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_14" id="BPMNEdge__14" sourceElement="_9" targetElement="DataAudit">
<di:waypoint x="520.0" y="96.0"/>
<di:waypoint x="520.0" y="150.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="2.0" width="0.0" x="0.0" y="20.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_17" id="BPMNEdge__17" sourceElement="_15" targetElement="DataEnter">
<di:waypoint x="386.0" y="160.0"/>
<di:waypoint x="386.0" y="120.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="5.0" width="0.0" x="0.0" y="6.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_16" id="BPMNEdge__16" sourceElement="DataAudit" targetElement="_15">
<di:waypoint x="445.0" y="177.5"/>
<di:waypoint x="397.0" y="171.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_18" id="BPMNEdge__18" sourceElement="_15" targetElement="_10">
<di:waypoint x="381.0" y="187.0"/>
<di:waypoint x="449.0" y="243.0"/>
<di:waypoint x="621.0" y="227.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="-6.0" x="0.0" y="-22.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_20" id="BPMNEdge__20" sourceElement="_5" targetElement="_19">
<di:waypoint x="675.0" y="160.0"/>
<di:waypoint x="745.0" y="76.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_23" id="BPMNEdge__23" sourceElement="UserAudit" targetElement="_22">
<di:waypoint x="756.0" y="255.0"/>
<di:waypoint x="756.0" y="335.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_26" id="BPMNEdge__26" sourceElement="_19" targetElement="UserAudit">
<di:waypoint x="761.0" y="92.0"/>
<di:waypoint x="761.0" y="200.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="-20.0" width="0.0" x="1.0" y="-6.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_27" id="BPMNEdge__27" sourceElement="_19" targetElement="_25">
<di:waypoint x="777.0" y="76.0"/>
<di:waypoint x="870.0" y="216.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="68.0" x="-1.0" y="-34.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_29" id="BPMNEdge__29" sourceElement="_25" targetElement="DataBackFlow">
<di:waypoint x="902.0" y="216.0"/>
<di:waypoint x="1040.0" y="142.5"/>
<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="StartMission">
<di:waypoint x="42.0" y="71.0"/>
<di:waypoint x="95.0" y="72.5"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_6" id="BPMNEdge__6" sourceElement="StartMission" targetElement="_5">
<di:waypoint x="180.0" y="72.5"/>
<di:waypoint x="275.0" y="160.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_31" id="BPMNEdge__31" sourceElement="_22" targetElement="_24">
<di:waypoint x="755.0" y="366.0"/>
<di:waypoint x="755.0" y="410.0"/>
<di:waypoint x="875.0" y="431.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_11" id="BPMNEdge__11" sourceElement="DataEnter" targetElement="_9">
<di:waypoint x="460.0" y="92.5"/>
<di:waypoint x="510.0" y="86.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_33" id="BPMNEdge__33" sourceElement="_22" targetElement="_25">
<di:waypoint x="772.0" y="351.0"/>
<di:waypoint x="885.0" y="260.0"/>
<di:waypoint x="885.0" y="231.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_32" id="BPMNEdge__32" sourceElement="DataBackFlow" targetElement="_24">
<di:waypoint x="1090.0" y="170.0"/>
<di:waypoint x="1090.0" y="310.0"/>
<di:waypoint x="907.0" y="431.0"/>
<bpmndi:BPMNLabel>
<dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</definitions>
src/main/resources/MoreSubProcessTest.bpmn
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<sequenceFlow id="flow13" name="Y" skipExpression="${sign=='true'}" sourceRef="exclusivegateway2" targetRef="dataBackFlow"/> <sequenceFlow id="flow13" name="Y" skipExpression="${sign=='true'}" sourceRef="exclusivegateway2" targetRef="dataBackFlow"/>
<sequenceFlow id="flow14" sourceRef="dataBackFlow" targetRef="endevent2"/> <sequenceFlow id="flow14" sourceRef="dataBackFlow" targetRef="endevent2"/>
<subProcess activiti:exclusive="true" id="entrySubprocess" name="录入子流程" triggeredByEvent="false"> <subProcess activiti:exclusive="true" id="entrySubprocess" name="录入子流程" triggeredByEvent="false">
<multiInstanceLoopCharacteristics activiti:collection="candiateUserList" activiti:elementVariable="candiateUser" isSequential="false"> <multiInstanceLoopCharacteristics activiti:collection="candiateUsers" activiti:elementVariable="candiateUser" isSequential="false">
<completionCondition> <completionCondition>
<!-- 这里表示当完成数和总数相等的时候到下一步 --> <!-- 这里表示当完成数和总数相等的时候到下一步 -->
<![CDATA[${nrOfCompletedInstances/nrOfInstances >= 1}]]> <![CDATA[${nrOfCompletedInstances/nrOfInstances >= 1}]]>
......
src/main/resources/application-test.yml
...@@ -17,8 +17,8 @@ spring: ...@@ -17,8 +17,8 @@ spring:
jpa: jpa:
show-sql: false show-sql: false
database-platform: org.hibernate.dialect.MySQL5Dialect database-platform: org.hibernate.dialect.MySQL5Dialect
hibernate: # hibernate:
ddl-auto: update # ddl-auto: update
datasource: datasource:
url: jdbc:mysql://47.105.193.165:3306/dev0?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8 url: jdbc:mysql://47.105.193.165:3306/dev0?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
username: root username: root
...@@ -43,7 +43,7 @@ server: ...@@ -43,7 +43,7 @@ server:
port: 8110 port: 8110
app: app:
active-process: MoreSubProcessTestV2.bpmn active-process: MoreSubProcess.bpmn
swagger2: swagger2:
host: localhost:8110 host: localhost:8110
......
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