工作流名称修改

src/main/java/com/common/workflow/service/activiti/ActivitiService.java

@@ -226,6 +226,7 @@ public class ActivitiService {
         for (Task myTask : resultTasks) {
             ActiMyTaskDTO myTaskDTO = new ActiMyTaskDTO();
             myTaskDTO.setBusinessKey(taskService.getVariable(myTask.getId(), "businessKey").toString());
+            myTaskDTO.setWorkflowId(myTask.getProcessInstanceId());
             myTaskDTO.setCreateTime(myTask.getCreateTime().getTime());
             myTaskDTOS.add(myTaskDTO);
         }

src/main/java/com/common/workflow/service/dto/ActiMyTaskDTO.java

@@ -5,6 +5,7 @@ package com.common.workflow.service.dto;
  */
 public class ActiMyTaskDTO {
     private String businessKey;
+    private String workflowId;
     private long createTime;
 
     public String getBusinessKey() {
@@ -22,4 +23,12 @@ public class ActiMyTaskDTO {
     public void setCreateTime(long createTime) {
         this.createTime = createTime;
     }
+
+    public String getWorkflowId() {
+        return workflowId;
+    }
+
+    public void setWorkflowId(String workflowId) {
+        this.workflowId = workflowId;
+    }
 }

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

@@ -10,7 +10,7 @@
     <exclusiveGateway id="sid-E178BD57-68C0-4C23-8952-143905257209"></exclusiveGateway>
     <userTask id="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF" name="二级单位初审" activiti:candidateUsers="${users}"></userTask>
     <exclusiveGateway id="sid-C9D007EC-DA5F-480E-A280-EBF70615C514"></exclusiveGateway>
-    <userTask id="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" name="集中审批" activiti:candidateUsers="${users}"></userTask>
+    <userTask id="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" name="集中评审" activiti:candidateUsers="${users}"></userTask>
     <exclusiveGateway id="sid-025875DE-EAC2-4FBC-B4A4-91377D669895"></exclusiveGateway>
     <endEvent id="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D"></endEvent>
     <intermediateThrowEvent id="sid-3DF26A43-3984-4930-AA15-6CBD627202FE"></intermediateThrowEvent>

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

@@ -10,7 +10,7 @@
     <exclusiveGateway id="sid-E178BD57-68C0-4C23-8952-143905257209"></exclusiveGateway>
     <userTask id="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF" name="二级单位初审" activiti:candidateUsers="${users}"></userTask>
     <exclusiveGateway id="sid-C9D007EC-DA5F-480E-A280-EBF70615C514"></exclusiveGateway>
-    <userTask id="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" name="集中审批" activiti:candidateUsers="${users}"></userTask>
+    <userTask id="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" name="集中评审" activiti:candidateUsers="${users}"></userTask>
     <exclusiveGateway id="sid-025875DE-EAC2-4FBC-B4A4-91377D669895"></exclusiveGateway>
     <endEvent id="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D"></endEvent>
     <intermediateThrowEvent id="sid-3DF26A43-3984-4930-AA15-6CBD627202FE"></intermediateThrowEvent>

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

@@ -12,7 +12,7 @@
     <exclusiveGateway id="sid-E178BD57-68C0-4C23-8952-143905257209"></exclusiveGateway>
     <userTask id="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF" name="二级单位初审" activiti:candidateUsers="${users}"></userTask>
     <exclusiveGateway id="sid-C9D007EC-DA5F-480E-A280-EBF70615C514"></exclusiveGateway>
-    <userTask id="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" name="集中审批" activiti:candidateUsers="${users}"></userTask>
+    <userTask id="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" name="集中评审" activiti:candidateUsers="${users}"></userTask>
     <exclusiveGateway id="sid-025875DE-EAC2-4FBC-B4A4-91377D669895"></exclusiveGateway>
     <endEvent id="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D"></endEvent>
     <intermediateThrowEvent id="sid-3DF26A43-3984-4930-AA15-6CBD627202FE"></intermediateThrowEvent>

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

@@ -8,7 +8,7 @@
     <exclusiveGateway id="sid-E178BD57-68C0-4C23-8952-143905257209"></exclusiveGateway>
     <userTask id="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF" name="二级单位初审" activiti:candidateUsers="${users}"></userTask>
     <exclusiveGateway id="sid-C9D007EC-DA5F-480E-A280-EBF70615C514"></exclusiveGateway>
-    <userTask id="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" name="集中审批" activiti:candidateUsers="${users}"></userTask>
+    <userTask id="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" name="集中评审" activiti:candidateUsers="${users}"></userTask>
     <exclusiveGateway id="sid-025875DE-EAC2-4FBC-B4A4-91377D669895"></exclusiveGateway>
     <endEvent id="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D"></endEvent>
     <intermediateThrowEvent id="sid-3DF26A43-3984-4930-AA15-6CBD627202FE"></intermediateThrowEvent>

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

@@ -8,7 +8,7 @@
     <exclusiveGateway id="sid-E178BD57-68C0-4C23-8952-143905257209"></exclusiveGateway>
     <userTask id="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF" name="二级单位初审" activiti:candidateUsers="${users}"></userTask>
     <exclusiveGateway id="sid-C9D007EC-DA5F-480E-A280-EBF70615C514"></exclusiveGateway>
-    <userTask id="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" name="集中审批" activiti:candidateUsers="${users}"></userTask>
+    <userTask id="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" name="集中评审" activiti:candidateUsers="${users}"></userTask>
     <exclusiveGateway id="sid-025875DE-EAC2-4FBC-B4A4-91377D669895"></exclusiveGateway>
     <endEvent id="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D"></endEvent>
     <intermediateThrowEvent id="sid-3DF26A43-3984-4930-AA15-6CBD627202FE"></intermediateThrowEvent>
@@ -63,7 +63,7 @@
         <omgdc:Bounds height="40.0" width="39.99999999999994" x="495.00000000000006" y="279.9999973509056"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" id="BPMNShape_sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3">
-        <omgdc:Bounds height="80.0" width="100.00000000000023" x="780.0000000000001" y="259.9999973509057"></omgdc:Bounds>
+        <omgdc:Bounds height="80.0" width="100.00000000000023" x="780.0" y="259.99999735090574"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="sid-025875DE-EAC2-4FBC-B4A4-91377D669895" id="BPMNShape_sid-025875DE-EAC2-4FBC-B4A4-91377D669895">
         <omgdc:Bounds height="40.0" width="40.0" x="915.0000000000001" y="279.9999973509048"></omgdc:Bounds>
@@ -111,11 +111,11 @@
         <omgdi:waypoint x="920.0000000000002" y="360.0000000000001"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11" id="BPMNEdge_sid-8EBC7DDA-2971-44DA-B74C-AAE347AD9A11">
-        <omgdi:waypoint x="744.6727272727275" y="300.32727007817846"></omgdi:waypoint>
-        <omgdi:waypoint x="780.0000000000001" y="300.0090063599147"></omgdi:waypoint>
+        <omgdi:waypoint x="744.6727272727273" y="300.32727007817846"></omgdi:waypoint>
+        <omgdi:waypoint x="780.0" y="300.00900635991474"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-7B00C50E-3979-4923-B9D9-0FC3F918ADE4" id="BPMNEdge_sid-7B00C50E-3979-4923-B9D9-0FC3F918ADE4">
-        <omgdi:waypoint x="880.0000000000003" y="300.2369641755498"></omgdi:waypoint>
+        <omgdi:waypoint x="880.0000000000002" y="300.2369641755498"></omgdi:waypoint>
         <omgdi:waypoint x="915.4047619047622" y="300.4047592556669"></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/oil_first_supplier_apply.bpmn20.xml

@@ -12,7 +12,7 @@
     <exclusiveGateway id="sid-E178BD57-68C0-4C23-8952-143905257209"></exclusiveGateway>
     <userTask id="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF" name="二级单位初审" activiti:candidateUsers="${users}"></userTask>
     <exclusiveGateway id="sid-C9D007EC-DA5F-480E-A280-EBF70615C514"></exclusiveGateway>
-    <userTask id="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" name="集中审批" activiti:candidateUsers="${users}"></userTask>
+    <userTask id="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" name="集中评审" activiti:candidateUsers="${users}"></userTask>
     <exclusiveGateway id="sid-025875DE-EAC2-4FBC-B4A4-91377D669895"></exclusiveGateway>
     <endEvent id="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D"></endEvent>
     <intermediateThrowEvent id="sid-3DF26A43-3984-4930-AA15-6CBD627202FE"></intermediateThrowEvent>

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

@@ -14,7 +14,7 @@
     <exclusiveGateway id="sid-E178BD57-68C0-4C23-8952-143905257209"></exclusiveGateway>
     <userTask id="sid-8C5C2380-44D8-4A61-A5C7-1DC85F57E3AF" name="二级单位初审" activiti:candidateUsers="${users}"></userTask>
     <exclusiveGateway id="sid-C9D007EC-DA5F-480E-A280-EBF70615C514"></exclusiveGateway>
-    <userTask id="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" name="集中审批" activiti:candidateUsers="${users}"></userTask>
+    <userTask id="sid-7937AEA9-F0D6-4FF1-9E7F-23238B42D7A3" name="集中评审" activiti:candidateUsers="${users}"></userTask>
     <exclusiveGateway id="sid-025875DE-EAC2-4FBC-B4A4-91377D669895"></exclusiveGateway>
     <endEvent id="sid-2AC44FDA-FEF7-4D32-A690-54A5C6AAF46D"></endEvent>
     <intermediateThrowEvent id="sid-3DF26A43-3984-4930-AA15-6CBD627202FE"></intermediateThrowEvent>