update 流程中心增加节点id

laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessAll.java

@@ -170,4 +170,11 @@ public class ProcessAll {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date completedTaskTime;
 
+    /**
+     * 节点id
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value="节点id")
+    private String nodeId;
+
 }

laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessApprovalRecord.java

@@ -167,4 +167,10 @@ public class ProcessApprovalRecord {
     @TableField(value = "transfer_by")
     @ApiModelProperty(value = "转办人")
     private String transferBy;
+
+    /**
+     * 节点id
+     */
+    @ApiModelProperty(value = "节点id")
+    private String nodeId;
 }

laws-modules/src/main/java/com/jero/modules/activiti/listener/CreateListener.java

@@ -35,6 +35,7 @@ public class CreateListener implements TaskListener {
         String processInstanceId = delegateTask.getProcessInstanceId();
         Date createTime = delegateTask.getCreateTime();
         String assignee = delegateTask.getAssignee();
+        String taskDefinitionKey = delegateTask.getTaskDefinitionKey();
         //新增待审批记录
         ProcessApprovalRecord approvalRecord = new ProcessApprovalRecord();
         approvalRecord.setTaskId(id);
@@ -43,6 +44,7 @@ public class CreateListener implements TaskListener {
         approvalRecord.setUserId(assignee);
         approvalRecord.setFinishFlag(FinishFlagEnum.INCOMPLETE.getValue());
         approvalRecord.setCreateTime(createTime);
+        approvalRecord.setNodeId(taskDefinitionKey);
         recordService.save(approvalRecord);
     //    todo 对接统一平台生成待办任务
     }

laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml

@@ -2,16 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jero.modules.activiti.mapper.ProcessAllMapper">
     <select id="getTodoList" resultType="com.jero.modules.activiti.entity.ProcessAll">
-        select pa.*,par.create_time as receivedTaskTime,par.task_id,par.task_name
+        select pa.*,par.create_time as receivedTaskTime,par.task_id,par.task_name, par.node_id
         from process_all pa
                  left join process_approval_record par on pa.process_instance_id = par.process_instance_id
         ${ew.customSqlSegment}
     </select>
 
     <select id="getCompletedList" resultType="com.jero.modules.activiti.entity.ProcessAll">
-        select p.*, group_concat(par.user_id) as handleUserId
+        select p.*, group_concat(par.user_id) as handleUserId, par.node_id
         from (
-                 select pa.*, max(par.create_time) as receivedTaskTime, max(par.end_time) as completedTaskTime
+                 select pa.*, max(par.create_time) as receivedTaskTime, max(par.end_time) as completedTaskTime, par.node_id
                  from process_all pa
                           left join process_approval_record par on pa.process_instance_id = par.process_instance_id
                      ${ew.customSqlSegment}
@@ -24,7 +24,7 @@
     <select id="getSentList" resultType="com.jero.modules.activiti.entity.ProcessAll">
         select p.*, group_concat(par.user_id) as handleUserId
         from (
-                 select pa.*, max(par.create_time) as receivedTaskTime, max(par.end_time) as completedTaskTime
+                 select pa.*, max(par.create_time) as receivedTaskTime, max(par.end_time) as completedTaskTime, par.node_id
                  from process_all pa
                           left join process_approval_record par on pa.process_instance_id = par.process_instance_id
                      ${ew.customSqlSegment}
@@ -37,7 +37,7 @@
     <select id="getAllList" resultType="com.jero.modules.activiti.entity.ProcessAll">
         select p.*, group_concat(par.user_id) as handleUserId
         from (
-                 select pa.*, max(par.create_time) as receivedTaskTime, max(par.end_time) as completedTaskTime
+                 select pa.*, max(par.create_time) as receivedTaskTime, max(par.end_time) as completedTaskTime, par.node_id
                  from process_all pa
                           left join process_approval_record par on pa.process_instance_id = par.process_instance_id
                      ${ew.customSqlSegment}