lxm1993 发布系统代码 [TrainSys，网页端]

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSWORKFLOWS/WorkFlowWf/PSWFVERSIONS/WorkFlowWfv1.json

@@ -50,6 +50,19 @@
     "asynchronousProcess" : false,
     "enableTimeout" : false,
     "startProcess" : true
+  }, {
+    "codeName" : "END_01",
+    "height" : 30,
+    "leftPos" : 740,
+    "logicName" : "结束事件",
+    "name" : "结束事件",
+    "timeout" : -1,
+    "topPos" : 410,
+    "wFProcessType" : "END",
+    "width" : 30,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false,
+    "terminalProcess" : true
   }, {
     "codeName" : "INTERACTIVE_01",
     "formCodeName" : "ApprovalForm",
@@ -72,7 +85,7 @@
       },
       "wFProcessRoleType" : "WFROLE"
     } ],
-    "predefinedActions" : [ "SENDBACK", "ADDSTEPBEFORE", "TAKEADVICE", "SENDCOPY", "REASSIGN" ],
+    "predefinedActions" : [ "REASSIGN" ],
     "timeout" : -1,
     "topPos" : 220,
     "util3FormCodeName" : "WorkFlowEditView_Form",
@@ -83,19 +96,6 @@
     "asynchronousProcess" : false,
     "enableTimeout" : false,
     "sendInform" : false
-  }, {
-    "codeName" : "END_01",
-    "height" : 30,
-    "leftPos" : 740,
-    "logicName" : "结束事件",
-    "name" : "结束事件",
-    "timeout" : -1,
-    "topPos" : 410,
-    "wFProcessType" : "END",
-    "width" : 30,
-    "asynchronousProcess" : false,
-    "enableTimeout" : false,
-    "terminalProcess" : true
   } ],
   "getStartPSWFProcess" : {
     "modelref" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSWORKFLOWS/WorkFlowWf/PSWFVERSIONS/WorkFlowWfv1.json.bpmn

@@ -46,18 +46,18 @@
             <flowable:form process-form="startForm" process-mobform="startForm"  wfversion="1"/>
           </extensionElements>
      </startEvent>
+     <endEvent id="sid-53de4cc0be78ed2c689be324acd60ae7" name="结束事件">
+     </endEvent>
     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${wfCoreService.getGroupUsers('WfTest',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-20-0ec5b557aa979a307af5aa9680485404" name="审核">
          <documentation>${majortext}</documentation>
          <extensionElements>
-         <flowable:form procfunc="sendback;addstepbefore;takeadvice;sendcopy;reassign" process-form="ApprovalForm" process-mobform="ApprovalForm" process-util3form="WorkFlowEditView_Form" process-util3formname="工作流编辑_表单"  />
+         <flowable:form procfunc="reassign" process-form="ApprovalForm" process-mobform="ApprovalForm" process-util3form="WorkFlowEditView_Form" process-util3formname="工作流编辑_表单"  />
          </extensionElements>
     </userTask>
-     <endEvent id="sid-53de4cc0be78ed2c689be324acd60ae7" name="结束事件">
-     </endEvent>
-      <sequenceFlow id="rid-58b71fc09ed16ffb01dfa7feca3c4c9f" sourceRef="sid-f2f162e01f7fe7d08374a565e1edb2af" targetRef="tid-20-0ec5b557aa979a307af5aa9680485404" name="">
+      <sequenceFlow id="rid-bd73b44c17ed7ee1e1c059cdb8383162" sourceRef="sid-f2f162e01f7fe7d08374a565e1edb2af" targetRef="tid-20-0ec5b557aa979a307af5aa9680485404" name="">
      </sequenceFlow>
-      <sequenceFlow id="lid-IAACTION-9a8e1b52210958aea051d0e1b25d9aa4" sourceRef="tid-20-0ec5b557aa979a307af5aa9680485404" targetRef="sid-53de4cc0be78ed2c689be324acd60ae7" name="审批">
-        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION-9a8e1b52210958aea051d0e1b25d9aa4"}]]></conditionExpression>
+      <sequenceFlow id="lid-IAACTION-0f79e0b5c1a4243467f2057f82c5438e" sourceRef="tid-20-0ec5b557aa979a307af5aa9680485404" targetRef="sid-53de4cc0be78ed2c689be324acd60ae7" name="审批">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION-0f79e0b5c1a4243467f2057f82c5438e"}]]></conditionExpression>
          <extensionElements>
              <flowable:form sequenceFlowForm="WorkFlowEditView_Form" sequenceFlowMobForm="WorkFlowEditView_Form" sequenceFlowView="WFDynaActionView" sequenceFlowMobView="MobWFDynaActionView" nextCondition="ANY"  />
          </extensionElements>
@@ -68,17 +68,17 @@
                  <bpmndi:BPMNShape id="BPMNShape-f2f162e01f7fe7d08374a565e1edb2af" bpmnElement="sid-f2f162e01f7fe7d08374a565e1edb2af">
                      <omgdi:Bounds x="740" y="70" width="30" height="30" />
                  </bpmndi:BPMNShape>
-                 <bpmndi:BPMNShape id="BPMNShape-0ec5b557aa979a307af5aa9680485404" bpmnElement="tid-20-0ec5b557aa979a307af5aa9680485404">
-                     <omgdi:Bounds x="710" y="220" width="100" height="80" />
-                 </bpmndi:BPMNShape>
                  <bpmndi:BPMNShape id="BPMNShape-53de4cc0be78ed2c689be324acd60ae7" bpmnElement="sid-53de4cc0be78ed2c689be324acd60ae7">
                      <omgdi:Bounds x="740" y="410" width="30" height="30" />
                  </bpmndi:BPMNShape>
-               <bpmndi:BPMNEdge id="BPMNEdge-rid-58b71fc09ed16ffb01dfa7feca3c4c9f" bpmnElement="rid-58b71fc09ed16ffb01dfa7feca3c4c9f">
+                 <bpmndi:BPMNShape id="BPMNShape-0ec5b557aa979a307af5aa9680485404" bpmnElement="tid-20-0ec5b557aa979a307af5aa9680485404">
+                     <omgdi:Bounds x="710" y="220" width="100" height="80" />
+                 </bpmndi:BPMNShape>
+               <bpmndi:BPMNEdge id="BPMNEdge-rid-bd73b44c17ed7ee1e1c059cdb8383162" bpmnElement="rid-bd73b44c17ed7ee1e1c059cdb8383162">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>
-               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION-9a8e1b52210958aea051d0e1b25d9aa4" bpmnElement="lid-IAACTION-9a8e1b52210958aea051d0e1b25d9aa4">
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION-0f79e0b5c1a4243467f2057f82c5438e" bpmnElement="lid-IAACTION-0f79e0b5c1a4243467f2057f82c5438e">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>