bpmn图形

SLN/%PUBPRJ%-core/src/main/resources/workflow/%ITEM%.bpmn.ftl

@@ -85,7 +85,7 @@ TARGET=PSWFVERSION
                     <#elseif WFProcess.getWFProcessType()=='EXCLUSIVEGATEWAY'>
      <exclusiveGateway id="sid-${WFProcess.getDeployId()}"></exclusiveGateway>
                     <#elseif WFProcess.getWFProcessType()=='PROCESS'>
-     <serviceTask id="sid-${WFProcess.getDeployId()}" name="${WFProcess.getName()}" flowable:expression="${r'${wfCoreService.execute(exec, activedata)}'}" >
+     <serviceTask id="sid-${WFProcess.getDeployId()}" name="${WFProcess.getName()}" flowable:expression="${r'${wfCoreService.execute(execution, activedata)}'}" >
          <extensionElements>
          <flowable:field name="service-entity"><flowable:string>${srfpluralize(WFProcess.getPSDataEntity().getCodeName()?lower_case)}</flowable:string></flowable:field>
          <flowable:field name="service-deaction"><flowable:string>${WFProcess.getPSDEAction().getCodeName()?lower_case}</flowable:string></flowable:field>
@@ -207,36 +207,36 @@ TARGET=PSWFVERSION
               </#list>
           </#if>
     </process>
-    <#--<#comment>下面定义图形位置</#comment>-->
-    <#--<bpmndi:BPMNDiagram id="BPMNDiagram_${sys.getCodeName()?lower_case}-${item.codeName?lower_case}">-->
-        <#--<bpmndi:BPMNPlane id="BPMNPlane_${sys.getCodeName()?lower_case}-${item.codeName?lower_case}" bpmnElement="${sys.getCodeName()?lower_case}-${item.codeName?lower_case}">-->
-           <#--<#comment>绘制处理节点</#comment>-->
-            <#--<#if item.getPSWFProcesses?? && item.getPSWFProcesses()??>-->
-                <#--<#list item.getPSWFProcesses() as WFProcess>-->
-                 <#--<#assign sourceProcessId="sid-"+WFProcess.getDeployId()>-->
-                  <#--<#if WFProcess.getWFProcessType()=='INTERACTIVE'>-->
-                    <#--<#assign sourceProcessId="tid-"+WFProcess.getWFStepValue()+"-"+WFProcess.getDeployId()>-->
-                  <#--</#if>-->
-                 <#--<bpmndi:BPMNShape id="BPMNShape-${WFProcess.getDeployId()}" bpmnElement="${sourceProcessId}">-->
-                     <#--<di:Bounds x="${WFProcess.getLeftPos()?c}" y="${WFProcess.getTopPos()?c}" width="${WFProcess.getWidth()?c}" height="${WFProcess.getHeight()?c}" />-->
-                 <#--</bpmndi:BPMNShape>-->
-                <#--</#list>-->
-            <#--</#if>-->
-          <#--<#comment>绘制节点连线</#comment>-->
-          <#--<#if item.getPSWFLinks?? && item.getPSWFLinks()??>-->
-              <#--<#list item.getPSWFLinks() as WFLink>-->
-                  <#--<#assign flowId="rid-"+WFLink.getDeployId()>-->
-                  <#--<#if WFLink.getWFLinkType()!='ROUTE'>-->
-                    <#--<#assign flowId="lid-"+WFLink.getName()+"-"+WFLink.getDeployId()>-->
-                  <#--</#if>-->
-               <#--<bpmndi:BPMNEdge id="BPMNEdge-${flowId}" bpmnElement="${flowId}">-->
-                   <#--<di:waypoint x="0" y="0" />-->
-                   <#--<di:waypoint x="0" y="0" />-->
-               <#--</bpmndi:BPMNEdge>-->
-              <#--</#list>-->
-          <#--</#if>-->
-        <#--</bpmndi:BPMNPlane>-->
-    <#--</bpmndi:BPMNDiagram>-->
+    <#comment>下面定义图形位置</#comment>
+    <bpmndi:BPMNDiagram id="BPMNDiagram_${sys.getCodeName()?lower_case}-${item.codeName?lower_case}">
+        <bpmndi:BPMNPlane id="BPMNPlane_${sys.getCodeName()?lower_case}-${item.codeName?lower_case}" bpmnElement="${sys.getCodeName()?lower_case}-${item.codeName?lower_case}">
+           <#comment>绘制处理节点</#comment>
+            <#if item.getPSWFProcesses?? && item.getPSWFProcesses()??>
+                <#list item.getPSWFProcesses() as WFProcess>
+                 <#assign sourceProcessId="sid-"+WFProcess.getDeployId()>
+                  <#if WFProcess.getWFProcessType()=='INTERACTIVE'>
+                    <#assign sourceProcessId="tid-"+WFProcess.getWFStepValue()+"-"+WFProcess.getDeployId()>
+                  </#if>
+                 <bpmndi:BPMNShape id="BPMNShape-${WFProcess.getDeployId()}" bpmnElement="${sourceProcessId}">
+                     <di:Bounds x="${WFProcess.getLeftPos()?c}" y="${WFProcess.getTopPos()?c}" width="${WFProcess.getWidth()?c}" height="${WFProcess.getHeight()?c}" />
+                 </bpmndi:BPMNShape>
+                </#list>
+            </#if>
+          <#comment>绘制节点连线</#comment>
+          <#if item.getPSWFLinks?? && item.getPSWFLinks()??>
+              <#list item.getPSWFLinks() as WFLink>
+                  <#assign flowId="rid-"+WFLink.getDeployId()>
+                  <#if WFLink.getWFLinkType()!='ROUTE'>
+                    <#assign flowId="lid-"+WFLink.getName()+"-"+WFLink.getDeployId()>
+                  </#if>
+               <bpmndi:BPMNEdge id="BPMNEdge-${flowId}" bpmnElement="${flowId}">
+                   <di:waypoint x="0" y="0" />
+                   <di:waypoint x="0" y="0" />
+               </bpmndi:BPMNEdge>
+              </#list>
+          </#if>
+        </bpmndi:BPMNPlane>
+    </bpmndi:BPMNDiagram>
 </definitions>