From edd4eb1d5eed4085bbe80cb65116fe585a13c42f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 23 六月 2025 22:49:34 +0800
Subject: [PATCH] dnc导入完善
---
blade-service/blade-mdm/src/main/resources/processesbpmn/dispatch.bpmn20.xml | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/resources/processesbpmn/dispatch.bpmn20.xml b/blade-service/blade-mdm/src/main/resources/processesbpmn/dispatch.bpmn20.xml
index 69752fa..b2db141 100644
--- a/blade-service/blade-mdm/src/main/resources/processesbpmn/dispatch.bpmn20.xml
+++ b/blade-service/blade-mdm/src/main/resources/processesbpmn/dispatch.bpmn20.xml
@@ -4,9 +4,9 @@
<startEvent id="start" name="寮�濮�"/>
<sequenceFlow id="sid-c1619263-d1ff-4106-9315-f9ab9a3bee71" sourceRef="start" targetRef="teamLeaderTask"/>
<userTask id="teamLeaderTask" name="涓撲笟缁勯暱" flowable:assignee="${teamLeader}"/>
- <userTask id="programmingTask" name="缂栧埗" flowable:assignee="${programmer}"/>
- <userTask id="check" name="鏍″" flowable:assignee="${checker}"/>
- <userTask id="approveTask" name="楂樺笀瀹℃壒" flowable:assignee="${senior}"/>
+ <userTask id="programmingTask" name="缂栧埗" flowable:assignee="${assignee}"/>
+ <userTask id="check" name="鏍″" flowable:assignee="${assignee}"/>
+ <userTask id="approveTask" name="楂樺笀瀹℃壒" flowable:assignee="${assignee}"/>
<endEvent id="approveEnd" name="瀹℃壒瀹屾垚"/>
<sequenceFlow id="programingToCheck" sourceRef="programmingTask" targetRef="check" name="缂栧埗瀹屾垚缁欐牎瀵�">
<conditionExpression xsi:type="tFormalExpression">${approve=='Y'}</conditionExpression>
@@ -24,30 +24,30 @@
<conditionExpression xsi:type="tFormalExpression">${approve=='Y'}</conditionExpression>
</sequenceFlow>
<serviceTask id="cureCheckServiceTask" flowable:exclusive="true" name="鍥哄寲绋嬪簭妫�鏌ユ湇鍔′换鍔�" flowable:expression="cureProgramCheckTask.execute(execution)"/>
- <userTask id="sid-015ac835-1083-489a-9496-97dbb9432d09" name="妫�鏌ョ▼搴忔槸鍚﹀彲鐢�"/>
+ <userTask id="confirmIsUseableTask" name="妫�鏌ョ▼搴忔槸鍚﹀彲鐢�" flowable:assignee="${assignee}"/>
<sequenceFlow id="sid-46ccac64-2d48-4933-88a6-f2941ae131dd" sourceRef="teamLeaderTask" targetRef="programmingTask">
- <conditionExpression xsi:type="tFormalExpression">hasCuredProgram==鈥楴'</conditionExpression>
+ <conditionExpression xsi:type="tFormalExpression">${approve=='Y' && hasCuredProgram=='N'}</conditionExpression>
</sequenceFlow>
<sequenceFlow id="sid-af92e6ab-bc80-43ed-8b09-1d3ec54cc9e7" sourceRef="teamLeaderTask" targetRef="cureCheckServiceTask">
- <conditionExpression xsi:type="tFormalExpression">hasCuredProgram==鈥榊'</conditionExpression>
+ <conditionExpression xsi:type="tFormalExpression">${approve=='Y' && hasCuredProgram=='Y'}</conditionExpression>
</sequenceFlow>
- <sequenceFlow id="sid-353381d5-35c7-47b0-bf5b-2bafe865ab5e" sourceRef="cureCheckServiceTask" targetRef="sid-015ac835-1083-489a-9496-97dbb9432d09"/>
- <sequenceFlow id="sid-d144dad0-dc94-4a2b-96d6-9d8451b05ec1" sourceRef="sid-015ac835-1083-489a-9496-97dbb9432d09" targetRef="sid-82237034-5cb2-45c7-9a74-e2d5abb3b398" name="鍥哄寲绋嬪簭鍙敤">
- <conditionExpression>approve=='Y'</conditionExpression>
+ <sequenceFlow id="sid-353381d5-35c7-47b0-bf5b-2bafe865ab5e" sourceRef="cureCheckServiceTask" targetRef="confirmIsUseableTask"/>
+ <sequenceFlow id="sid-d144dad0-dc94-4a2b-96d6-9d8451b05ec1" sourceRef="confirmIsUseableTask" targetRef="sid-82237034-5cb2-45c7-9a74-e2d5abb3b398" name="鍥哄寲绋嬪簭鍙敤">
+ <conditionExpression>${approve=='Y'}</conditionExpression>
</sequenceFlow>
<sequenceFlow id="sid-d4133565-1a45-4bb6-b603-9b9e4db1cdbb" sourceRef="approveTask" targetRef="check">
- <conditionExpression>{approve=='N'}</conditionExpression>
+ <conditionExpression>${approve=='N'}</conditionExpression>
</sequenceFlow>
<exclusiveGateway id="sid-82237034-5cb2-45c7-9a74-e2d5abb3b398" name="鍙敤绋嬪簭娴佽浆缃戝叧"/>
<sequenceFlow id="sid-b15dcf6a-a48c-4e01-b6bc-5c2a74ca817e" sourceRef="sid-82237034-5cb2-45c7-9a74-e2d5abb3b398" targetRef="check" name="宸ュ簭鐗堟涓�鑷村苟涓斿彲鐢�">
- <conditionExpression xsi:type="tFormalExpression">processEditionEqual=='Y'</conditionExpression>
+ <conditionExpression xsi:type="tFormalExpression">${processEditionEqual=='Y'}</conditionExpression>
</sequenceFlow>
<sequenceFlow id="sid-6249886b-7c4a-4904-9b0b-cf743932be9f" sourceRef="sid-82237034-5cb2-45c7-9a74-e2d5abb3b398" targetRef="emptyUpgradeProcessEdtionServiceTask">
- <conditionExpression xsi:type="tFormalExpression">processEditionEqual=='N'</conditionExpression>
+ <conditionExpression xsi:type="tFormalExpression">${processEditionEqual=='N'}</conditionExpression>
</sequenceFlow>
<sequenceFlow id="sid-598e1dbe-85b3-40d0-89c8-bd2580ecbfc5" sourceRef="emptyUpgradeProcessEdtionServiceTask" targetRef="check"/>
- <sequenceFlow id="sid-80b50f96-7601-4ba2-8c32-968923170d25" sourceRef="sid-015ac835-1083-489a-9496-97dbb9432d09" targetRef="programmingTask">
- <conditionExpression>approve=='N'</conditionExpression>
+ <sequenceFlow id="sid-80b50f96-7601-4ba2-8c32-968923170d25" sourceRef="confirmIsUseableTask" targetRef="programmingTask">
+ <conditionExpression>${approve=='N'}</conditionExpression>
</sequenceFlow>
<serviceTask id="emptyUpgradeProcessEdtionServiceTask" flowable:exclusive="true" name="绌哄崌鐗�" flowable:expression="programEmptyUpgradeProcessEdtionTask.execute(execution)"/>
</process>
@@ -98,7 +98,7 @@
<bpmndi:BPMNShape id="shape-8455618d-c1b9-4e6a-bca4-de965cc81633" bpmnElement="cureCheckServiceTask">
<omgdc:Bounds x="-275.0" y="37.500004" width="65.0" height="39.999996"/>
</bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="shape-8f7064fc-4838-44cc-bf6d-ca15932a1e2e" bpmnElement="sid-015ac835-1083-489a-9496-97dbb9432d09">
+ <bpmndi:BPMNShape id="shape-8f7064fc-4838-44cc-bf6d-ca15932a1e2e" bpmnElement="confirmIsUseableTask">
<omgdc:Bounds x="-165.0" y="37.5" width="55.0" height="40.0"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="edge-0408fc3c-c133-40e3-9006-c315b12e9790" bpmnElement="sid-46ccac64-2d48-4933-88a6-f2941ae131dd">
--
Gitblit v1.9.3