From ecb8ee9c13ef1d4b7c0324dcd39e3ae34d9ce5b5 Mon Sep 17 00:00:00 2001 From: liyj <1003249715@qq.com> Date: Sat, 14 Sep 2024 23:21:05 +0800 Subject: [PATCH] 1、自行受理bug修复2 2、流程进度展示bug修复2 --- dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_ZXSL_3LEVEL_V1.bpmn20.xml | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 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 1ab88eb..428c7bc 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 @@ -10,7 +10,6 @@ <endEvent id="END" name="结束"/> <userTask id="JASQ" name="结案申请"/> <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> @@ -26,11 +25,16 @@ <sequenceFlow id="sid-03DCE158-DCD9-4C4F-803A-FA2795072196" name="结案审核不同意不同意" sourceRef="JASH" targetRef="BLFK"> <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='jash_bty'}]]></conditionExpression> </sequenceFlow> + <userTask id="DSL" name="待受理"/> + <sequenceFlow id="sid-6435F238-68D1-434F-8830-9130EE87BE4C" name="通过" sourceRef="DSL" targetRef="BLFK"> + <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='forward'}]]></conditionExpression> + </sequenceFlow> + <sequenceFlow id="sid-B9DCA90A-70F1-4D12-90AE-44A0943FA1B3" sourceRef="START" targetRef="DSL"/> </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="START" id="BPMNShape_START"> - <omgdc:Bounds height="30.0" width="30.0" x="195.0" y="160.00001244246837"/> + <omgdc:Bounds height="30.0" width="30.0" x="40.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"/> @@ -50,10 +54,9 @@ <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:BPMNShape bpmnElement="DSL" id="BPMNShape_DSL"> + <omgdc:Bounds height="80.0" width="100.0" x="135.0" y="135.00001244246837"/> + </bpmndi:BPMNShape> <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"/> @@ -63,6 +66,10 @@ <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-6435F238-68D1-434F-8830-9130EE87BE4C" id="BPMNEdge_sid-6435F238-68D1-434F-8830-9130EE87BE4C"> + <omgdi:waypoint x="234.95000000000002" y="175.0000084274335"/> + <omgdi:waypoint x="314.99999530610273" y="175.0000019993631"/> </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"/> @@ -80,6 +87,10 @@ <omgdi:waypoint x="579.9499928474428" y="174.99998600593358"/> <omgdi:waypoint x="659.9999901652095" y="174.99999338149593"/> </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge bpmnElement="sid-B9DCA90A-70F1-4D12-90AE-44A0943FA1B3" id="BPMNEdge_sid-B9DCA90A-70F1-4D12-90AE-44A0943FA1B3"> + <omgdi:waypoint x="69.94999891869115" y="175.00001244246837"/> + <omgdi:waypoint x="134.99999999999022" y="175.00001244246837"/> + </bpmndi:BPMNEdge> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> </definitions> \ No newline at end of file -- Gitblit v1.8.0