From 63e6c990e5bfd5c48b1abfeb273a500b783e7fa7 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Sun, 15 Sep 2024 17:22:57 +0800
Subject: [PATCH] 1、自行受理、受理跳转bug修复 2、联合处置流程优化

---
 dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_LHCZ_3LEVEL_V1.bpmn20.xml |   64 +++++++++++++++++++++++++-------
 1 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_LHCZ_3LEVEL_V1.bpmn20.xml b/dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_LHCZ_3LEVEL_V1.bpmn20.xml
index 49e31dd..386c8b8 100644
--- a/dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_LHCZ_3LEVEL_V1.bpmn20.xml
+++ b/dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_LHCZ_3LEVEL_V1.bpmn20.xml
@@ -6,12 +6,26 @@
     <userTask id="BLFK" name="办理反馈"/>
     <endEvent id="END" name="结束"/>
     <userTask id="DSL" name="待受理"/>
-    <sequenceFlow id="sid-6FA28350-5EFB-4393-B91A-D73ED7C3B390" sourceRef="START" targetRef="DSL"/>
+    <userTask id="DFP" name="待分派"/>
+    <sequenceFlow id="sid-97FF5E7D-10E2-45EA-86D6-0653C46C77FF" sourceRef="START" targetRef="DFP"/>
+    <sequenceFlow id="sid-295E1BEE-52BD-4CA8-A7E9-654AA5DB7A4D" name="通过" sourceRef="DSL" targetRef="BLFK">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='forward'}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-ECF7A199-20E7-414B-B20A-83080EEED633" name="通过" sourceRef="DFP" targetRef="DSL">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='forward'}]]></conditionExpression>
+    </sequenceFlow>
+    <userTask id="HTSH" name="回退审核"/>
     <sequenceFlow id="sid-A0580378-38E0-44D8-981B-9D048ED42E97" name="通过" sourceRef="BLFK" targetRef="END">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='forward'}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-295E1BEE-52BD-4CA8-A7E9-654AA5DB7A4D" name="通过" sourceRef="DSL" targetRef="BLFK">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='forward'}]]></conditionExpression>
+    <sequenceFlow id="sid-898E82EA-FC5A-4EAA-AA8C-B5B74B39D826" name="回退申请" sourceRef="DSL" targetRef="HTSH">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='htsq'}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-2B1A0AA4-9560-41A7-9E4D-7C42107ABFCC" name="回退审核同意" sourceRef="HTSH" targetRef="BLFK">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='htsh_ty'}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-05F6F2B8-9E23-4AAE-82FE-5F33117881D7" name="回退审核不同意" sourceRef="HTSH" targetRef="END">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='htsh_bty'}]]></conditionExpression>
     </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_GZDYH_LHCZ_3LEVEL_V1">
@@ -20,25 +34,47 @@
         <omgdc:Bounds height="30.0" width="30.0" x="15.0" y="160.00001244246837"/>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="BLFK" id="BPMNShape_BLFK">
-        <omgdc:Bounds height="80.0" width="100.0" x="314.9999953061343" y="134.99999798834327"/>
+        <omgdc:Bounds height="80.0" width="99.99999999999994" x="494.9999953061343" y="134.99999798834327"/>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="END" id="BPMNShape_END">
-        <omgdc:Bounds height="28.0" width="28.0" x="509.9999834597113" y="161.00001205503818"/>
+        <omgdc:Bounds height="28.0" width="28.0" x="689.9999834597113" y="161.00001205503818"/>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="DSL" id="BPMNShape_DSL">
-        <omgdc:Bounds height="80.0" width="100.0" x="150.0" y="135.00001244246837"/>
+        <omgdc:Bounds height="80.0" width="100.0" x="330.0" y="135.00001244246837"/>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="sid-6FA28350-5EFB-4393-B91A-D73ED7C3B390" id="BPMNEdge_sid-6FA28350-5EFB-4393-B91A-D73ED7C3B390">
-        <omgdi:waypoint x="44.94999936756078" y="175.00001244246837"/>
-        <omgdi:waypoint x="149.99999999993562" y="175.00001244246837"/>
-      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape bpmnElement="DFP" id="BPMNShape_DFP">
+        <omgdc:Bounds height="80.0" width="100.0" x="135.0" y="135.00001244246837"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="HTSH" id="BPMNShape_HTSH">
+        <omgdc:Bounds height="80.0" width="100.0" x="330.0" y="270.0"/>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sid-A0580378-38E0-44D8-981B-9D048ED42E97" id="BPMNEdge_sid-A0580378-38E0-44D8-981B-9D048ED42E97">
-        <omgdi:waypoint x="414.9499950929594" y="175.00000240740906"/>
-        <omgdi:waypoint x="509.9999834597113" y="175.00001081646118"/>
+        <omgdi:waypoint x="594.9499950929594" y="175.00000240740906"/>
+        <omgdi:waypoint x="689.9999834597113" y="175.00001081646118"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-05F6F2B8-9E23-4AAE-82FE-5F33117881D7" id="BPMNEdge_sid-05F6F2B8-9E23-4AAE-82FE-5F33117881D7">
+        <omgdi:waypoint x="429.94999999999993" y="289.16666746346476"/>
+        <omgdi:waypoint x="691.0735362274839" y="180.36679574539076"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-295E1BEE-52BD-4CA8-A7E9-654AA5DB7A4D" id="BPMNEdge_sid-295E1BEE-52BD-4CA8-A7E9-654AA5DB7A4D">
-        <omgdi:waypoint x="249.94999995704916" y="175.00000806243037"/>
-        <omgdi:waypoint x="314.9999953060832" y="175.00000236400126"/>
+        <omgdi:waypoint x="429.95000000000005" y="175.00000806243034"/>
+        <omgdi:waypoint x="494.9999953061343" y="175.00000236400123"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-898E82EA-FC5A-4EAA-AA8C-B5B74B39D826" id="BPMNEdge_sid-898E82EA-FC5A-4EAA-AA8C-B5B74B39D826">
+        <omgdi:waypoint x="380.0" y="214.9500124424684"/>
+        <omgdi:waypoint x="380.0" y="270.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-2B1A0AA4-9560-41A7-9E4D-7C42107ABFCC" id="BPMNEdge_sid-2B1A0AA4-9560-41A7-9E4D-7C42107ABFCC">
+        <omgdi:waypoint x="428.82777566115067" y="270.0"/>
+        <omgdi:waypoint x="496.11110853652156" y="214.94999798834328"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-97FF5E7D-10E2-45EA-86D6-0653C46C77FF" id="BPMNEdge_sid-97FF5E7D-10E2-45EA-86D6-0653C46C77FF">
+        <omgdi:waypoint x="44.94999923927441" y="175.00001244246837"/>
+        <omgdi:waypoint x="135.0" y="175.00001244246837"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-ECF7A199-20E7-414B-B20A-83080EEED633" id="BPMNEdge_sid-ECF7A199-20E7-414B-B20A-83080EEED633">
+        <omgdi:waypoint x="234.9499999999802" y="175.00001244246837"/>
+        <omgdi:waypoint x="330.0" y="175.00001244246837"/>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

--
Gitblit v1.8.0