From eb680d21593659e600eb9e152cc6ed7ef18df28a Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 27 Oct 2023 10:25:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BE=85=E5=8A=9E=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=8A=82=E7=82=B9=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/modules/activiti/entity/ProcessAll.java  | 7 +++++++
 .../jero/modules/activiti/mapper/xml/ProcessAllMapper.xml  | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

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 a7320755..c3fb714a 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
@@ -144,6 +144,13 @@ public class ProcessAll {
     @ApiModelProperty(value="任务id")
     private String taskId;
 
+    /**
+     * 任务id
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value="任务节点名称")
+    private String taskName;
+
     /**
      * 接收任务时间
      */
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 cf491696..50c3f0e9 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,7 +2,7 @@
 <!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
+        select pa.*,par.create_time as receivedTaskTime,par.task_id,par.task_name
         from process_all pa
                  left join process_approval_record par on pa.process_instance_id = par.process_instance_id
         ${ew.customSqlSegment}