From 493b3050cbe4a86332c3b3c5092810fc88075039 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 13 Nov 2023 10:50:44 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=B5=81=E7=A8=8B=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8A=82=E7=82=B9id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/activiti/entity/ProcessAll.java | 7 +++++++ .../modules/activiti/entity/ProcessApprovalRecord.java | 6 ++++++ .../jero/modules/activiti/listener/CreateListener.java | 2 ++ .../modules/activiti/mapper/xml/ProcessAllMapper.xml | 10 +++++----- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessAll.java b/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessAll.java index 0c973f49..92d5a4e6 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessAll.java +++ b/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; + } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessApprovalRecord.java b/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessApprovalRecord.java index 7c4e6fed..7b6bff22 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessApprovalRecord.java +++ b/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; } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/listener/CreateListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/listener/CreateListener.java index 0b3390c6..2c59776e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/listener/CreateListener.java +++ b/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 对接统一平台生成待办任务 } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml index 50c3f0e9..5ee2ab74 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml @@ -2,16 +2,16 @@ 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 @@