From 083df8d788c95c009a94378e620684eb5de2bd21 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 13 九月 2025 13:08:09 +0800
Subject: [PATCH] 注释问题修复
---
blade-service/blade-mdm/src/main/resources/processesbpmn/program-unlock.bpmn20.xml | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/resources/processesbpmn/program-unlock.bpmn20.xml b/blade-service/blade-mdm/src/main/resources/processesbpmn/program-unlock.bpmn20.xml
index 1e72f6a..c2182b9 100644
--- a/blade-service/blade-mdm/src/main/resources/processesbpmn/program-unlock.bpmn20.xml
+++ b/blade-service/blade-mdm/src/main/resources/processesbpmn/program-unlock.bpmn20.xml
@@ -1,39 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<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:flowable="http://flowable.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.flowable.org/processdef">
- <process id="program-unlock" name="program-unlock" isExecutable="true">
- <startEvent id="sid-69b14c2b-2d00-4e49-a5f8-67f6f60a8a03"/>
+ <process id="program-unlock" name="瑙ｉ攣娴佺▼" isExecutable="true">
+ <startEvent id="unlockStart"/>
<endEvent id="unlockApproveEnd">
- <extensionElements>
- <flowable:executionListener expression="${unlockFinishListener.handle(execution)}" event="end"/>
- </extensionElements>
+ <extensionElements>
+ <flowable:executionListener expression="${unlockFinishListener.handle(execution)}" event="end"/>
+ </extensionElements>
</endEvent>
- <endEvent id="sid-cac1097c-7a5c-4452-8b5d-551b01e03f67"/>
+ <endEvent id="unlockExceptionEnd" name="寮傚父缁撴潫"/>
<userTask id="unlockApproveTask" flowable:assignee="${assignee}" name="楂樺笀瀹℃牳"/>
- <sequenceFlow id="sid-030b6e4b-640a-41aa-a536-ddf9fb485ac1" sourceRef="sid-69b14c2b-2d00-4e49-a5f8-67f6f60a8a03" targetRef="unlockApproveTask"/>
+ <sequenceFlow id="sid-030b6e4b-640a-41aa-a536-ddf9fb485ac1" sourceRef="unlockStart" targetRef="unlockApproveTask"/>
<userTask id="unlockProgramConfirm" name="缂栧埗澶嶆牳" flowable:assignee="${assignee}"/>
<sequenceFlow id="sid-eef79355-70bc-4610-aece-b1aed2f9876a" sourceRef="unlockApproveTask" targetRef="unlockApproveEnd">
- <conditionExpression>{approve=='Y'}</conditionExpression>
+ <conditionExpression>${approve=='Y'}</conditionExpression>
</sequenceFlow>
<sequenceFlow id="sid-be770b3a-d711-45df-8477-fdd73b84d85b" sourceRef="unlockApproveTask" targetRef="unlockProgramConfirm">
- <conditionExpression>{approve=='N'}</conditionExpression>
+ <conditionExpression>${approve=='N'}</conditionExpression>
</sequenceFlow>
- <sequenceFlow id="sid-5a3d8229-b648-424a-a0f4-f356082d5375" sourceRef="unlockProgramConfirm" targetRef="sid-cac1097c-7a5c-4452-8b5d-551b01e03f67">
+ <sequenceFlow id="sid-5a3d8229-b648-424a-a0f4-f356082d5375" sourceRef="unlockProgramConfirm" targetRef="exceptionHandleScriptTask">
<conditionExpression>${approve=='N'}</conditionExpression>
</sequenceFlow>
<sequenceFlow id="sid-185054ce-c200-475e-8128-2369554b05cf" sourceRef="unlockProgramConfirm" targetRef="unlockApproveTask">
<conditionExpression>${approve=='Y'}</conditionExpression>
</sequenceFlow>
+ <scriptTask id="exceptionHandleScriptTask" scriptFormat="groovy">
+ <script><![CDATA[
+ execution.setVariable("exception", "1");//璁剧疆寮傚父鏍囧織
+ ]]></script>
+ </scriptTask>
+ <sequenceFlow id="sid-71a18c36-1a09-47da-bb1b-bc4e4a4b3bb3" sourceRef="exceptionHandleScriptTask" targetRef="unlockExceptionEnd"/>
</process>
<bpmndi:BPMNDiagram id="BPMNDiagram_program-unlock">
<bpmndi:BPMNPlane bpmnElement="program-unlock" id="BPMNPlane_program-unlock">
- <bpmndi:BPMNShape id="shape-0d3745b5-d492-4430-bfb3-975eac8a9852" bpmnElement="sid-69b14c2b-2d00-4e49-a5f8-67f6f60a8a03">
+ <bpmndi:BPMNShape id="shape-0d3745b5-d492-4430-bfb3-975eac8a9852" bpmnElement="unlockStart">
<omgdc:Bounds x="-180.0" y="-75.0" width="30.0" height="30.0"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="shape-9544d391-52f3-44d0-a3d0-1461593102f9" bpmnElement="unlockApproveEnd">
<omgdc:Bounds x="105.0" y="-90.0" width="30.0" height="30.0"/>
</bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="shape-37a910c4-327e-4273-a60e-22de9f892bd9" bpmnElement="sid-cac1097c-7a5c-4452-8b5d-551b01e03f67">
- <omgdc:Bounds x="55.0" y="10.0" width="30.0" height="30.0"/>
+ <bpmndi:BPMNShape id="shape-37a910c4-327e-4273-a60e-22de9f892bd9" bpmnElement="unlockExceptionEnd">
+ <omgdc:Bounds x="90.0" y="10.0" width="30.0" height="30.0"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="shape-0eb28127-9a0b-4308-996a-9f19a0943921" bpmnElement="unlockApproveTask">
<omgdc:Bounds x="-70.0" y="-100.0" width="70.0" height="50.0"/>
@@ -55,12 +61,19 @@
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="edge-2a037d18-24db-4d77-8cdb-40033885876d" bpmnElement="sid-5a3d8229-b648-424a-a0f4-f356082d5375">
<omgdi:waypoint x="-90.0" y="25.0"/>
- <omgdi:waypoint x="55.0" y="25.0"/>
+ <omgdi:waypoint x="-40.0" y="10.0"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="edge-bc8f223a-1a63-4206-b55d-f168040d127a" bpmnElement="sid-185054ce-c200-475e-8128-2369554b05cf">
<omgdi:waypoint x="-90.0" y="10.0"/>
<omgdi:waypoint x="-52.5" y="-50.0"/>
</bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="shape-9978ae88-3b6c-4c95-acde-3ed555915a16" bpmnElement="exceptionHandleScriptTask">
+ <omgdc:Bounds x="-40.0" y="-5.0" width="80.0" height="60.0"/>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="edge-c0e9d811-5bad-46bf-99d2-5aadb51ed03c" bpmnElement="sid-71a18c36-1a09-47da-bb1b-bc4e4a4b3bb3">
+ <omgdi:waypoint x="40.0" y="10.0"/>
+ <omgdi:waypoint x="97.5" y="40.0"/>
+ </bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</definitions>
--
Gitblit v1.9.3