From 67c9c5f910ffba7a7da1b87191c1a30fa07f08ca Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Sat, 14 Dec 2024 19:33:04 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=B7=BB=E5=8A=A0=E6=A8=A1=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script/bpmn/leave1.xml            | 17 +++++++++++++
 script/bpmn/leave2.xml            | 24 +++++++++++++++++++
 script/bpmn/leaveFlow-serial1.xml | 40 -------------------------------
 3 files changed, 41 insertions(+), 40 deletions(-)
 create mode 100644 script/bpmn/leave1.xml
 create mode 100644 script/bpmn/leave2.xml
 delete mode 100644 script/bpmn/leaveFlow-serial1.xml

diff --git a/script/bpmn/leave1.xml b/script/bpmn/leave1.xml
new file mode 100644
index 000000000..339e2b72b
--- /dev/null
+++ b/script/bpmn/leave1.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<definition flowCode="leave1" flowName="请假申请-普通" version="1" category="1" formCustom="N">
+    <node nodeType="start" nodeCode="d5ee3ddf-3968-4379-a86f-9ceabde5faac" nodeName="开始" nodeRatio="0.000" coordinate="200,200|200,200" skipAnyNode="N" formCustom="N">
+        <skip coordinate="220,200;310,200" skipType="PASS">dd515cdd-59f6-446f-94ca-25ca062afb42</skip>
+    </node>
+    <node nodeType="between" nodeCode="dd515cdd-59f6-446f-94ca-25ca062afb42" nodeName="申请人" nodeRatio="0.000" coordinate="360,200|360,200" skipAnyNode="N" formCustom="N">
+        <skip coordinate="410,200;490,200" skipType="PASS">78fa8e5b-e809-44ed-978a-41092409ebcf</skip>
+    </node>
+    <node nodeType="between" nodeCode="78fa8e5b-e809-44ed-978a-41092409ebcf" nodeName="组长" permissionFlag="role:1" nodeRatio="0.000" coordinate="540,200|540,200" skipAnyNode="N" formCustom="N">
+        <skip coordinate="590,200;670,200" skipType="PASS">a8abf15f-b83e-428a-86cc-033555ea9bbe</skip>
+    </node>
+    <node nodeType="between" nodeCode="a8abf15f-b83e-428a-86cc-033555ea9bbe" nodeName="部门主管" permissionFlag="role:3,role:4" nodeRatio="0.000" coordinate="720,200|720,200" skipAnyNode="N" formCustom="N">
+        <skip coordinate="770,200;880,200" skipType="PASS">8b82b7d7-8660-455e-b880-d6d22ea3eb6d</skip>
+    </node>
+    <node nodeType="end" nodeCode="8b82b7d7-8660-455e-b880-d6d22ea3eb6d" nodeName="结束" nodeRatio="0.000" coordinate="900,200|900,200" skipAnyNode="N" formCustom="N"/>
+</definition>
diff --git a/script/bpmn/leave2.xml b/script/bpmn/leave2.xml
new file mode 100644
index 000000000..bc0fdb2bb
--- /dev/null
+++ b/script/bpmn/leave2.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<definition flowCode="leave2" flowName="请假申请-排他网关" version="2" category="1" formCustom="N">
+    <node nodeType="start" nodeCode="cef3895c-f7d8-4598-8bf3-8ec2ef6ce84a" nodeName="开始" nodeRatio="0.000" coordinate="300,240|300,240" skipAnyNode="N" formCustom="N">
+        <skip coordinate="320,240;390,240" skipType="PASS">fdcae93b-b69c-498a-b231-09255e74bcbd</skip>
+    </node>
+    <node nodeType="between" nodeCode="fdcae93b-b69c-498a-b231-09255e74bcbd" nodeName="申请人" nodeRatio="0.000" coordinate="440,240|440,240" skipAnyNode="N" formCustom="N">
+        <skip coordinate="490,240;535,240" skipType="PASS">7b8c7ead-7dc8-4951-a7f3-f0c41995909e</skip>
+    </node>
+    <node nodeType="serial" nodeCode="7b8c7ead-7dc8-4951-a7f3-f0c41995909e" nodeRatio="0.000" coordinate="560,240" skipAnyNode="N" formCustom="N">
+        <skip coordinate="560,265;560,320;670,320" skipType="PASS" skipCondition="@@le@@|leaveDays@@le@@2">b3528155-dcb7-4445-bbdf-3d00e3499e86</skip>
+        <skip coordinate="560,215;560,160;670,160|560,187" skipType="PASS" skipName="大于两天" skipCondition="@@gt@@|leaveDays@@gt@@2">5ed2362b-fc0c-4d52-831f-95208b830605</skip>
+    </node>
+    <node nodeType="between" nodeCode="b3528155-dcb7-4445-bbdf-3d00e3499e86" nodeName="组长" permissionFlag="3,4" nodeRatio="0.000" coordinate="720,320|720,320" skipAnyNode="N" formCustom="N">
+        <skip coordinate="770,320;860,320;860,280" skipType="PASS">c9fa6d7d-2a74-4e78-b947-0cad8a6af869</skip>
+    </node>
+    <node nodeType="between" nodeCode="c9fa6d7d-2a74-4e78-b947-0cad8a6af869" nodeName="总经理" permissionFlag="role:1" nodeRatio="0.000" coordinate="860,240|860,240" skipAnyNode="N" formCustom="N">
+        <skip coordinate="910,240;980,240" skipType="PASS">40aa65fd-0712-4d23-b6f7-d0432b920fd1</skip>
+    </node>
+    <node nodeType="end" nodeCode="40aa65fd-0712-4d23-b6f7-d0432b920fd1" nodeName="结束" nodeRatio="0.000" coordinate="1000,240|1000,240" skipAnyNode="N" formCustom="N"/>
+    <node nodeType="between" nodeCode="5ed2362b-fc0c-4d52-831f-95208b830605" nodeName="部门领导" permissionFlag="role:1" nodeRatio="0.000" coordinate="720,160|720,160" skipAnyNode="N" formCustom="N">
+        <skip coordinate="770,160;860,160;860,200" skipType="PASS">c9fa6d7d-2a74-4e78-b947-0cad8a6af869</skip>
+    </node>
+</definition>
diff --git a/script/bpmn/leaveFlow-serial1.xml b/script/bpmn/leaveFlow-serial1.xml
deleted file mode 100644
index e4e16e8a4..000000000
--- a/script/bpmn/leaveFlow-serial1.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<definition flowCode="leaveFlow-serial1" flowName="串行-简单" version="1.0" formCustom="N"
-            listenerType="start,assignment,finish,create"
-            listenerPath="com.ruoyi.system.GlobalListener.GlobalStartListener@@com.ruoyi.system.GlobalListener.GlobalAssignmentListener@@com.ruoyi.system.GlobalListener.GlobalFinishListener@@com.ruoyi.system.GlobalListener.GlobalCreateListener"
-            formPath="system/leave/approve">
-    <node nodeType="start" nodeCode="1" nodeName="开始" coordinate="120,280|120,280" skipAnyNode="N"
-          listenerType="start,assignment,finish,create"
-          listenerPath="com.ruoyi.system.Listener.StartListener@@com.ruoyi.system.Listener.AssignmentListener@@com.ruoyi.system.Listener.FinishListener@@com.ruoyi.system.Listener.CreateListener">
-        <skip coordinate="140,280;230,280" skipType="PASS">2</skip>
-    </node>
-    <node nodeType="between" nodeCode="2" nodeName="待提交" permissionFlag="role:1,role:2" coordinate="280,280|280,280"
-          skipAnyNode="N" nodeRatio="0"
-          listenerType="start,assignment,finish,create"
-          listenerPath="com.ruoyi.system.Listener.StartListener@@com.ruoyi.system.Listener.AssignmentListener@@com.ruoyi.system.Listener.FinishListener@@com.ruoyi.system.Listener.CreateListener">
-        <skip coordinate="330,280;430,280" skipType="PASS">3</skip>
-    </node>
-    <node nodeType="between" nodeCode="3" nodeName="组长审批" permissionFlag="role:1,role:2"
-          coordinate="480,280|480,280" skipAnyNode="Y" nodeRatio="0"
-          listenerType="start,assignment,finish,create"
-          listenerPath="com.ruoyi.system.Listener.StartListener@@com.ruoyi.system.Listener.AssignmentListener@@com.ruoyi.system.Listener.FinishListener@@com.ruoyi.system.Listener.CreateListener">
-        <skip coordinate="530,280;650,280" skipType="PASS">4</skip>
-    </node>
-    <node nodeType="between" nodeCode="4" nodeName="部门经理审批" permissionFlag="role:1,role:2"
-          coordinate="700,280|700,280" skipAnyNode="N" nodeRatio="0"
-          listenerType="start,assignment,finish,create"
-          listenerPath="com.ruoyi.system.Listener.StartListener@@com.ruoyi.system.Listener.AssignmentListener@@com.ruoyi.system.Listener.FinishListener@@com.ruoyi.system.Listener.CreateListener">
-        <skip coordinate="750,280;870,280" skipType="PASS">5</skip>
-        <skip coordinate="700,240;700,210;280,210;280,240" skipType="REJECT">2</skip>
-    </node>
-    <node nodeType="between" nodeCode="5" nodeName="hr审批" permissionFlag="1"
-          coordinate="920,280|920,280" skipAnyNode="Y" nodeRatio="0"
-          listenerType="start,assignment,finish,create"
-          listenerPath="com.ruoyi.system.Listener.StartListener@@com.ruoyi.system.Listener.AssignmentListener@@com.ruoyi.system.Listener.FinishListener@@com.ruoyi.system.Listener.CreateListener">
-        <skip coordinate="970,280;1100,280" skipType="PASS">6</skip>
-    </node>
-    <node nodeType="end" nodeCode="6" nodeName="结束" coordinate="1120,280|1120,280" skipAnyNode="N"
-          listenerType="start,assignment,finish,create"
-          listenerPath="com.ruoyi.system.Listener.StartListener@@com.ruoyi.system.Listener.AssignmentListener@@com.ruoyi.system.Listener.FinishListener@@com.ruoyi.system.Listener.CreateListener"/>
-</definition>