1.枚举类增加借章（法人身份证、法人章）

2.公文管理删除对外事务，成果评价和对外事务合并
3.新增盖/借，增加非空判断，增加判断条件为法人章(借)/法人身份证走borrowMethod流程图
4.新增borrowMethod流程图
5.公共监控器，分管领导:公文管(收文款里) 分管领导为副所长，此处并未修改，只是删除了所长节点
6.公共监控器，分管领导postDocumentHywbf流程图业务改为副所长
7.对外事务流程图删除
8.收文管理received，所长节点改为副所长
9.WorkFlowsService的获取同行人方法，增加case
borrowMethod与默认borrow一致

src/main/java/com/xqopen/kehui/admin/action/AdminDocumentManagementController.java

@@ -160,14 +160,12 @@ public class AdminDocumentManagementController implements AdminDocumentManagemen
         if (managementReq.getDocumentType() == 2) { //发文
             /**
              * 流程修改2022-02-27
-             * 增加一级判断，分类判断，若为成果评价类型，则按新流程
+             * 增加一级判断，分类判断，若为成果评价类型，则按新流程 （成果评价和对外事务流程合并 （！新））
              */
-            if(ext.get("contentClass").equals("cgPj")){
+            if(ext.get("contentClass").equals("cgPj") || "foreignAffairs".equals(ext.get("contentClass"))){
                 activitiApi.startWorkflow(userId, management.getId(), activitiEnum.activitiType.postDocumentCgPj, isSigned ? activitiEnum.activitiClass.signedDocument : activitiEnum.activitiClass.postDocumentCgPj);
             }else if(ext.get("contentClass").equals("djKy")){
                 activitiApi.startWorkflow(userId, management.getId(), activitiEnum.activitiType.postDocumentDjKy, isSigned ? activitiEnum.activitiClass.signedDocument : activitiEnum.activitiClass.postDocumentDjKy);
-            }else if(ext.get("contentClass").equals("foreignAffairs")){//对外事务，新增流程图
-                activitiApi.startWorkflow(userId, management.getId(), activitiEnum.activitiType.postDocumentDysw, isSigned ? activitiEnum.activitiClass.signedDocument : activitiEnum.activitiClass.postDocumentDysw);
             }
             else{
                 /*鄂技协\鄂技协纪要发文*/

src/main/java/com/xqopen/kehui/admin/action/AdminSealManagementController.java

@@ -139,6 +139,7 @@ public class AdminSealManagementController implements AdminSealManagementApi {
         //根据印章选择不同的流程
         activitiEnum.activitiType type = null;
         if (req.getGoOut()) {
+            if(!StringUtils.isEmpty(crossStatus)){
                 if (crossStatus.equals("1") || crossStatus.equals("2")) {
                     JSONObject ext = req.getSealBody();
                     List<Integer> sealType = ext.containsKey("sealType") ? ext
@@ -161,8 +162,25 @@ public class AdminSealManagementController implements AdminSealManagementApi {
                                 break;
                         }
                     }
-            }else{
+                }
+            }
+            else {
+                JSONObject ext = req.getSealBody();
+                List<Integer> sealType = ext.containsKey("sealType") ? ext
+                        .getObject("sealType", List.class) : null;
+                if (sealType != null && sealType.size() > 0) {
+                    Integer stampType = sealType.get(0);
+                    switch (stampType) {
+                        case 18: //法人章(借)
+                        case 28:  //法人身份证
+                            type= activitiEnum.activitiType.borrowMethod;
+                            break;
+                        default:
                             type = activitiEnum.activitiType.borrow;
+                            break;
+                    }
+                }
+//                type = activitiEnum.activitiType.borrow;
             }
         } else {
             JSONObject ext = req.getSealBody();

src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java

@@ -116,7 +116,6 @@ public class MyTaskListener implements TaskListener {
             String processInstanceId = task.getProcessInstanceId();
             List<FlowsConfiguration> flowsConfiguration = null;
             SystemUserLogin systemUserLogin = null;
-            ;
             ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).active().singleResult();
 //            String businessKey = processInstance.getBusinessKey();
             Wrapper<Flows> flowsWrapper = new EntityWrapper<>();
@@ -422,7 +421,7 @@ public class MyTaskListener implements TaskListener {
                 return "depDirector";
             case postDocumentDysw: //公文管理(发文管理)->对外事务->删除部门主任节点，且分管领导为副所长
                 return "depDirector";
-            case receivedDocument:
+            case receivedDocument://公文管(收文款里) 分管领导为副所长，此处并未修改，只是删除了所长节点
                 return "depDirector";
             /*case postDocument:
                 if (management != null) {
@@ -446,48 +445,50 @@ public class MyTaskListener implements TaskListener {
                     }
                 }
                 break;*/
-            case postDocumentHywbf://当文号为之前黄主任终审的时候增加分管领导为张所长终审
+            case postDocumentHywbf://发文管理，所有分管领导全改为副所长
-                if (management != null) {
-                    JSONObject ext = management.getExt();
-                    if (ext != null && ext.containsKey("CategoryID")) {
-                        Long CategoryID = ext.getLong("CategoryID");
-                        SystemTerm term = termService.selectById(CategoryID);
-                        if (term != null) {
-                            switch (term.getTermName()) {
-                                case "鄂技交函":
-                                case "鄂技交业":
-                                case "鄂技交办":
-//                                case "鄂技交发":
-                                case "无文号":
                 return "depDirector";
-                                default:
+//当文号为之前黄主任终审的时候增加分管领导为张所长终审
-                                    if (management != null) {
+//                if (management != null) {
-                                        JSONObject ext1 = management.getExt();
+//                    JSONObject ext = management.getExt();
-                                        if (ext1 != null && ext1.containsKey("draftDeptName")) {
+//                    if (ext != null && ext.containsKey("CategoryID")) {
-                                            String deptNameSource = ext1.getString("draftDeptName");
+//                        Long CategoryID = ext.getLong("CategoryID");
-                                            String deptName = deptNameSource.substring(0, deptNameSource.indexOf(">"));
+//                        SystemTerm term = termService.selectById(CategoryID);
-                                            String dept = deptNameSource.substring((deptName.length() + 1), deptNameSource.length());
+//                        if (term != null) {
-                                            if (StringNotNull.isNotEmpty(dept)) {//根据部门判断分管领导终审
+//                            switch (term.getTermName()) {
-                                                switch (dept) {
+//                                case "鄂技交函":
-                                                    case "网络技术部":
+//                                case "鄂技交业":
-                                                    case "市场发展部":
+//                                case "鄂技交办":
-                                                    case "服务产品部":
+////                                case "鄂技交发":
-                                                        return "director";
+//                                case "无文号":
-                                                    case "战略规划部":
+//                                    return "depDirector";
-                                                    case "办公室":
+//                                default:
-                                                    case "人财中心":
+//                                    if (management != null) {
-                                                    case "财务中心":
+//                                        JSONObject ext1 = management.getExt();
-                                                        return "depDirector";
+//                                        if (ext1 != null && ext1.containsKey("draftDeptName")) {
-                                                }
+//                                            String deptNameSource = ext1.getString("draftDeptName");
-                                            }
+//                                            String deptName = deptNameSource.substring(0, deptNameSource.indexOf(">"));
-                                        }
+//                                            String dept = deptNameSource.substring((deptName.length() + 1), deptNameSource.length());
-                                    }
+//                                            if (StringNotNull.isNotEmpty(dept)) {//根据部门判断分管领导终审
-                                    break;
+//                                                switch (dept) {
-                            }
+//                                                    case "网络技术部":
-                        }
+//                                                    case "市场发展部":
-                    }
+//                                                    case "服务产品部":
-                }
+//                                                        return "director";
-                break;
+//                                                    case "战略规划部":
+//                                                    case "办公室":
+//                                                    case "人财中心":
+//                                                    case "财务中心":
+//                                                        return "depDirector";
+//                                                }
+//                                            }
+//                                        }
+//                                    }
+//                                    break;
+//                            }
+//                        }
+//                    }
+//                }
+//                break;
             case borrowChapter:
             case stamp:
                 AdminSealManagement sealManagement = sealManagementService.selectById(id);

src/main/java/com/xqopen/kehui/flows/util/WorkFlowsService.java

@@ -412,6 +412,7 @@ public class WorkFlowsService {
     public String getPartner(activitiEnum.activitiType aType, Long businessId) {
         String partner = "";
         switch (aType) {
+            case borrowMethod://借章法人章、法人身份证
             case borrow:
                 AdminSealManagement sealManagement = sealManagementService.selectById(businessId);
                 if (sealManagement != null && sealManagement.getPeerPeoples() != null) {
@@ -573,6 +574,7 @@ public class WorkFlowsService {
                 break;*/
             case postDocument:
             case postDocumentHywbf:
+            case postDocumentDysw:
             case postDocumentXh:
             case postDocumentGong://发文 case postDocumentDang:
             case postDocumentDZZJY:

src/main/java/com/xqopen/kehui/flows/util/activitiEnum.java

@@ -79,7 +79,9 @@ public class activitiEnum {
         //申请人-》同行人-》部门主任-》办公室主任-》所长
         @ApiModelProperty("借章、借证")
         borrow("外借流程审批"),
-
+        //申请人-同行人-办公室主任-所长
+        @ApiModelProperty("借证")
+        borrowMethod("借章（法人身份证、法人章）"),
         //申请人-》相关人员-》部门主任-》办公室主任
         @ApiModelProperty("任务审批")
         task("任务流程审批"),

src/main/resources/processes/borrowMethod.bpmn

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" 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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn" xmlns:tns="http://www.activiti.org/test" xmlns:xsd="http://www.w3.org/2001/XMLSchema" id="m1510886794949" name="" targetNamespace="http://www.activiti.org/test" exporter="Camunda Modeler" exporterVersion="5.25.0">
+  <process id="borrowMethod" name="借章(法人身份证、法人章)" processType="None" isClosed="false" isExecutable="true">
+    <startEvent id="start" name="StartEvent" />
+    <userTask id="apply" name="申请人" activiti:assignee="${apply}" activiti:exclusive="true" />
+    <userTask id="partner" name="同行人" activiti:assignee="${partner}" activiti:exclusive="true">
+      <multiInstanceLoopCharacteristics activiti:collection="partnerList" activiti:elementVariable="partner">
+        <completionCondition>${nrOfCompletedInstances/nrOfInstances &gt;= 1 }</completionCondition>
+      </multiInstanceLoopCharacteristics>
+    </userTask>
+    <userTask id="office" name="办公室主任" activiti:async="true" activiti:exclusive="true">
+      <extensionElements>
+        <activiti:taskListener class="com.xqopen.kehui.flows.util.MyTaskListener" event="create" />
+      </extensionElements>
+    </userTask>
+    <userTask id="director" name="所长" activiti:exclusive="true">
+      <extensionElements>
+        <activiti:taskListener class="com.xqopen.kehui.flows.util.MyTaskListener" event="create" />
+      </extensionElements>
+    </userTask>
+    <endEvent id="end" name="EndEvent">
+      <extensionElements>
+        <activiti:executionListener class="com.xqopen.kehui.flows.util.MyExecutionListener" event="end" />
+      </extensionElements>
+    </endEvent>
+    <sequenceFlow id="_9" sourceRef="start" targetRef="apply" />
+    <sequenceFlow id="_10" sourceRef="apply" targetRef="partner" />
+    <sequenceFlow id="_2" sourceRef="partner" targetRef="office" />
+    <sequenceFlow id="_3" sourceRef="office" targetRef="director" />
+    <sequenceFlow id="_5" sourceRef="director" targetRef="end" />
+  </process>
+  <bpmndi:BPMNDiagram id="Diagram-_1" name="New Diagram" documentation="background=#3C3F41;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0">
+    <bpmndi:BPMNPlane bpmnElement="borrowMethod">
+      <bpmndi:BPMNShape id="Shape-start" bpmnElement="start">
+        <omgdc:Bounds x="400" y="110" width="32" height="32" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="160" y="80" width="52" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Shape-apply" bpmnElement="apply">
+        <omgdc:Bounds x="375" y="215" width="85" height="55" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="170" y="80" width="85" height="55" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Shape-partner" bpmnElement="partner">
+        <omgdc:Bounds x="375" y="325" width="85" height="55" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="170" y="80" width="85" height="55" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Shape-office" bpmnElement="office">
+        <omgdc:Bounds x="375" y="450" width="85" height="55" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="170" y="80" width="85" height="55" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Shape-end" bpmnElement="end">
+        <omgdc:Bounds x="400" y="715" width="32" height="32" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="162" y="80" width="48" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Shape-depDirector" bpmnElement="director">
+        <omgdc:Bounds x="375" y="565" width="85" height="55" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge__9" bpmnElement="_9" sourceElement="Shape-start" targetElement="Shape-apply">
+        <omgdi:waypoint x="416" y="142" />
+        <omgdi:waypoint x="416" y="215" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge__10" bpmnElement="_10" sourceElement="Shape-apply" targetElement="Shape-partner">
+        <omgdi:waypoint x="417.5" y="270" />
+        <omgdi:waypoint x="417.5" y="325" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge__2" bpmnElement="_2" sourceElement="Shape-partner" targetElement="Shape-office">
+        <omgdi:waypoint x="417.5" y="380" />
+        <omgdi:waypoint x="417.5" y="450" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge__3" bpmnElement="_3" sourceElement="Shape-office" targetElement="Shape-depDirector">
+        <omgdi:waypoint x="417.5" y="505" />
+        <omgdi:waypoint x="417.5" y="565" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge__5" bpmnElement="_5" sourceElement="Shape-depDirector" targetElement="Shape-end">
+        <omgdi:waypoint x="416" y="620" />
+        <omgdi:waypoint x="416" y="715" />
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds x="0" y="0" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>

src/main/resources/processes/postDocumentDysw.bpmn

@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" 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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn" xmlns:tns="http://www.activiti.org/test" xmlns:xsd="http://www.w3.org/2001/XMLSchema" id="m1557906421713" name="" targetNamespace="http://www.activiti.org/test" exporter="Camunda Modeler" exporterVersion="5.25.0">
-  <process id="postDocumentDysw" name="发文管理(对外事务)" processType="None" isClosed="false" isExecutable="true">
-    <startEvent id="start" name="StartEvent" />
-    <userTask id="apply" name="申请人" activiti:assignee="${apply}" activiti:exclusive="true" />
-    <userTask id="business" name="部门主任" activiti:assignee="${business}" activiti:exclusive="true">
-      <multiInstanceLoopCharacteristics activiti:collection="businessList" activiti:elementVariable="business" />
-    </userTask>
-    <userTask id="branchLeader" name="分管领导" activiti:exclusive="true">
-      <extensionElements>
-        <activiti:taskListener class="com.xqopen.kehui.flows.util.MyTaskListener" event="create" />
-      </extensionElements>
-      <incoming>_12</incoming>
-    </userTask>
-    <endEvent id="end" name="EndEvent">
-      <extensionElements>
-        <activiti:executionListener class="com.xqopen.kehui.flows.util.MyExecutionListener" event="end" />
-      </extensionElements>
-    </endEvent>
-    <sequenceFlow id="_7" sourceRef="start" targetRef="apply" />
-    <sequenceFlow id="_8" sourceRef="apply" targetRef="business" />
-    <sequenceFlow id="_10" sourceRef="branchLeader" targetRef="end" />
-    <sequenceFlow id="_12" sourceRef="business" targetRef="branchLeader" />
-  </process>
-  <bpmndi:BPMNDiagram id="Diagram-_1" name="New Diagram" documentation="background=#FFFFFF;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0">
-    <bpmndi:BPMNPlane bpmnElement="postDocumentHywbf">
-      <bpmndi:BPMNShape id="Shape-start" bpmnElement="start">
-        <omgdc:Bounds x="595" y="80" width="32" height="32" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="160" y="80" width="52" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Shape-apply" bpmnElement="apply">
-        <omgdc:Bounds x="570" y="150" width="85" height="55" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="170" y="80" width="85" height="55" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Shape-business" bpmnElement="business">
-        <omgdc:Bounds x="570" y="240" width="85" height="55" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="170" y="80" width="85" height="55" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Shape-branchLeader" bpmnElement="branchLeader">
-        <omgdc:Bounds x="570" y="505" width="85" height="55" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="170" y="80" width="85" height="55" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Shape-end" bpmnElement="end">
-        <omgdc:Bounds x="600" y="665" width="32" height="32" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="162" y="80" width="48" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge__7" bpmnElement="_7" sourceElement="Shape-start" targetElement="Shape-apply">
-        <omgdi:waypoint x="611" y="112" />
-        <omgdi:waypoint x="611" y="150" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="0" y="0" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge__8" bpmnElement="_8" sourceElement="Shape-apply" targetElement="Shape-business">
-        <omgdi:waypoint x="612.5" y="205" />
-        <omgdi:waypoint x="612.5" y="240" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="0" y="0" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge__10" bpmnElement="_10" targetElement="Shape-end">
-        <omgdi:waypoint x="616" y="560" />
-        <omgdi:waypoint x="616" y="665" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="0" y="0" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge__12" bpmnElement="_12" sourceElement="Shape-business" targetElement="Shape-branchLeader">
-        <omgdi:waypoint x="613" y="295" />
-        <omgdi:waypoint x="613" y="505" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="0" y="0" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</definitions>

src/main/resources/processes/received.bpmn

@@ -1,98 +1,85 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.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" xmlns:tns="http://www.activiti.org/test" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" expressionLanguage="http://www.w3.org/1999/XPath" id="m1513247880147" name="" targetNamespace="http://www.activiti.org/test" typeLanguage="http://www.w3.org/2001/XMLSchema">
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" 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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn" xmlns:tns="http://www.activiti.org/test" xmlns:xsd="http://www.w3.org/2001/XMLSchema" id="m1513247880147" name="" targetNamespace="http://www.activiti.org/test" exporter="Camunda Modeler" exporterVersion="5.25.0">
-  <process id="received" isClosed="false" isExecutable="true" name="收文管理" processType="None">
+  <process id="received" name="收文管理" processType="None" isClosed="false" isExecutable="true">
     <startEvent id="start" name="StartEvent" />
-    <userTask activiti:assignee="${apply}" activiti:exclusive="true" id="apply" name="行政助理"/>
+    <userTask id="apply" name="行政助理" activiti:assignee="${apply}" activiti:exclusive="true" />
-    <userTask activiti:exclusive="true" id="office" name="办公室主任">
+    <userTask id="office" name="办公室主任" activiti:exclusive="true">
       <extensionElements>
         <activiti:taskListener class="com.xqopen.kehui.flows.util.MyTaskListener" event="create" />
       </extensionElements>
+      <outgoing>Flow_0jjkhjd</outgoing>
     </userTask>
     <endEvent id="end" name="EndEvent">
       <extensionElements>
         <activiti:executionListener class="com.xqopen.kehui.flows.util.MyExecutionListener" event="end" />
       </extensionElements>
+      <incoming>Flow_1y6f1el</incoming>
     </endEvent>
     <sequenceFlow id="_7" sourceRef="start" targetRef="apply" />
     <sequenceFlow id="_8" sourceRef="apply" targetRef="office" />
-    <userTask activiti:exclusive="true" id="branchLeader" name="分管领导">
+    <userTask id="branchLeader" name="分管领导" activiti:exclusive="true">
       <extensionElements>
         <activiti:taskListener class="com.xqopen.kehui.flows.util.MyTaskListener" event="create" />
       </extensionElements>
+      <incoming>Flow_0jjkhjd</incoming>
+      <outgoing>Flow_1y6f1el</outgoing>
     </userTask>
-    <userTask activiti:exclusive="true" id="director" name="所长">
+    <sequenceFlow id="Flow_0jjkhjd" sourceRef="office" targetRef="branchLeader" />
-      <extensionElements>
+    <sequenceFlow id="Flow_1y6f1el" sourceRef="branchLeader" targetRef="end" />
-        <activiti:taskListener class="com.xqopen.kehui.flows.util.MyTaskListener" event="create"/>
-      </extensionElements>
-    </userTask>
-    <sequenceFlow id="_5" sourceRef="director" targetRef="end"/>
-    <sequenceFlow id="_2" sourceRef="office" targetRef="director"/>
   </process>
-  <bpmndi:BPMNDiagram documentation="background=#3C3F41;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0" id="Diagram-_1" name="New Diagram">
+  <bpmndi:BPMNDiagram id="Diagram-_1" name="New Diagram" documentation="background=#3C3F41;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0">
     <bpmndi:BPMNPlane bpmnElement="received">
-      <bpmndi:BPMNShape bpmnElement="start" id="Shape-start">
+      <bpmndi:BPMNShape id="Shape-start" bpmnElement="start">
-        <omgdc:Bounds height="32.0" width="32.0" x="225.0" y="35.0"/>
+        <omgdc:Bounds x="585" y="135" width="32" height="32" />
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+          <omgdc:Bounds x="350" y="100" width="52" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="apply" id="Shape-apply">
+      <bpmndi:BPMNShape id="Shape-apply" bpmnElement="apply">
-        <omgdc:Bounds height="55.0" width="85.0" x="200.0" y="160.0"/>
+        <omgdc:Bounds x="560" y="260" width="85" height="55" />
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
+          <omgdc:Bounds x="360" y="100" width="85" height="55" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="office" id="Shape-office">
+      <bpmndi:BPMNShape id="Shape-office" bpmnElement="office">
-        <omgdc:Bounds height="55.0" width="85.0" x="200.0" y="290.0"/>
+        <omgdc:Bounds x="560" y="390" width="85" height="55" />
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
+          <omgdc:Bounds x="360" y="100" width="85" height="55" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="end" id="Shape-end">
+      <bpmndi:BPMNShape id="Shape-branchLeader" bpmnElement="branchLeader">
-        <omgdc:Bounds height="32.0" width="32.0" x="425.0" y="560.0"/>
+        <omgdc:Bounds x="560" y="525" width="85" height="55" />
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+          <omgdc:Bounds x="360" y="100" width="85" height="55" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="branchLeader" id="Shape-branchLeader">
+      <bpmndi:BPMNShape id="Shape-end" bpmnElement="end">
-        <omgdc:Bounds height="55.0" width="85.0" x="200.0" y="425.0"/>
+        <omgdc:Bounds x="585" y="644" width="32" height="32" />
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
+          <omgdc:Bounds x="152" y="84" width="48" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="director" id="Shape-director">
+      <bpmndi:BPMNEdge id="BPMNEdge__7" bpmnElement="_7" sourceElement="Shape-start" targetElement="Shape-apply">
-        <omgdc:Bounds height="55.0" width="85.0" x="400.0" y="425.0"/>
+        <omgdi:waypoint x="601" y="167" />
+        <omgdi:waypoint x="601" y="260" />
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
+          <omgdc:Bounds x="0" y="0" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="_2" id="BPMNEdge__2" sourceElement="office" targetElement="director">
-        <omgdi:waypoint x="285.0" y="317.5"/>
-        <omgdi:waypoint x="400.0" y="452.5"/>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="_5" id="BPMNEdge__5" sourceElement="director" targetElement="end">
+      <bpmndi:BPMNEdge id="BPMNEdge__8" bpmnElement="_8" sourceElement="Shape-apply" targetElement="Shape-office">
-        <omgdi:waypoint x="441.0" y="480.0"/>
+        <omgdi:waypoint x="602.5" y="315" />
-        <omgdi:waypoint x="441.0" y="560.0"/>
+        <omgdi:waypoint x="602.5" y="390" />
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
+          <omgdc:Bounds x="0" y="0" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="_7" id="BPMNEdge__7" sourceElement="start" targetElement="apply">
+      <bpmndi:BPMNEdge id="Flow_0jjkhjd_di" bpmnElement="Flow_0jjkhjd">
-        <omgdi:waypoint x="241.0" y="67.0"/>
+        <omgdi:waypoint x="603" y="445" />
-        <omgdi:waypoint x="241.0" y="160.0"/>
+        <omgdi:waypoint x="603" y="525" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="_8" id="BPMNEdge__8" sourceElement="apply" targetElement="office">
+      <bpmndi:BPMNEdge id="Flow_1y6f1el_di" bpmnElement="Flow_1y6f1el">
-        <omgdi:waypoint x="242.5" y="215.0"/>
+        <omgdi:waypoint x="601" y="580" />
-        <omgdi:waypoint x="242.5" y="290.0"/>
+        <omgdi:waypoint x="601" y="644" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>