From 9b3c5c304a2af98f7eb77dd961a9d1233bdd6476 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Sat, 14 Sep 2024 21:43:12 +0800
Subject: [PATCH] 1、自行受理bug修复 2、流程进度展示bug修复
---
dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_ZXSL_3LEVEL_V1.bpmn20.xml | 55 ++++++++++++++++++++++---------------------------------
1 files changed, 22 insertions(+), 33 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_ZXSL_3LEVEL_V1.bpmn20.xml b/dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_ZXSL_3LEVEL_V1.bpmn20.xml
index c39f0e3..1ab88eb 100644
--- a/dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_ZXSL_3LEVEL_V1.bpmn20.xml
+++ b/dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_ZXSL_3LEVEL_V1.bpmn20.xml
@@ -2,42 +2,35 @@
<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="GZDYH_ZXSL_3LEVEL_V1" name="GZDYH_ZXSL_3LEVEL_V1" isExecutable="true">
<documentation>GZDYH_ZXSL_3LEVEL_V1</documentation>
- <startEvent id="ZXSL_START" name="开始"/>
- <userTask id="ZXSL" name="自行受理"/>
+ <startEvent id="START" name="开始"/>
<userTask id="BLFK" name="办理反馈"/>
<userTask id="DSRPJ" name="当事人评价"/>
<userTask id="JAGD" name="结案归档"/>
<userTask id="JASH" name="结案审核"/>
- <endEvent id="ZXSL_END" name="结束"/>
+ <endEvent id="END" name="结束"/>
<userTask id="JASQ" name="结案申请"/>
- <sequenceFlow id="sid-03DCE158-DCD9-4C4F-803A-FA2795072196" name="结案审核不同意不同意" sourceRef="JASH" targetRef="BLFK">
- <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='jash_bty'}]]></conditionExpression>
- </sequenceFlow>
- <sequenceFlow id="sid-E2A63ACD-76CD-4419-A771-C082334A3A11" sourceRef="ZXSL_START" targetRef="ZXSL"/>
- <sequenceFlow id="sid-6032A3F4-92DC-4CFE-BCE7-404BB56C66C5" name="通过" sourceRef="ZXSL" targetRef="BLFK">
- <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='forward'}]]></conditionExpression>
- </sequenceFlow>
- <sequenceFlow id="sid-A0580378-38E0-44D8-981B-9D048ED42E97" name="通过" sourceRef="BLFK" targetRef="JASQ">
- <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='forward'}]]></conditionExpression>
- </sequenceFlow>
- <sequenceFlow id="sid-0AE3E811-3EBD-4891-B2BD-F2E091E41541" name="通过" sourceRef="JASQ" targetRef="JASH">
+ <sequenceFlow id="sid-FE66E67A-D6D4-4E68-BB7E-14A17E87B9E5" sourceRef="JAGD" targetRef="END"/>
+ <sequenceFlow id="sid-E2A63ACD-76CD-4419-A771-C082334A3A11" sourceRef="START" targetRef="BLFK"/>
+ <sequenceFlow id="sid-15046AD2-218B-4567-B05A-26B2D0069DE2" name="通过" sourceRef="DSRPJ" targetRef="JAGD">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='forward'}]]></conditionExpression>
</sequenceFlow>
<sequenceFlow id="sid-78554576-20C8-4A98-9A33-92DD5542AA27" name="结案审核同意" sourceRef="JASH" targetRef="DSRPJ">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='jash_ty'}]]></conditionExpression>
</sequenceFlow>
- <sequenceFlow id="sid-15046AD2-218B-4567-B05A-26B2D0069DE2" name="通过" sourceRef="DSRPJ" targetRef="JAGD">
+ <sequenceFlow id="sid-0AE3E811-3EBD-4891-B2BD-F2E091E41541" name="通过" sourceRef="JASQ" targetRef="JASH">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='forward'}]]></conditionExpression>
</sequenceFlow>
- <sequenceFlow id="sid-FE66E67A-D6D4-4E68-BB7E-14A17E87B9E5" sourceRef="JAGD" targetRef="ZXSL_END"/>
+ <sequenceFlow id="sid-A0580378-38E0-44D8-981B-9D048ED42E97" name="通过" sourceRef="BLFK" targetRef="JASQ">
+ <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='forward'}]]></conditionExpression>
+ </sequenceFlow>
+ <sequenceFlow id="sid-03DCE158-DCD9-4C4F-803A-FA2795072196" name="结案审核不同意不同意" sourceRef="JASH" targetRef="BLFK">
+ <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='jash_bty'}]]></conditionExpression>
+ </sequenceFlow>
</process>
<bpmndi:BPMNDiagram id="BPMNDiagram_GZDYH_ZXSL_3LEVEL_V1">
<bpmndi:BPMNPlane bpmnElement="GZDYH_ZXSL_3LEVEL_V1" id="BPMNPlane_GZDYH_ZXSL_3LEVEL_V1">
- <bpmndi:BPMNShape bpmnElement="ZXSL_START" id="BPMNShape_ZXSL_START">
- <omgdc:Bounds height="30.0" width="30.0" x="75.0" y="160.00001244246837"/>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape bpmnElement="ZXSL" id="BPMNShape_ZXSL">
- <omgdc:Bounds height="80.0" width="99.99999999999997" x="150.0" y="134.99998591840347"/>
+ <bpmndi:BPMNShape bpmnElement="START" id="BPMNShape_START">
+ <omgdc:Bounds height="30.0" width="30.0" x="195.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"/>
@@ -51,37 +44,33 @@
<bpmndi:BPMNShape bpmnElement="JASH" id="BPMNShape_JASH">
<omgdc:Bounds height="80.0" width="100.0" x="659.9999901652337" y="134.99999798834327"/>
</bpmndi:BPMNShape>
- <bpmndi:BPMNShape bpmnElement="ZXSL_END" id="BPMNShape_ZXSL_END">
+ <bpmndi:BPMNShape bpmnElement="END" id="BPMNShape_END">
<omgdc:Bounds height="28.0" width="28.0" x="1109.9999834597113" y="161.00001205503818"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="JASQ" id="BPMNShape_JASQ">
<omgdc:Bounds height="80.0" width="100.0" x="479.99999284744274" y="134.99998591840347"/>
</bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge bpmnElement="sid-E2A63ACD-76CD-4419-A771-C082334A3A11" id="BPMNEdge_sid-E2A63ACD-76CD-4419-A771-C082334A3A11">
+ <omgdi:waypoint x="224.94999837483869" y="175.00001039707323"/>
+ <omgdi:waypoint x="314.9999950161384" y="174.99999811788496"/>
+ </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="sid-03DCE158-DCD9-4C4F-803A-FA2795072196" id="BPMNEdge_sid-03DCE158-DCD9-4C4F-803A-FA2795072196">
<omgdi:waypoint x="684.9999901652337" y="134.99999798834327"/>
<omgdi:waypoint x="684.9999901652337" y="105.00000053644179"/>
<omgdi:waypoint x="389.9999953061343" y="105.00000053644179"/>
<omgdi:waypoint x="389.9999953061343" y="134.99999798834327"/>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge bpmnElement="sid-E2A63ACD-76CD-4419-A771-C082334A3A11" id="BPMNEdge_sid-E2A63ACD-76CD-4419-A771-C082334A3A11">
- <omgdi:waypoint x="104.94999849155933" y="175.00000882555042"/>
- <omgdi:waypoint x="150.0" y="174.99999796274022"/>
- </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="sid-A0580378-38E0-44D8-981B-9D048ED42E97" id="BPMNEdge_sid-A0580378-38E0-44D8-981B-9D048ED42E97">
<omgdi:waypoint x="414.94999530600165" y="174.9999943307857"/>
<omgdi:waypoint x="479.9999928473666" y="174.99998957230346"/>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge bpmnElement="sid-78554576-20C8-4A98-9A33-92DD5542AA27" id="BPMNEdge_sid-78554576-20C8-4A98-9A33-92DD5542AA27">
- <omgdi:waypoint x="759.9499901651751" y="174.99999798834327"/>
- <omgdi:waypoint x="794.9999881535146" y="174.99999798834327"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="sid-FE66E67A-D6D4-4E68-BB7E-14A17E87B9E5" id="BPMNEdge_sid-FE66E67A-D6D4-4E68-BB7E-14A17E87B9E5">
<omgdi:waypoint x="1059.9499856948855" y="175.00000415177684"/>
<omgdi:waypoint x="1109.999983378599" y="175.0000103275493"/>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge bpmnElement="sid-6032A3F4-92DC-4CFE-BCE7-404BB56C66C5" id="BPMNEdge_sid-6032A3F4-92DC-4CFE-BCE7-404BB56C66C5">
- <omgdi:waypoint x="249.94999986861848" y="174.99998957230352"/>
- <omgdi:waypoint x="314.9999953060815" y="174.99999433078568"/>
+ <bpmndi:BPMNEdge bpmnElement="sid-78554576-20C8-4A98-9A33-92DD5542AA27" id="BPMNEdge_sid-78554576-20C8-4A98-9A33-92DD5542AA27">
+ <omgdi:waypoint x="759.9499901651751" y="174.99999798834327"/>
+ <omgdi:waypoint x="794.9999881535146" y="174.99999798834327"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="sid-15046AD2-218B-4567-B05A-26B2D0069DE2" id="BPMNEdge_sid-15046AD2-218B-4567-B05A-26B2D0069DE2">
<omgdi:waypoint x="894.9499881534662" y="174.99999798834327"/>
--
Gitblit v1.8.0