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-cure.bpmn20.xml |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/blade-service/blade-mdm/src/main/resources/processesbpmn/program-cure.bpmn20.xml b/blade-service/blade-mdm/src/main/resources/processesbpmn/program-cure.bpmn20.xml
index 32b8c4f..d485808 100644
--- a/blade-service/blade-mdm/src/main/resources/processesbpmn/program-cure.bpmn20.xml
+++ b/blade-service/blade-mdm/src/main/resources/processesbpmn/program-cure.bpmn20.xml
@@ -20,22 +20,24 @@
       <conditionExpression>${approve=='Y'}</conditionExpression>
     </sequenceFlow>
     <endEvent id="cureProgramingNoEnd" name="鍥哄寲缂栧埗缁撴潫"/>
-    <sequenceFlow id="sid-a3a0654d-e9fd-4814-a1bd-384dce8a3b7a" sourceRef="cureProgramTask" targetRef="exceptionHandleTask">
+    <sequenceFlow id="sid-a3a0654d-e9fd-4814-a1bd-384dce8a3b7a" sourceRef="cureProgramTask" targetRef="programMgrConfirm">
       <conditionExpression>${approve=='N'}</conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-c04cc547-0baf-4514-8056-54b1612cdefd" sourceRef="seniorApproveTask" targetRef="cureCheckTask">
+    <sequenceFlow id="sid-c04cc547-0baf-4514-8056-54b1612cdefd" sourceRef="seniorApproveTask" targetRef="cureProgramTask">
       <conditionExpression>${approve=='N'}</conditionExpression>
     </sequenceFlow>
     <serviceTask id="cureOKOperateTask" flowable:exclusive="true" name="鍥哄寲澶勭悊浠诲姟" flowable:expression="${cureFinishOperateTask.execute(execution)}">
       <documentation>璁剧疆鏁版嵁鐨勫浐鍖栨爣蹇楋紝鐢熸垚鍥哄寲绋嬪簭鍒楄〃</documentation>
     </serviceTask>
     <sequenceFlow id="sid-253f5be1-3275-47d6-a3a1-5d1eaf01ec79" sourceRef="cureOKOperateTask" targetRef="end"/>
-    <scriptTask id="exceptionHandleTask" scriptFormat="groovy">
+    <scriptTask id="exceptionHandleTask" scriptFormat="groovy" name="寮傚父鏍囪璁剧疆">
       <script><![CDATA[
       execution.setVariable("exception", "1");
       ]]></script>
     </scriptTask>
     <sequenceFlow id="sid-f8533f07-b17b-4a37-89b2-bfa7e014cd08" sourceRef="exceptionHandleTask" targetRef="cureProgramingNoEnd"/>
+    <userTask id="programMgrConfirm" name="绋嬪簭绠$悊鍛樼‘璁�" flowable:assignee="${assignee}"/>
+    <sequenceFlow id="sid-8e4bff35-c436-419b-8df8-cd1161ade204" sourceRef="programMgrConfirm" targetRef="exceptionHandleTask"/>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_program-cure">
     <bpmndi:BPMNPlane bpmnElement="program-cure" id="BPMNPlane_program-cure">
@@ -79,15 +81,15 @@
         <omgdi:waypoint x="25.0" y="-68.75"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="shape-b240ebd6-4961-477a-9621-67f9b92bde64" bpmnElement="cureProgramingNoEnd">
-        <omgdc:Bounds x="-215.0" y="35.0" width="30.0" height="30.0"/>
+        <omgdc:Bounds x="-240.0" y="40.0" width="30.0" height="30.0"/>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="edge-d760db6d-fd9f-435e-8d42-3613cb75be57" bpmnElement="sid-a3a0654d-e9fd-4814-a1bd-384dce8a3b7a">
         <omgdi:waypoint x="-130.0" y="-56.25"/>
-        <omgdi:waypoint x="-140.0" y="-25.0"/>
+        <omgdi:waypoint x="-92.5" y="-10.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="edge-5c7dd10c-358c-4088-8af7-4d2ada7247db" bpmnElement="sid-c04cc547-0baf-4514-8056-54b1612cdefd">
-        <omgdi:waypoint x="41.25" y="-60.0"/>
-        <omgdi:waypoint x="30.0" y="-16.25"/>
+        <omgdi:waypoint x="25.0" y="-86.25"/>
+        <omgdi:waypoint x="-55.0" y="-83.75"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="shape-3fd20ebd-d032-45ac-b790-0e96cfa030ff" bpmnElement="cureOKOperateTask">
         <omgdc:Bounds x="110.0" y="-42.5" width="65.0" height="50.0"/>
@@ -97,11 +99,18 @@
         <omgdi:waypoint x="197.5" y="-52.5"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="shape-914147ff-52e6-4152-834c-0bc3c552c53a" bpmnElement="exceptionHandleTask">
-        <omgdc:Bounds x="-177.5" y="-25.0" width="50.0" height="45.0"/>
+        <omgdc:Bounds x="-192.5" y="-12.5" width="50.0" height="45.0"/>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="edge-19b7d7ad-693c-4677-af1d-e0b630e6d7ef" bpmnElement="sid-f8533f07-b17b-4a37-89b2-bfa7e014cd08">
-        <omgdi:waypoint x="-177.5" y="8.75"/>
-        <omgdi:waypoint x="-192.5" y="35.0"/>
+        <omgdi:waypoint x="-192.5" y="21.25"/>
+        <omgdi:waypoint x="-217.5" y="40.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="shape-e9859997-6e09-483f-ae53-f7dfe0a99533" bpmnElement="programMgrConfirm">
+        <omgdc:Bounds x="-120.0" y="-10.0" width="55.0" height="40.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="edge-b95990aa-31c7-44ce-8c31-d505a2805c8f" bpmnElement="sid-8e4bff35-c436-419b-8df8-cd1161ade204">
+        <omgdi:waypoint x="-120.0" y="10.0"/>
+        <omgdi:waypoint x="-142.5" y="21.25"/>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

--
Gitblit v1.9.3