From fe4989e8d2edb53b5cb066529ebbba7443d312a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=A4=A9=E5=B0=A7?=
 <10594804+zhangtianyao1578@user.noreply.gitee.com>
Date: Thu, 6 Feb 2025 10:20:24 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=80=9F=E7=AB=A0=E7=AE=A1=E7=90=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8F=AA=E8=A6=81=E5=8C=85?=
 =?UTF-8?q?=E5=90=AB=E6=B3=95=E4=BA=BA=E7=AB=A0/=E6=B3=95=E4=BA=BA?=
 =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E8=B5=B0borrowMetho=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=202.=E4=B8=8A=E8=AF=89=E6=B5=81=E7=A8=8B=E6=89=80?=
 =?UTF-8?q?=E9=95=BF=E4=B9=8B=E5=89=8D=E5=A2=9E=E5=8A=A0=E5=89=AF=E6=89=80?=
 =?UTF-8?q?=E9=95=BF=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../action/AdminSealManagementController.java | 25 +++++++++-----
 .../resources/processes/borrowMethod.bpmn     | 33 ++++++++++++++-----
 2 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/xqopen/kehui/admin/action/AdminSealManagementController.java b/src/main/java/com/xqopen/kehui/admin/action/AdminSealManagementController.java
index 026858a..706a6e8 100644
--- a/src/main/java/com/xqopen/kehui/admin/action/AdminSealManagementController.java
+++ b/src/main/java/com/xqopen/kehui/admin/action/AdminSealManagementController.java
@@ -171,18 +171,25 @@ public class AdminSealManagementController implements AdminSealManagementApi {
                 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;
+//                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;
+//                    }
+//                }
+                for (Integer i : sealType) {
+                    if(i==18||i==28){ //法人章(借)、法人身份证到所长(借章管理)
+                        type= activitiEnum.activitiType.borrowMethod; //流程图所长节点前面增加副所长节点
                             break;
                     }
                 }
+                if(type==null)type = activitiEnum.activitiType.borrow;
 //                type = activitiEnum.activitiType.borrow;
             }
         } else {
diff --git a/src/main/resources/processes/borrowMethod.bpmn b/src/main/resources/processes/borrowMethod.bpmn
index 9d8e3b0..48604ff 100644
--- a/src/main/resources/processes/borrowMethod.bpmn
+++ b/src/main/resources/processes/borrowMethod.bpmn
@@ -1,5 +1,5 @@
 <?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">
+<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="3.0.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" />
@@ -12,11 +12,13 @@
       <extensionElements>
         <activiti:taskListener class="com.xqopen.kehui.flows.util.MyTaskListener" event="create" />
       </extensionElements>
+      <outgoing>SequenceFlow_0d78n8w</outgoing>
     </userTask>
     <userTask id="director" name="所长" activiti:exclusive="true">
       <extensionElements>
         <activiti:taskListener class="com.xqopen.kehui.flows.util.MyTaskListener" event="create" />
       </extensionElements>
+      <incoming>SequenceFlow_1o74bdn</incoming>
     </userTask>
     <endEvent id="end" name="EndEvent">
       <extensionElements>
@@ -26,7 +28,15 @@
     <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" />
+    <userTask id="depDirector" name="副所长" activiti:exclusive="true">
+      <extensionElements>
+        <activiti:taskListener class="com.xqopen.kehui.flows.util.MyTaskListener" event="create" />
+      </extensionElements>
+      <incoming>SequenceFlow_0d78n8w</incoming>
+      <outgoing>SequenceFlow_1o74bdn</outgoing>
+    </userTask>
+    <sequenceFlow id="SequenceFlow_0d78n8w" sourceRef="office" targetRef="depDirector" />
+    <sequenceFlow id="SequenceFlow_1o74bdn" sourceRef="depDirector" 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">
@@ -86,13 +96,6 @@
           <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" />
@@ -100,6 +103,18 @@
           <omgdc:Bounds x="0" y="0" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="UserTask_14yrmqi_di" bpmnElement="depDirector">
+        <omgdc:Bounds x="529" y="450" width="85" height="55" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0d78n8w_di" bpmnElement="SequenceFlow_0d78n8w">
+        <omgdi:waypoint x="460" y="478" />
+        <omgdi:waypoint x="529" y="478" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1o74bdn_di" bpmnElement="SequenceFlow_1o74bdn">
+        <omgdi:waypoint x="572" y="505" />
+        <omgdi:waypoint x="572" y="593" />
+        <omgdi:waypoint x="460" y="593" />
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </definitions>