From 8b68e5a8d8d43bcb45c9032c3eb893a2b8995acf Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 17 四月 2026 16:18:51 +0800
Subject: [PATCH] fix(customer): 修复客户私海相关查询和导入功能

---
 src/main/java/com/ruoyi/approve/pojo/ApproveNode.java |   64 ++++++++++++++++++++++++++++++--
 1 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
index de3a255..09e3f02 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
@@ -1,11 +1,17 @@
 package com.ruoyi.approve.pojo;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.sales.pojo.CommonFile;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,16 +19,28 @@
  * @TableName approve_node
  */
 @Data
-public class ApproveNode implements Serializable {
+@TableName("approve_node")
+@ApiModel
+public class ApproveNode{
+
+
+    @ApiModelProperty("闄勪欢id")
+    @TableField(exist = false)
+    private List<String> tempFileIds;
+
+    @TableField(exist = false)
+    @ApiModelProperty("闄勪欢鍒楄〃")
+    private String url;
+
     /**
      * 
      */
     private Long id;
 
     /**
-     * 瀹℃壒id
+     * 瀹℃壒缂栧彿
      */
-    private Long approveProcessId;
+    private String approveProcessId;
 
     /**
      * 瀹℃壒鑺傜偣椤哄簭
@@ -33,6 +51,11 @@
      * 瀹℃壒鑺傜偣鐢ㄦ埛鍚嶅瓧
      */
     private String approveNodeUser;
+
+    /**
+     * 瀹℃壒鑺傜偣鐢ㄦ埛id
+     */
+    private Long approveNodeUserId;
 
     /**
      * 瀹℃壒鑺傜偣鏃堕棿
@@ -48,19 +71,49 @@
     @TableField(exist = false)
     private Boolean isFirst;
 
+
+    /**
+     * 鏄惁涓烘渶鍚庝竴姝�
+     */
     @TableField(exist = false)
     private Boolean isLast;
 
     /**
+     * 鏄惁涓哄綋鍓嶅鏍歌妭鐐�
+     */
+    @TableField(exist = false)
+    private Boolean isShen = false;
+
+    /**
      * 绉熸埛id
      */
-    @TableField(fill = FieldFill.INSERT)
+//    @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
     /**
      * 鍒犻櫎鏍囪:0姝ｅ父锛�1鍒犻櫎
      */
     private Integer deleteFlag;
+
+    /**
+     * 鍏ュ簱鐢ㄦ埛id
+     */
+    private Long createUser;
+
+    /**
+     * 鍏ュ簱鏃堕棿
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 淇敼鑰�
+     */
+    private Long updateUser;
+
+    /**
+     * 淇敼鏃堕棿
+     */
+    private LocalDateTime updateTime;
 
     /**
      * 瀹℃壒鑺傜偣鎷掔粷鍘熷洜
@@ -75,4 +128,7 @@
     private static final long serialVersionUID = 1L;
 
 
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
 }
\ No newline at end of file

--
Gitblit v1.9.3