WordTemplate

src/main/java/com/common/workflow/service/util/WordTemplate.java

@@ -39,7 +39,8 @@ public class WordTemplate {
         if(null != tableCommentObj && tableComment.size() > 0) {
             template = XWPFTemplate.compile(fullFileName, builder.build()).render(datas);
         } else {
-            template = XWPFTemplate.compile(fullFileName).render(datas);
+            template = XWPFTemplate.compile(fullFileName);
+            template = template.render(datas);
         }
         return template;
     }

src/main/resources/processes/jl_data_apply.bpmn20.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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: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" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/processdef">
-  <process id="jl_data_apply" name="jl_data_apply" isExecutable="true">
-    <documentation>特检站数据录入审批</documentation>
+  <process id="jl_data_apply" name="tjz_data_apply" isExecutable="true">
+    <documentation>计量数据录入审批</documentation>
     <startEvent id="sid-9A4918D7-8376-4A00-928A-6415D92565EC" name="开始"></startEvent>
     <userTask id="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" name="主检人录入" activiti:assignee="${recorder}">
       <extensionElements>
@@ -9,44 +9,36 @@
       </extensionElements>
     </userTask>
     <sequenceFlow id="sid-842910A7-33C0-4DC1-B663-84C688761DA7" sourceRef="sid-9A4918D7-8376-4A00-928A-6415D92565EC" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397"></sequenceFlow>
-    <userTask id="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" name="审核人审批" activiti:assignee="${users}">
-      <extensionElements>
-        <modeler:initiator-can-complete xmlns:modeler="http://activiti.com/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
-      </extensionElements>
-    </userTask>
+    <userTask id="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" name="审核人审批" activiti:candidateUsers="${users}"></userTask>
     <exclusiveGateway id="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23"></exclusiveGateway>
     <endEvent id="sid-77299213-F8D1-477C-BC46-CA51DAFBF7C1"></endEvent>
-    <userTask id="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" name="校核人审批" activiti:assignee="${users}">
-      <extensionElements>
-        <modeler:initiator-can-complete xmlns:modeler="http://activiti.com/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
-      </extensionElements>
-    </userTask>
+    <userTask id="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" name="校核人审批" activiti:candidateUsers="${users}"></userTask>
     <exclusiveGateway id="sid-E3704DF5-A637-45A9-B5F7-1B62A32DA03D"></exclusiveGateway>
-    <sequenceFlow id="sid-89ED731E-278D-4033-8445-73676D8B5F0A" name="审批" sourceRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" targetRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23"></sequenceFlow>
     <exclusiveGateway id="sid-E178BD57-68C0-4C23-8952-143905257209"></exclusiveGateway>
-    <sequenceFlow id="sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D" sourceRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" targetRef="sid-E178BD57-68C0-4C23-8952-143905257209"></sequenceFlow>
     <sequenceFlow id="sid-0886E4B5-D361-4808-B79E-6FD0584D5045" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-E3704DF5-A637-45A9-B5F7-1B62A32DA03D"></sequenceFlow>
+    <sequenceFlow id="sid-B4E41A9C-BD67-46FB-880A-FABE14C52A79" name="主检和校检人同一人" sourceRef="sid-E3704DF5-A637-45A9-B5F7-1B62A32DA03D" targetRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
     <sequenceFlow id="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" name="不通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==false}]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-1B021838-AC8E-490A-BD5E-40A924BBE8D5" name="通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==true}]]></conditionExpression>
+    <sequenceFlow id="sid-860EFAF5-3915-4375-BF5D-AB7D4E36DB60" name="非同一人" sourceRef="sid-E3704DF5-A637-45A9-B5F7-1B62A32DA03D" targetRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C" name="审核不通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==false}]]></conditionExpression>
+    <sequenceFlow id="sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D" sourceRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" targetRef="sid-E178BD57-68C0-4C23-8952-143905257209"></sequenceFlow>
+    <sequenceFlow id="sid-1B021838-AC8E-490A-BD5E-40A924BBE8D5" name="通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
+    <sequenceFlow id="sid-89ED731E-278D-4033-8445-73676D8B5F0A" name="审批" sourceRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" targetRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23"></sequenceFlow>
     <sequenceFlow id="sid-F310DD92-E424-4EB6-839D-DC32E008CFEC" name="审核通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-77299213-F8D1-477C-BC46-CA51DAFBF7C1">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==true}]]></conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="sid-860EFAF5-3915-4375-BF5D-AB7D4E36DB60" name="非同一人" sourceRef="sid-E3704DF5-A637-45A9-B5F7-1B62A32DA03D" targetRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==false}]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
     </sequenceFlow>
-    <sequenceFlow id="sid-B4E41A9C-BD67-46FB-880A-FABE14C52A79" name="主检和校检人同一人" sourceRef="sid-E3704DF5-A637-45A9-B5F7-1B62A32DA03D" targetRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==true}]]></conditionExpression>
+    <sequenceFlow id="sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C" name="审核不通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
     </sequenceFlow>
   </process>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_jl_data_apply">
-    <bpmndi:BPMNPlane bpmnElement="jl_data_apply" id="BPMNPlane_jl_data_apply">
+  <bpmndi:BPMNDiagram id="BPMNDiagram_tjz_data_apply">
+    <bpmndi:BPMNPlane bpmnElement="tjz_data_apply" id="BPMNPlane_tjz_data_apply">
       <bpmndi:BPMNShape bpmnElement="sid-9A4918D7-8376-4A00-928A-6415D92565EC" id="BPMNShape_sid-9A4918D7-8376-4A00-928A-6415D92565EC">
         <omgdc:Bounds height="30.0" width="30.0" x="39.66663571640221" y="284.99999735090466"></omgdc:Bounds>
       </bpmndi:BPMNShape>
@@ -57,7 +49,7 @@
         <omgdc:Bounds height="79.99999999999994" width="100.0" x="705.0000000000002" y="259.9999973509047"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" id="BPMNShape_sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23">
-        <omgdc:Bounds height="40.0" width="40.0" x="870.0000000000001" y="270.00000000000006"></omgdc:Bounds>
+        <omgdc:Bounds height="40.0" width="40.0" x="870.0000000000001" y="279.9999973509048"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-77299213-F8D1-477C-BC46-CA51DAFBF7C1" id="BPMNShape_sid-77299213-F8D1-477C-BC46-CA51DAFBF7C1">
         <omgdc:Bounds height="28.0" width="28.0" x="979.6666357164022" y="285.99999735090466"></omgdc:Bounds>
@@ -72,27 +64,25 @@
         <omgdc:Bounds height="40.0" width="40.0" x="584.6666357164023" y="279.9999973509047"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sid-89ED731E-278D-4033-8445-73676D8B5F0A" id="BPMNEdge_sid-89ED731E-278D-4033-8445-73676D8B5F0A">
-        <omgdi:waypoint x="805.0000000000002" y="299.99999735090466"></omgdi:waypoint>
-        <omgdi:waypoint x="837.5000000000002" y="299.99999735090466"></omgdi:waypoint>
-        <omgdi:waypoint x="837.5000000000002" y="290.00000000000006"></omgdi:waypoint>
-        <omgdi:waypoint x="870.0000000000001" y="290.00000000000006"></omgdi:waypoint>
+        <omgdi:waypoint x="805.0000000000002" y="299.9999973509047"></omgdi:waypoint>
+        <omgdi:waypoint x="870.0000000000001" y="299.9999973509048"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C" id="BPMNEdge_sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C">
-        <omgdi:waypoint x="890.0000000000001" y="310.00000000000006"></omgdi:waypoint>
+        <omgdi:waypoint x="890.0000000000001" y="319.9999973509048"></omgdi:waypoint>
         <omgdi:waypoint x="890.0000000000001" y="412.0"></omgdi:waypoint>
         <omgdi:waypoint x="184.66663571640223" y="412.0"></omgdi:waypoint>
         <omgdi:waypoint x="184.66663571640223" y="339.9999973509048"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-860EFAF5-3915-4375-BF5D-AB7D4E36DB60" id="BPMNEdge_sid-860EFAF5-3915-4375-BF5D-AB7D4E36DB60">
-        <omgdi:waypoint x="325.0000000000001" y="299.9999973509047"></omgdi:waypoint>
-        <omgdi:waypoint x="419.6666357164023" y="299.9999973509047"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-B4E41A9C-BD67-46FB-880A-FABE14C52A79" id="BPMNEdge_sid-B4E41A9C-BD67-46FB-880A-FABE14C52A79">
         <omgdi:waypoint x="305.0000000000001" y="279.9999973509047"></omgdi:waypoint>
         <omgdi:waypoint x="305.0000000000001" y="216.0"></omgdi:waypoint>
         <omgdi:waypoint x="755.0000000000002" y="216.0"></omgdi:waypoint>
         <omgdi:waypoint x="755.0000000000002" y="259.9999973509047"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-860EFAF5-3915-4375-BF5D-AB7D4E36DB60" id="BPMNEdge_sid-860EFAF5-3915-4375-BF5D-AB7D4E36DB60">
+        <omgdi:waypoint x="325.0000000000001" y="299.9999973509047"></omgdi:waypoint>
+        <omgdi:waypoint x="419.6666357164023" y="299.9999973509047"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-842910A7-33C0-4DC1-B663-84C688761DA7" id="BPMNEdge_sid-842910A7-33C0-4DC1-B663-84C688761DA7">
         <omgdi:waypoint x="69.66663571640221" y="299.99999735090466"></omgdi:waypoint>
         <omgdi:waypoint x="134.66663571640223" y="299.9999973509047"></omgdi:waypoint>
@@ -106,9 +96,7 @@
         <omgdi:waypoint x="285.0000000000001" y="299.9999973509047"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-F310DD92-E424-4EB6-839D-DC32E008CFEC" id="BPMNEdge_sid-F310DD92-E424-4EB6-839D-DC32E008CFEC">
-        <omgdi:waypoint x="910.0000000000001" y="290.00000000000006"></omgdi:waypoint>
-        <omgdi:waypoint x="944.8333178582011" y="290.00000000000006"></omgdi:waypoint>
-        <omgdi:waypoint x="944.8333178582011" y="299.99999735090466"></omgdi:waypoint>
+        <omgdi:waypoint x="910.0000000000001" y="299.9999973509048"></omgdi:waypoint>
         <omgdi:waypoint x="979.6666357164022" y="299.99999735090466"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D" id="BPMNEdge_sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D">

src/main/resources/processes/jl_report_assign.bpmn20.xml

@@ -3,7 +3,7 @@
   <process id="jl_report_assign" name="jl_report_assign" isExecutable="true">
     <documentation>计量报告审批流程</documentation>
     <startEvent id="sid-9A4918D7-8376-4A00-928A-6415D92565EC" name="开始"></startEvent>
-    <userTask id="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" name="报告生成" activiti:candidateUsers="${users}"></userTask>
+    <userTask id="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" name="报告生成" activiti:assignee="${recorder}"></userTask>
     <userTask id="sid-B5298B7E-C893-4EA1-91F4-170B627F9AC8" name="报告审批" activiti:candidateUsers="${users}"></userTask>
     <intermediateThrowEvent id="sid-EE4618BC-DB06-4D0C-9E5A-D4C1C8CAE24C" name="完成"></intermediateThrowEvent>
     <sequenceFlow id="sid-842910A7-33C0-4DC1-B663-84C688761DA7" sourceRef="sid-9A4918D7-8376-4A00-928A-6415D92565EC" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397"></sequenceFlow>
@@ -15,22 +15,22 @@
     <sequenceFlow id="sid-42A03783-3685-45F9-BBD4-4522DF618C62" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-FCDC217C-B6F1-4824-B8F6-26440D293180"></sequenceFlow>
     <sequenceFlow id="sid-E09B5406-369A-4A21-98EC-F5C8B6E4758B" sourceRef="sid-3EDD51D6-EA16-4B12-84BE-11B81EDBA93A" targetRef="sid-7F404068-96C3-4BA0-A7D7-95CECB552249"></sequenceFlow>
     <sequenceFlow id="sid-0969E7A1-C840-4F1E-A3DC-549610CC5C21" name="提交" sourceRef="sid-FCDC217C-B6F1-4824-B8F6-26440D293180" targetRef="sid-B5298B7E-C893-4EA1-91F4-170B627F9AC8">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result} == 1]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result == 1}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-0E18B9F7-F9AC-46EF-A6DB-22F720658BAD" name="签发成功" sourceRef="sid-7F404068-96C3-4BA0-A7D7-95CECB552249" targetRef="sid-EE4618BC-DB06-4D0C-9E5A-D4C1C8CAE24C">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result} == 1]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result == 1}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-5C6C9B5D-CF13-4F13-975B-32E397CE135E" name="审批通过" sourceRef="sid-F66E66CE-729D-49A3-BC6B-C4B3ADA719B3" targetRef="sid-3EDD51D6-EA16-4B12-84BE-11B81EDBA93A">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result} == 1]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result == 1}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-971E33E5-933C-47B5-BEC1-83B249CB22BE" name="取消" sourceRef="sid-FCDC217C-B6F1-4824-B8F6-26440D293180" targetRef="sid-EE4618BC-DB06-4D0C-9E5A-D4C1C8CAE24C">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result} == 0]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result == 0}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-B0941767-A6B6-4406-82DC-BF6FFBDD2440" name="审批未通过" sourceRef="sid-F66E66CE-729D-49A3-BC6B-C4B3ADA719B3" targetRef="sid-EE4618BC-DB06-4D0C-9E5A-D4C1C8CAE24C">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result} == 0]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result == 0}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-56EAF2F5-1D6C-4F83-8073-61E3F95D8783" name="签发未通过" sourceRef="sid-7F404068-96C3-4BA0-A7D7-95CECB552249" targetRef="sid-EE4618BC-DB06-4D0C-9E5A-D4C1C8CAE24C">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result} == 0]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result == 0}]]></conditionExpression>
     </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_jl_report_assign">
@@ -107,4 +107,4 @@
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-</definitions>
+</definitions>

src/main/resources/processes/jn_data_apply.bpmn20.xml

@@ -1,104 +1,113 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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: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" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/processdef">
-  <process id="jn_data_apply" name="技能数据录入审批流程" isExecutable="true">
-    <startEvent id="startEvent1" name="开始"></startEvent>
-    <userTask id="sid-E2CB7929-2E5D-48B2-B9B4-0CB7C158DE4D" name="主检人录入" activiti:assignee="${recorder}">
+  <process id="jn_data_apply" name="jn_data_apply" isExecutable="true">
+    <documentation>节能数据录入审批</documentation>
+    <startEvent id="sid-9A4918D7-8376-4A00-928A-6415D92565EC" name="开始"></startEvent>
+    <userTask id="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" name="主检人录入" activiti:assignee="${recorder}">
       <extensionElements>
         <modeler:initiator-can-complete xmlns:modeler="http://activiti.com/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
       </extensionElements>
     </userTask>
-    <sequenceFlow id="sid-F101F75C-FC06-48EF-878F-3842C61B68E4" sourceRef="startEvent1" targetRef="sid-E2CB7929-2E5D-48B2-B9B4-0CB7C158DE4D"></sequenceFlow>
-    <exclusiveGateway id="sid-862692D4-49F1-4557-AC39-F3D1AC7AC3A3"></exclusiveGateway>
-    <sequenceFlow id="sid-D5EB9F24-DB82-4CAD-BB5B-31B833083241" sourceRef="sid-E2CB7929-2E5D-48B2-B9B4-0CB7C158DE4D" targetRef="sid-862692D4-49F1-4557-AC39-F3D1AC7AC3A3"></sequenceFlow>
-    <userTask id="sid-5753A416-51E6-46F1-98C4-34988F496843" name="校核人审批"></userTask>
-    <exclusiveGateway id="sid-C0DDC436-4B73-4FED-B244-85560B852ED1"></exclusiveGateway>
-    <sequenceFlow id="sid-67C1DC9B-5172-41C8-9573-917B6BF4DE31" sourceRef="sid-5753A416-51E6-46F1-98C4-34988F496843" targetRef="sid-C0DDC436-4B73-4FED-B244-85560B852ED1"></sequenceFlow>
-    <userTask id="sid-4F879124-0943-4E76-A57C-6DED9F569843" name="审批人审批" activiti:assignee="${users}">
-      <extensionElements>
-        <modeler:initiator-can-complete xmlns:modeler="http://activiti.com/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
-      </extensionElements>
-    </userTask>
-    <exclusiveGateway id="sid-F23C5EF4-E1A3-4568-9205-84A2F3B44B59"></exclusiveGateway>
-    <sequenceFlow id="sid-EAD24598-4D25-4261-B315-A25FBE5121A0" sourceRef="sid-4F879124-0943-4E76-A57C-6DED9F569843" targetRef="sid-F23C5EF4-E1A3-4568-9205-84A2F3B44B59"></sequenceFlow>
-    <endEvent id="sid-5C013B33-F46B-497F-A4D2-3D0B78E3E6B3"></endEvent>
-    <sequenceFlow id="sid-03C09DB2-B6B9-4E59-906A-13A50E04C0F8" name="主检人和校核人是同一人" sourceRef="sid-862692D4-49F1-4557-AC39-F3D1AC7AC3A3" targetRef="sid-4F879124-0943-4E76-A57C-6DED9F569843"></sequenceFlow>
-    <sequenceFlow id="sid-139BCD80-6CE9-4F4E-8C9A-14F75B7C478E" name="不同人" sourceRef="sid-862692D4-49F1-4557-AC39-F3D1AC7AC3A3" targetRef="sid-5753A416-51E6-46F1-98C4-34988F496843"></sequenceFlow>
-    <sequenceFlow id="sid-1A1E0EA8-5C3C-4EF6-B80B-6604E6795180" name="通过" sourceRef="sid-C0DDC436-4B73-4FED-B244-85560B852ED1" targetRef="sid-4F879124-0943-4E76-A57C-6DED9F569843"></sequenceFlow>
-    <sequenceFlow id="sid-90EB527F-D953-4031-AC1D-48C4EBC6EEE1" name="不通过" sourceRef="sid-C0DDC436-4B73-4FED-B244-85560B852ED1" targetRef="sid-E2CB7929-2E5D-48B2-B9B4-0CB7C158DE4D"></sequenceFlow>
-    <sequenceFlow id="sid-D999FAC5-4DED-4DB9-9588-F0C40000D172" name="审核通过" sourceRef="sid-F23C5EF4-E1A3-4568-9205-84A2F3B44B59" targetRef="sid-5C013B33-F46B-497F-A4D2-3D0B78E3E6B3"></sequenceFlow>
-    <sequenceFlow id="sid-49A900EC-7F01-4491-AAAE-DA87CC8598CC" name="不通过" sourceRef="sid-F23C5EF4-E1A3-4568-9205-84A2F3B44B59" targetRef="sid-E2CB7929-2E5D-48B2-B9B4-0CB7C158DE4D"></sequenceFlow>
+    <sequenceFlow id="sid-842910A7-33C0-4DC1-B663-84C688761DA7" sourceRef="sid-9A4918D7-8376-4A00-928A-6415D92565EC" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397"></sequenceFlow>
+    <userTask id="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" name="审核人审批" activiti:candidateUsers="${users}"></userTask>
+    <exclusiveGateway id="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23"></exclusiveGateway>
+    <endEvent id="sid-77299213-F8D1-477C-BC46-CA51DAFBF7C1"></endEvent>
+    <userTask id="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" name="校核人审批" activiti:candidateUsers="${users}"></userTask>
+    <exclusiveGateway id="sid-E3704DF5-A637-45A9-B5F7-1B62A32DA03D"></exclusiveGateway>
+    <exclusiveGateway id="sid-E178BD57-68C0-4C23-8952-143905257209"></exclusiveGateway>
+    <sequenceFlow id="sid-0886E4B5-D361-4808-B79E-6FD0584D5045" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-E3704DF5-A637-45A9-B5F7-1B62A32DA03D"></sequenceFlow>
+    <sequenceFlow id="sid-B4E41A9C-BD67-46FB-880A-FABE14C52A79" name="主检和校检人同一人" sourceRef="sid-E3704DF5-A637-45A9-B5F7-1B62A32DA03D" targetRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-860EFAF5-3915-4375-BF5D-AB7D4E36DB60" name="非同一人" sourceRef="sid-E3704DF5-A637-45A9-B5F7-1B62A32DA03D" targetRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D" sourceRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" targetRef="sid-E178BD57-68C0-4C23-8952-143905257209"></sequenceFlow>
+    <sequenceFlow id="sid-1B021838-AC8E-490A-BD5E-40A924BBE8D5" name="通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-89ED731E-278D-4033-8445-73676D8B5F0A" name="审批" sourceRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" targetRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23"></sequenceFlow>
+    <sequenceFlow id="sid-F310DD92-E424-4EB6-839D-DC32E008CFEC" name="审核通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-77299213-F8D1-477C-BC46-CA51DAFBF7C1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" name="不通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C" name="审核不通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_jn_data_apply">
     <bpmndi:BPMNPlane bpmnElement="jn_data_apply" id="BPMNPlane_jn_data_apply">
-      <bpmndi:BPMNShape bpmnElement="startEvent1" id="BPMNShape_startEvent1">
-        <omgdc:Bounds height="30.0" width="30.0" x="45.0" y="163.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="sid-9A4918D7-8376-4A00-928A-6415D92565EC" id="BPMNShape_sid-9A4918D7-8376-4A00-928A-6415D92565EC">
+        <omgdc:Bounds height="30.0" width="30.0" x="45.0" y="284.9999973509048"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="sid-E2CB7929-2E5D-48B2-B9B4-0CB7C158DE4D" id="BPMNShape_sid-E2CB7929-2E5D-48B2-B9B4-0CB7C158DE4D">
-        <omgdc:Bounds height="80.0" width="100.0" x="105.0" y="135.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" id="BPMNShape_sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
+        <omgdc:Bounds height="80.0" width="100.0" x="135.0" y="259.9999973509048"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="sid-862692D4-49F1-4557-AC39-F3D1AC7AC3A3" id="BPMNShape_sid-862692D4-49F1-4557-AC39-F3D1AC7AC3A3">
-        <omgdc:Bounds height="40.0" width="40.0" x="265.0" y="155.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" id="BPMNShape_sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF">
+        <omgdc:Bounds height="79.99999999999994" width="100.0" x="705.0000000000002" y="259.9999973509047"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="sid-5753A416-51E6-46F1-98C4-34988F496843" id="BPMNShape_sid-5753A416-51E6-46F1-98C4-34988F496843">
-        <omgdc:Bounds height="80.0" width="100.0" x="345.0" y="135.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" id="BPMNShape_sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23">
+        <omgdc:Bounds height="40.0" width="40.0" x="870.0000000000001" y="279.9999973509048"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="sid-C0DDC436-4B73-4FED-B244-85560B852ED1" id="BPMNShape_sid-C0DDC436-4B73-4FED-B244-85560B852ED1">
-        <omgdc:Bounds height="40.0" width="40.0" x="495.0" y="155.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="sid-77299213-F8D1-477C-BC46-CA51DAFBF7C1" id="BPMNShape_sid-77299213-F8D1-477C-BC46-CA51DAFBF7C1">
+        <omgdc:Bounds height="28.0" width="28.0" x="979.6666357164022" y="285.99999735090466"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="sid-4F879124-0943-4E76-A57C-6DED9F569843" id="BPMNShape_sid-4F879124-0943-4E76-A57C-6DED9F569843">
-        <omgdc:Bounds height="80.0" width="100.0" x="570.0" y="135.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" id="BPMNShape_sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
+        <omgdc:Bounds height="80.0" width="100.0" x="419.6666357164023" y="259.9999973509047"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="sid-F23C5EF4-E1A3-4568-9205-84A2F3B44B59" id="BPMNShape_sid-F23C5EF4-E1A3-4568-9205-84A2F3B44B59">
-        <omgdc:Bounds height="40.0" width="40.0" x="725.0" y="155.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="sid-E3704DF5-A637-45A9-B5F7-1B62A32DA03D" id="BPMNShape_sid-E3704DF5-A637-45A9-B5F7-1B62A32DA03D">
+        <omgdc:Bounds height="40.0" width="40.0" x="285.0000000000001" y="279.9999973509047"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="sid-5C013B33-F46B-497F-A4D2-3D0B78E3E6B3" id="BPMNShape_sid-5C013B33-F46B-497F-A4D2-3D0B78E3E6B3">
-        <omgdc:Bounds height="28.0" width="28.0" x="810.0" y="161.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="sid-E178BD57-68C0-4C23-8952-143905257209" id="BPMNShape_sid-E178BD57-68C0-4C23-8952-143905257209">
+        <omgdc:Bounds height="40.0" width="40.0" x="584.6666357164023" y="279.9999973509047"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="sid-EAD24598-4D25-4261-B315-A25FBE5121A0" id="BPMNEdge_sid-EAD24598-4D25-4261-B315-A25FBE5121A0">
-        <omgdi:waypoint x="670.0" y="175.199203187251"></omgdi:waypoint>
-        <omgdi:waypoint x="725.42" y="175.42000000000002"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-89ED731E-278D-4033-8445-73676D8B5F0A" id="BPMNEdge_sid-89ED731E-278D-4033-8445-73676D8B5F0A">
+        <omgdi:waypoint x="805.0000000000002" y="299.9999973509047"></omgdi:waypoint>
+        <omgdi:waypoint x="870.0000000000001" y="299.9999973509048"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-03C09DB2-B6B9-4E59-906A-13A50E04C0F8" id="BPMNEdge_sid-03C09DB2-B6B9-4E59-906A-13A50E04C0F8">
-        <omgdi:waypoint x="285.5" y="155.5"></omgdi:waypoint>
-        <omgdi:waypoint x="285.5" y="59.0"></omgdi:waypoint>
-        <omgdi:waypoint x="620.0" y="59.0"></omgdi:waypoint>
-        <omgdi:waypoint x="620.0" y="135.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C" id="BPMNEdge_sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C">
+        <omgdi:waypoint x="890.0000000000001" y="319.9999973509048"></omgdi:waypoint>
+        <omgdi:waypoint x="890.0000000000001" y="412.0"></omgdi:waypoint>
+        <omgdi:waypoint x="185.0" y="412.0"></omgdi:waypoint>
+        <omgdi:waypoint x="185.0" y="339.9999973509048"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-F101F75C-FC06-48EF-878F-3842C61B68E4" id="BPMNEdge_sid-F101F75C-FC06-48EF-878F-3842C61B68E4">
-        <omgdi:waypoint x="74.99252636485839" y="177.52655179900447"></omgdi:waypoint>
-        <omgdi:waypoint x="105.0" y="176.57894736842104"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-B4E41A9C-BD67-46FB-880A-FABE14C52A79" id="BPMNEdge_sid-B4E41A9C-BD67-46FB-880A-FABE14C52A79">
+        <omgdi:waypoint x="305.0000000000001" y="279.9999973509047"></omgdi:waypoint>
+        <omgdi:waypoint x="305.0000000000001" y="216.0"></omgdi:waypoint>
+        <omgdi:waypoint x="755.0000000000002" y="216.0"></omgdi:waypoint>
+        <omgdi:waypoint x="755.0000000000002" y="259.9999973509047"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-D999FAC5-4DED-4DB9-9588-F0C40000D172" id="BPMNEdge_sid-D999FAC5-4DED-4DB9-9588-F0C40000D172">
-        <omgdi:waypoint x="764.6217948717949" y="175.37820512820514"></omgdi:waypoint>
-        <omgdi:waypoint x="810.0002839785394" y="175.0891701657418"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-860EFAF5-3915-4375-BF5D-AB7D4E36DB60" id="BPMNEdge_sid-860EFAF5-3915-4375-BF5D-AB7D4E36DB60">
+        <omgdi:waypoint x="325.0000000000001" y="299.9999973509047"></omgdi:waypoint>
+        <omgdi:waypoint x="419.6666357164023" y="299.9999973509047"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-139BCD80-6CE9-4F4E-8C9A-14F75B7C478E" id="BPMNEdge_sid-139BCD80-6CE9-4F4E-8C9A-14F75B7C478E">
-        <omgdi:waypoint x="304.58715596330273" y="175.41284403669724"></omgdi:waypoint>
-        <omgdi:waypoint x="345.0" y="175.2283105022831"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-842910A7-33C0-4DC1-B663-84C688761DA7" id="BPMNEdge_sid-842910A7-33C0-4DC1-B663-84C688761DA7">
+        <omgdi:waypoint x="75.0" y="299.9999973509048"></omgdi:waypoint>
+        <omgdi:waypoint x="135.0" y="299.9999973509048"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-67C1DC9B-5172-41C8-9573-917B6BF4DE31" id="BPMNEdge_sid-67C1DC9B-5172-41C8-9573-917B6BF4DE31">
-        <omgdi:waypoint x="445.0" y="175.20746887966806"></omgdi:waypoint>
-        <omgdi:waypoint x="495.4166666666667" y="175.41666666666666"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-1B021838-AC8E-490A-BD5E-40A924BBE8D5" id="BPMNEdge_sid-1B021838-AC8E-490A-BD5E-40A924BBE8D5">
+        <omgdi:waypoint x="624.6666357164023" y="299.9999973509047"></omgdi:waypoint>
+        <omgdi:waypoint x="705.0000000000002" y="299.99999735090466"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-90EB527F-D953-4031-AC1D-48C4EBC6EEE1" id="BPMNEdge_sid-90EB527F-D953-4031-AC1D-48C4EBC6EEE1">
-        <omgdi:waypoint x="515.5" y="194.5"></omgdi:waypoint>
-        <omgdi:waypoint x="515.5" y="248.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="248.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="215.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-0886E4B5-D361-4808-B79E-6FD0584D5045" id="BPMNEdge_sid-0886E4B5-D361-4808-B79E-6FD0584D5045">
+        <omgdi:waypoint x="235.0" y="299.9999973509048"></omgdi:waypoint>
+        <omgdi:waypoint x="285.0000000000001" y="299.9999973509047"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-49A900EC-7F01-4491-AAAE-DA87CC8598CC" id="BPMNEdge_sid-49A900EC-7F01-4491-AAAE-DA87CC8598CC">
-        <omgdi:waypoint x="745.5" y="194.5"></omgdi:waypoint>
-        <omgdi:waypoint x="745.5" y="268.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="268.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="215.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-F310DD92-E424-4EB6-839D-DC32E008CFEC" id="BPMNEdge_sid-F310DD92-E424-4EB6-839D-DC32E008CFEC">
+        <omgdi:waypoint x="910.0000000000001" y="299.9999973509048"></omgdi:waypoint>
+        <omgdi:waypoint x="979.6666357164022" y="299.99999735090466"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-1A1E0EA8-5C3C-4EF6-B80B-6604E6795180" id="BPMNEdge_sid-1A1E0EA8-5C3C-4EF6-B80B-6604E6795180">
-        <omgdi:waypoint x="534.5913461538462" y="175.40865384615384"></omgdi:waypoint>
-        <omgdi:waypoint x="570.0" y="175.23923444976077"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D" id="BPMNEdge_sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D">
+        <omgdi:waypoint x="519.6666357164023" y="299.9999973509047"></omgdi:waypoint>
+        <omgdi:waypoint x="584.6666357164023" y="299.9999973509047"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-D5EB9F24-DB82-4CAD-BB5B-31B833083241" id="BPMNEdge_sid-D5EB9F24-DB82-4CAD-BB5B-31B833083241">
-        <omgdi:waypoint x="205.0" y="175.19157088122606"></omgdi:waypoint>
-        <omgdi:waypoint x="265.4230769230769" y="175.42307692307693"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" id="BPMNEdge_sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32">
+        <omgdi:waypoint x="604.7496309390168" y="319.91700212829016"></omgdi:waypoint>
+        <omgdi:waypoint x="605.0" y="380.0"></omgdi:waypoint>
+        <omgdi:waypoint x="185.0" y="380.0"></omgdi:waypoint>
+        <omgdi:waypoint x="185.0" y="339.9999973509048"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

src/main/resources/processes/jn_report_assign.bpmn20.xml

@@ -3,7 +3,7 @@
   <process id="jn_report_assign" name="jn_report_assign" isExecutable="true">
     <documentation>节能报告审批流程</documentation>
     <startEvent id="sid-9A4918D7-8376-4A00-928A-6415D92565EC" name="开始"></startEvent>
-    <userTask id="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" name="报告生成" activiti:candidateUsers="${users}"></userTask>
+    <userTask id="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" name="报告生成" activiti:assignee="${recorder}"></userTask>
     <userTask id="sid-B5298B7E-C893-4EA1-91F4-170B627F9AC8" name="报告审批" activiti:candidateUsers="${users}"></userTask>
     <intermediateThrowEvent id="sid-EE4618BC-DB06-4D0C-9E5A-D4C1C8CAE24C" name="完成"></intermediateThrowEvent>
     <sequenceFlow id="sid-842910A7-33C0-4DC1-B663-84C688761DA7" sourceRef="sid-9A4918D7-8376-4A00-928A-6415D92565EC" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397"></sequenceFlow>
@@ -15,22 +15,22 @@
     <sequenceFlow id="sid-42A03783-3685-45F9-BBD4-4522DF618C62" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-FCDC217C-B6F1-4824-B8F6-26440D293180"></sequenceFlow>
     <sequenceFlow id="sid-E09B5406-369A-4A21-98EC-F5C8B6E4758B" sourceRef="sid-3EDD51D6-EA16-4B12-84BE-11B81EDBA93A" targetRef="sid-7F404068-96C3-4BA0-A7D7-95CECB552249"></sequenceFlow>
     <sequenceFlow id="sid-0969E7A1-C840-4F1E-A3DC-549610CC5C21" name="提交" sourceRef="sid-FCDC217C-B6F1-4824-B8F6-26440D293180" targetRef="sid-B5298B7E-C893-4EA1-91F4-170B627F9AC8">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result} == 1]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result == 1}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-0E18B9F7-F9AC-46EF-A6DB-22F720658BAD" name="签发成功" sourceRef="sid-7F404068-96C3-4BA0-A7D7-95CECB552249" targetRef="sid-EE4618BC-DB06-4D0C-9E5A-D4C1C8CAE24C">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result} == 1]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result == 1}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-5C6C9B5D-CF13-4F13-975B-32E397CE135E" name="审批通过" sourceRef="sid-F66E66CE-729D-49A3-BC6B-C4B3ADA719B3" targetRef="sid-3EDD51D6-EA16-4B12-84BE-11B81EDBA93A">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result} == 1]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result == 1}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-971E33E5-933C-47B5-BEC1-83B249CB22BE" name="取消" sourceRef="sid-FCDC217C-B6F1-4824-B8F6-26440D293180" targetRef="sid-EE4618BC-DB06-4D0C-9E5A-D4C1C8CAE24C">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result} == 0]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result == 0}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-B0941767-A6B6-4406-82DC-BF6FFBDD2440" name="审批未通过" sourceRef="sid-F66E66CE-729D-49A3-BC6B-C4B3ADA719B3" targetRef="sid-EE4618BC-DB06-4D0C-9E5A-D4C1C8CAE24C">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result} == 0]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result == 0}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-56EAF2F5-1D6C-4F83-8073-61E3F95D8783" name="签发未通过" sourceRef="sid-7F404068-96C3-4BA0-A7D7-95CECB552249" targetRef="sid-EE4618BC-DB06-4D0C-9E5A-D4C1C8CAE24C">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result} == 0]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result == 0}]]></conditionExpression>
     </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_jn_report_assign">
@@ -107,4 +107,4 @@
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-</definitions>
+</definitions>

src/main/resources/processes/wz_data_apply.bpmn20.xml

@@ -1,105 +1,113 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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: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" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/processdef">
   <process id="wz_data_apply" name="wz_data_apply" isExecutable="true">
-    <documentation>物资检验所数据录入审批流程</documentation>
-    <startEvent id="startEvent1" name="开始"></startEvent>
-    <userTask id="sid-E2CB7929-2E5D-48B2-B9B4-0CB7C158DE4D" name="主检人录入" activiti:assignee="${recorder}">
+    <documentation>物资检验所数据录入审批</documentation>
+    <startEvent id="sid-9A4918D7-8376-4A00-928A-6415D92565EC" name="开始"></startEvent>
+    <userTask id="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" name="主检人录入" activiti:assignee="${recorder}">
       <extensionElements>
         <modeler:initiator-can-complete xmlns:modeler="http://activiti.com/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
       </extensionElements>
     </userTask>
-    <sequenceFlow id="sid-F101F75C-FC06-48EF-878F-3842C61B68E4" sourceRef="startEvent1" targetRef="sid-E2CB7929-2E5D-48B2-B9B4-0CB7C158DE4D"></sequenceFlow>
-    <exclusiveGateway id="sid-862692D4-49F1-4557-AC39-F3D1AC7AC3A3"></exclusiveGateway>
-    <sequenceFlow id="sid-D5EB9F24-DB82-4CAD-BB5B-31B833083241" sourceRef="sid-E2CB7929-2E5D-48B2-B9B4-0CB7C158DE4D" targetRef="sid-862692D4-49F1-4557-AC39-F3D1AC7AC3A3"></sequenceFlow>
-    <userTask id="sid-5753A416-51E6-46F1-98C4-34988F496843" name="校核人审批"></userTask>
-    <exclusiveGateway id="sid-C0DDC436-4B73-4FED-B244-85560B852ED1"></exclusiveGateway>
-    <sequenceFlow id="sid-67C1DC9B-5172-41C8-9573-917B6BF4DE31" sourceRef="sid-5753A416-51E6-46F1-98C4-34988F496843" targetRef="sid-C0DDC436-4B73-4FED-B244-85560B852ED1"></sequenceFlow>
-    <userTask id="sid-4F879124-0943-4E76-A57C-6DED9F569843" name="审批人审批" activiti:assignee="${users}">
-      <extensionElements>
-        <modeler:initiator-can-complete xmlns:modeler="http://activiti.com/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
-      </extensionElements>
-    </userTask>
-    <exclusiveGateway id="sid-F23C5EF4-E1A3-4568-9205-84A2F3B44B59"></exclusiveGateway>
-    <sequenceFlow id="sid-EAD24598-4D25-4261-B315-A25FBE5121A0" sourceRef="sid-4F879124-0943-4E76-A57C-6DED9F569843" targetRef="sid-F23C5EF4-E1A3-4568-9205-84A2F3B44B59"></sequenceFlow>
-    <endEvent id="sid-5C013B33-F46B-497F-A4D2-3D0B78E3E6B3"></endEvent>
-    <sequenceFlow id="sid-03C09DB2-B6B9-4E59-906A-13A50E04C0F8" name="主检人和校核人是同一人" sourceRef="sid-862692D4-49F1-4557-AC39-F3D1AC7AC3A3" targetRef="sid-4F879124-0943-4E76-A57C-6DED9F569843"></sequenceFlow>
-    <sequenceFlow id="sid-139BCD80-6CE9-4F4E-8C9A-14F75B7C478E" name="不同人" sourceRef="sid-862692D4-49F1-4557-AC39-F3D1AC7AC3A3" targetRef="sid-5753A416-51E6-46F1-98C4-34988F496843"></sequenceFlow>
-    <sequenceFlow id="sid-1A1E0EA8-5C3C-4EF6-B80B-6604E6795180" name="通过" sourceRef="sid-C0DDC436-4B73-4FED-B244-85560B852ED1" targetRef="sid-4F879124-0943-4E76-A57C-6DED9F569843"></sequenceFlow>
-    <sequenceFlow id="sid-90EB527F-D953-4031-AC1D-48C4EBC6EEE1" name="不通过" sourceRef="sid-C0DDC436-4B73-4FED-B244-85560B852ED1" targetRef="sid-E2CB7929-2E5D-48B2-B9B4-0CB7C158DE4D"></sequenceFlow>
-    <sequenceFlow id="sid-D999FAC5-4DED-4DB9-9588-F0C40000D172" name="审核通过" sourceRef="sid-F23C5EF4-E1A3-4568-9205-84A2F3B44B59" targetRef="sid-5C013B33-F46B-497F-A4D2-3D0B78E3E6B3"></sequenceFlow>
-    <sequenceFlow id="sid-49A900EC-7F01-4491-AAAE-DA87CC8598CC" name="不通过" sourceRef="sid-F23C5EF4-E1A3-4568-9205-84A2F3B44B59" targetRef="sid-E2CB7929-2E5D-48B2-B9B4-0CB7C158DE4D"></sequenceFlow>
+    <sequenceFlow id="sid-842910A7-33C0-4DC1-B663-84C688761DA7" sourceRef="sid-9A4918D7-8376-4A00-928A-6415D92565EC" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397"></sequenceFlow>
+    <userTask id="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" name="审核人审批" activiti:candidateUsers="${users}"></userTask>
+    <exclusiveGateway id="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23"></exclusiveGateway>
+    <endEvent id="sid-77299213-F8D1-477C-BC46-CA51DAFBF7C1"></endEvent>
+    <userTask id="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" name="校核人审批" activiti:candidateUsers="${users}"></userTask>
+    <exclusiveGateway id="sid-E3704DF5-A637-45A9-B5F7-1B62A32DA03D"></exclusiveGateway>
+    <exclusiveGateway id="sid-E178BD57-68C0-4C23-8952-143905257209"></exclusiveGateway>
+    <sequenceFlow id="sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D" sourceRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" targetRef="sid-E178BD57-68C0-4C23-8952-143905257209"></sequenceFlow>
+    <sequenceFlow id="sid-0886E4B5-D361-4808-B79E-6FD0584D5045" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-E3704DF5-A637-45A9-B5F7-1B62A32DA03D"></sequenceFlow>
+    <sequenceFlow id="sid-1B021838-AC8E-490A-BD5E-40A924BBE8D5" name="通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-89ED731E-278D-4033-8445-73676D8B5F0A" name="审批" sourceRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" targetRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23"></sequenceFlow>
+    <sequenceFlow id="sid-F310DD92-E424-4EB6-839D-DC32E008CFEC" name="审核通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-77299213-F8D1-477C-BC46-CA51DAFBF7C1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C" name="审核不通过" sourceRef="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" name="不通过" sourceRef="sid-E178BD57-68C0-4C23-8952-143905257209" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-860EFAF5-3915-4375-BF5D-AB7D4E36DB60" name="非同一人" sourceRef="sid-E3704DF5-A637-45A9-B5F7-1B62A32DA03D" targetRef="sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-B4E41A9C-BD67-46FB-880A-FABE14C52A79" name="主检和校检人同一人" sourceRef="sid-E3704DF5-A637-45A9-B5F7-1B62A32DA03D" targetRef="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result==1}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_wz_data_apply">
     <bpmndi:BPMNPlane bpmnElement="wz_data_apply" id="BPMNPlane_wz_data_apply">
-      <bpmndi:BPMNShape bpmnElement="startEvent1" id="BPMNShape_startEvent1">
-        <omgdc:Bounds height="30.0" width="30.0" x="45.0" y="163.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="sid-9A4918D7-8376-4A00-928A-6415D92565EC" id="BPMNShape_sid-9A4918D7-8376-4A00-928A-6415D92565EC">
+        <omgdc:Bounds height="30.0" width="30.0" x="39.66663571640221" y="284.99999735090466"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="sid-E2CB7929-2E5D-48B2-B9B4-0CB7C158DE4D" id="BPMNShape_sid-E2CB7929-2E5D-48B2-B9B4-0CB7C158DE4D">
-        <omgdc:Bounds height="80.0" width="100.0" x="105.0" y="135.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" id="BPMNShape_sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397">
+        <omgdc:Bounds height="80.0" width="100.0" x="134.66663571640223" y="259.9999973509048"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="sid-862692D4-49F1-4557-AC39-F3D1AC7AC3A3" id="BPMNShape_sid-862692D4-49F1-4557-AC39-F3D1AC7AC3A3">
-        <omgdc:Bounds height="40.0" width="40.0" x="265.0" y="155.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF" id="BPMNShape_sid-A6FC1B75-D365-4060-8F2D-797DAD1399EF">
+        <omgdc:Bounds height="79.99999999999994" width="100.0" x="705.0000000000002" y="259.9999973509047"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="sid-5753A416-51E6-46F1-98C4-34988F496843" id="BPMNShape_sid-5753A416-51E6-46F1-98C4-34988F496843">
-        <omgdc:Bounds height="80.0" width="100.0" x="345.0" y="135.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23" id="BPMNShape_sid-A41AC05B-4D7E-4159-80B2-CE3B0B60AF23">
+        <omgdc:Bounds height="40.0" width="40.0" x="870.0000000000001" y="279.9999973509048"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="sid-C0DDC436-4B73-4FED-B244-85560B852ED1" id="BPMNShape_sid-C0DDC436-4B73-4FED-B244-85560B852ED1">
-        <omgdc:Bounds height="40.0" width="40.0" x="495.0" y="155.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="sid-77299213-F8D1-477C-BC46-CA51DAFBF7C1" id="BPMNShape_sid-77299213-F8D1-477C-BC46-CA51DAFBF7C1">
+        <omgdc:Bounds height="28.0" width="28.0" x="979.6666357164022" y="285.99999735090466"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="sid-4F879124-0943-4E76-A57C-6DED9F569843" id="BPMNShape_sid-4F879124-0943-4E76-A57C-6DED9F569843">
-        <omgdc:Bounds height="80.0" width="100.0" x="570.0" y="135.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="sid-8F39C647-A0E2-46F8-B184-51BF40E93546" id="BPMNShape_sid-8F39C647-A0E2-46F8-B184-51BF40E93546">
+        <omgdc:Bounds height="80.0" width="100.0" x="419.6666357164023" y="259.9999973509047"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="sid-F23C5EF4-E1A3-4568-9205-84A2F3B44B59" id="BPMNShape_sid-F23C5EF4-E1A3-4568-9205-84A2F3B44B59">
-        <omgdc:Bounds height="40.0" width="40.0" x="725.0" y="155.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="sid-E3704DF5-A637-45A9-B5F7-1B62A32DA03D" id="BPMNShape_sid-E3704DF5-A637-45A9-B5F7-1B62A32DA03D">
+        <omgdc:Bounds height="40.0" width="40.0" x="285.0000000000001" y="279.9999973509047"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="sid-5C013B33-F46B-497F-A4D2-3D0B78E3E6B3" id="BPMNShape_sid-5C013B33-F46B-497F-A4D2-3D0B78E3E6B3">
-        <omgdc:Bounds height="28.0" width="28.0" x="810.0" y="161.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="sid-E178BD57-68C0-4C23-8952-143905257209" id="BPMNShape_sid-E178BD57-68C0-4C23-8952-143905257209">
+        <omgdc:Bounds height="40.0" width="40.0" x="584.6666357164023" y="279.9999973509047"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="sid-EAD24598-4D25-4261-B315-A25FBE5121A0" id="BPMNEdge_sid-EAD24598-4D25-4261-B315-A25FBE5121A0">
-        <omgdi:waypoint x="670.0" y="175.199203187251"></omgdi:waypoint>
-        <omgdi:waypoint x="725.42" y="175.42000000000002"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-89ED731E-278D-4033-8445-73676D8B5F0A" id="BPMNEdge_sid-89ED731E-278D-4033-8445-73676D8B5F0A">
+        <omgdi:waypoint x="805.0000000000002" y="299.9999973509047"></omgdi:waypoint>
+        <omgdi:waypoint x="870.0000000000001" y="299.9999973509048"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-03C09DB2-B6B9-4E59-906A-13A50E04C0F8" id="BPMNEdge_sid-03C09DB2-B6B9-4E59-906A-13A50E04C0F8">
-        <omgdi:waypoint x="285.5" y="155.5"></omgdi:waypoint>
-        <omgdi:waypoint x="285.5" y="59.0"></omgdi:waypoint>
-        <omgdi:waypoint x="620.0" y="59.0"></omgdi:waypoint>
-        <omgdi:waypoint x="620.0" y="135.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C" id="BPMNEdge_sid-FCCDF8E6-9500-4D5F-A79C-CE674F870F6C">
+        <omgdi:waypoint x="890.0000000000001" y="319.9999973509048"></omgdi:waypoint>
+        <omgdi:waypoint x="890.0000000000001" y="412.0"></omgdi:waypoint>
+        <omgdi:waypoint x="184.66663571640223" y="412.0"></omgdi:waypoint>
+        <omgdi:waypoint x="184.66663571640223" y="339.9999973509048"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-F101F75C-FC06-48EF-878F-3842C61B68E4" id="BPMNEdge_sid-F101F75C-FC06-48EF-878F-3842C61B68E4">
-        <omgdi:waypoint x="74.99252636485839" y="177.52655179900447"></omgdi:waypoint>
-        <omgdi:waypoint x="105.0" y="176.57894736842104"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-860EFAF5-3915-4375-BF5D-AB7D4E36DB60" id="BPMNEdge_sid-860EFAF5-3915-4375-BF5D-AB7D4E36DB60">
+        <omgdi:waypoint x="325.0000000000001" y="299.9999973509047"></omgdi:waypoint>
+        <omgdi:waypoint x="419.6666357164023" y="299.9999973509047"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-D999FAC5-4DED-4DB9-9588-F0C40000D172" id="BPMNEdge_sid-D999FAC5-4DED-4DB9-9588-F0C40000D172">
-        <omgdi:waypoint x="764.6217948717949" y="175.37820512820514"></omgdi:waypoint>
-        <omgdi:waypoint x="810.0002839785394" y="175.0891701657418"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-B4E41A9C-BD67-46FB-880A-FABE14C52A79" id="BPMNEdge_sid-B4E41A9C-BD67-46FB-880A-FABE14C52A79">
+        <omgdi:waypoint x="305.0000000000001" y="279.9999973509047"></omgdi:waypoint>
+        <omgdi:waypoint x="305.0000000000001" y="216.0"></omgdi:waypoint>
+        <omgdi:waypoint x="755.0000000000002" y="216.0"></omgdi:waypoint>
+        <omgdi:waypoint x="755.0000000000002" y="259.9999973509047"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-139BCD80-6CE9-4F4E-8C9A-14F75B7C478E" id="BPMNEdge_sid-139BCD80-6CE9-4F4E-8C9A-14F75B7C478E">
-        <omgdi:waypoint x="304.58715596330273" y="175.41284403669724"></omgdi:waypoint>
-        <omgdi:waypoint x="345.0" y="175.2283105022831"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-842910A7-33C0-4DC1-B663-84C688761DA7" id="BPMNEdge_sid-842910A7-33C0-4DC1-B663-84C688761DA7">
+        <omgdi:waypoint x="69.66663571640221" y="299.99999735090466"></omgdi:waypoint>
+        <omgdi:waypoint x="134.66663571640223" y="299.9999973509047"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-67C1DC9B-5172-41C8-9573-917B6BF4DE31" id="BPMNEdge_sid-67C1DC9B-5172-41C8-9573-917B6BF4DE31">
-        <omgdi:waypoint x="445.0" y="175.20746887966806"></omgdi:waypoint>
-        <omgdi:waypoint x="495.4166666666667" y="175.41666666666666"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-1B021838-AC8E-490A-BD5E-40A924BBE8D5" id="BPMNEdge_sid-1B021838-AC8E-490A-BD5E-40A924BBE8D5">
+        <omgdi:waypoint x="624.6666357164023" y="299.9999973509047"></omgdi:waypoint>
+        <omgdi:waypoint x="705.0000000000002" y="299.99999735090466"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-90EB527F-D953-4031-AC1D-48C4EBC6EEE1" id="BPMNEdge_sid-90EB527F-D953-4031-AC1D-48C4EBC6EEE1">
-        <omgdi:waypoint x="515.5" y="194.5"></omgdi:waypoint>
-        <omgdi:waypoint x="515.5" y="248.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="248.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="215.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-0886E4B5-D361-4808-B79E-6FD0584D5045" id="BPMNEdge_sid-0886E4B5-D361-4808-B79E-6FD0584D5045">
+        <omgdi:waypoint x="234.66663571640223" y="299.9999973509048"></omgdi:waypoint>
+        <omgdi:waypoint x="285.0000000000001" y="299.9999973509047"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-49A900EC-7F01-4491-AAAE-DA87CC8598CC" id="BPMNEdge_sid-49A900EC-7F01-4491-AAAE-DA87CC8598CC">
-        <omgdi:waypoint x="745.5" y="194.5"></omgdi:waypoint>
-        <omgdi:waypoint x="745.5" y="268.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="268.0"></omgdi:waypoint>
-        <omgdi:waypoint x="155.0" y="215.0"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-F310DD92-E424-4EB6-839D-DC32E008CFEC" id="BPMNEdge_sid-F310DD92-E424-4EB6-839D-DC32E008CFEC">
+        <omgdi:waypoint x="910.0000000000001" y="299.9999973509048"></omgdi:waypoint>
+        <omgdi:waypoint x="979.6666357164022" y="299.99999735090466"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-1A1E0EA8-5C3C-4EF6-B80B-6604E6795180" id="BPMNEdge_sid-1A1E0EA8-5C3C-4EF6-B80B-6604E6795180">
-        <omgdi:waypoint x="534.5913461538462" y="175.40865384615384"></omgdi:waypoint>
-        <omgdi:waypoint x="570.0" y="175.23923444976077"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D" id="BPMNEdge_sid-8CFFAD62-3714-4072-BB0E-847F0F1CED8D">
+        <omgdi:waypoint x="519.6666357164023" y="299.9999973509047"></omgdi:waypoint>
+        <omgdi:waypoint x="584.6666357164023" y="299.9999973509047"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-D5EB9F24-DB82-4CAD-BB5B-31B833083241" id="BPMNEdge_sid-D5EB9F24-DB82-4CAD-BB5B-31B833083241">
-        <omgdi:waypoint x="205.0" y="175.19157088122606"></omgdi:waypoint>
-        <omgdi:waypoint x="265.4230769230769" y="175.42307692307693"></omgdi:waypoint>
+      <bpmndi:BPMNEdge bpmnElement="sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32" id="BPMNEdge_sid-EE3F6C40-10E4-45A9-AD18-A407C3DAED32">
+        <omgdi:waypoint x="604.7496309390168" y="319.91700212829016"></omgdi:waypoint>
+        <omgdi:waypoint x="605.0" y="380.0"></omgdi:waypoint>
+        <omgdi:waypoint x="184.66663571640223" y="380.0"></omgdi:waypoint>
+        <omgdi:waypoint x="184.66663571640223" y="339.9999973509048"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

src/main/resources/processes/wz_report_assign.bpmn20.xml

@@ -3,7 +3,7 @@
   <process id="wz_report_assign" name="wz_report_assign" isExecutable="true">
     <documentation>物资检验所报告审批流程</documentation>
     <startEvent id="sid-9A4918D7-8376-4A00-928A-6415D92565EC" name="开始"></startEvent>
-    <userTask id="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" name="报告生成" activiti:candidateUsers="${users}"></userTask>
+    <userTask id="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" name="报告生成" activiti:assignee="${recorder}"></userTask>
     <userTask id="sid-B5298B7E-C893-4EA1-91F4-170B627F9AC8" name="报告审批" activiti:candidateUsers="${users}"></userTask>
     <intermediateThrowEvent id="sid-EE4618BC-DB06-4D0C-9E5A-D4C1C8CAE24C" name="完成"></intermediateThrowEvent>
     <sequenceFlow id="sid-842910A7-33C0-4DC1-B663-84C688761DA7" sourceRef="sid-9A4918D7-8376-4A00-928A-6415D92565EC" targetRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397"></sequenceFlow>
@@ -15,22 +15,22 @@
     <sequenceFlow id="sid-42A03783-3685-45F9-BBD4-4522DF618C62" sourceRef="sid-D9679422-EE83-4AD7-8A06-51A8BAC2A397" targetRef="sid-FCDC217C-B6F1-4824-B8F6-26440D293180"></sequenceFlow>
     <sequenceFlow id="sid-E09B5406-369A-4A21-98EC-F5C8B6E4758B" sourceRef="sid-3EDD51D6-EA16-4B12-84BE-11B81EDBA93A" targetRef="sid-7F404068-96C3-4BA0-A7D7-95CECB552249"></sequenceFlow>
     <sequenceFlow id="sid-0969E7A1-C840-4F1E-A3DC-549610CC5C21" name="提交" sourceRef="sid-FCDC217C-B6F1-4824-B8F6-26440D293180" targetRef="sid-B5298B7E-C893-4EA1-91F4-170B627F9AC8">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result} == 1]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result == 1}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-0E18B9F7-F9AC-46EF-A6DB-22F720658BAD" name="签发成功" sourceRef="sid-7F404068-96C3-4BA0-A7D7-95CECB552249" targetRef="sid-EE4618BC-DB06-4D0C-9E5A-D4C1C8CAE24C">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result} == 1]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result == 1}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-5C6C9B5D-CF13-4F13-975B-32E397CE135E" name="审批通过" sourceRef="sid-F66E66CE-729D-49A3-BC6B-C4B3ADA719B3" targetRef="sid-3EDD51D6-EA16-4B12-84BE-11B81EDBA93A">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result} == 1]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result == 1}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-971E33E5-933C-47B5-BEC1-83B249CB22BE" name="取消" sourceRef="sid-FCDC217C-B6F1-4824-B8F6-26440D293180" targetRef="sid-EE4618BC-DB06-4D0C-9E5A-D4C1C8CAE24C">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result} == 0]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result == 0}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-B0941767-A6B6-4406-82DC-BF6FFBDD2440" name="审批未通过" sourceRef="sid-F66E66CE-729D-49A3-BC6B-C4B3ADA719B3" targetRef="sid-EE4618BC-DB06-4D0C-9E5A-D4C1C8CAE24C">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result} == 0]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result == 0}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="sid-56EAF2F5-1D6C-4F83-8073-61E3F95D8783" name="签发未通过" sourceRef="sid-7F404068-96C3-4BA0-A7D7-95CECB552249" targetRef="sid-EE4618BC-DB06-4D0C-9E5A-D4C1C8CAE24C">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result} == 0]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${result == 0}]]></conditionExpression>
     </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_wz_report_assign">
@@ -107,4 +107,4 @@
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-</definitions>
+</definitions>