From dc5e5c07549b493e21c11dc7929c32ea9fd732b0 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 08 十月 2026 17:08:26 +0800
Subject: [PATCH] 协同办公系统模块优化

---
 src/main/java/com/ruoyi/approve/pojo/ApproveNode.java |   96 +++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 91 insertions(+), 5 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..f4ba654 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,66 +19,146 @@
  * @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;
+
     /**
      * 
      */
+    @ApiModelProperty(value = "涓婚敭ID")
     private Long id;
 
     /**
-     * 瀹℃壒id
+     * 瀹℃壒缂栧彿
      */
-    private Long approveProcessId;
+    @ApiModelProperty(value = "瀹℃壒娴佺▼缂栧彿")
+    private String approveProcessId;
 
     /**
      * 瀹℃壒鑺傜偣椤哄簭
      */
+    @ApiModelProperty(value = "瀹℃壒鑺傜偣椤哄簭")
     private Integer approveNodeOrder;
 
     /**
      * 瀹℃壒鑺傜偣鐢ㄦ埛鍚嶅瓧
      */
+    @ApiModelProperty(value = "瀹℃壒鑺傜偣鐢ㄦ埛鍚嶇О")
     private String approveNodeUser;
+
+    /**
+     * 瀹℃壒鑺傜偣鐢ㄦ埛id
+     */
+    @ApiModelProperty(value = "瀹℃壒鑺傜偣鐢ㄦ埛ID")
+    private Long approveNodeUserId;
 
     /**
      * 瀹℃壒鑺傜偣鏃堕棿
      */
+    @ApiModelProperty(value = "瀹℃壒鑺傜偣鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date approveNodeTime;
 
     /**
      * 瀹℃壒鑺傜偣鐘舵��:1鍚屾剰锛�2鎷掔粷锛�0灏氭湭瀹℃牳锛堥粯璁や负0锛�
      */
+    @ApiModelProperty(value = "瀹℃壒鑺傜偣鐘舵�侊細0灏氭湭瀹℃牳锛�1鍚屾剰锛�2鎷掔粷")
     private Integer approveNodeStatus;
 
+    @ApiModelProperty(value = "鏄惁涓虹涓�涓妭鐐�")
     @TableField(exist = false)
     private Boolean isFirst;
 
+
+    /**
+     * 鏄惁涓烘渶鍚庝竴姝�
+     */
+    @ApiModelProperty(value = "鏄惁涓烘渶鍚庝竴涓妭鐐�")
     @TableField(exist = false)
     private Boolean isLast;
 
     /**
+     * 鏄惁涓哄綋鍓嶅鏍歌妭鐐�
+     */
+    @ApiModelProperty(value = "褰撳墠鐢ㄦ埛鏄惁鍙鏍�")
+    @TableField(exist = false)
+    private Boolean isShen = false;
+
+    /**
      * 绉熸埛id
      */
-    @TableField(fill = FieldFill.INSERT)
+//    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "绉熸埛ID")
     private Long tenantId;
 
     /**
      * 鍒犻櫎鏍囪:0姝ｅ父锛�1鍒犻櫎
      */
+    @ApiModelProperty(value = "鍒犻櫎鏍囧織锛�0姝ｅ父锛�1鍒犻櫎")
     private Integer deleteFlag;
+
+    /**
+     * 鍏ュ簱鐢ㄦ埛id
+     */
+    @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛ID")
+    private Long createUser;
+
+    /**
+     * 鍏ュ簱鏃堕棿
+     */
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    private LocalDateTime createTime;
+
+    /**
+     * 淇敼鑰�
+     */
+    @ApiModelProperty(value = "鏇存柊鐢ㄦ埛ID")
+    private Long updateUser;
+
+    /**
+     * 淇敼鏃堕棿
+     */
+    @ApiModelProperty(value = "鏇存柊鏃堕棿")
+    private LocalDateTime updateTime;
 
     /**
      * 瀹℃壒鑺傜偣鎷掔粷鍘熷洜
      */
+    @ApiModelProperty(value = "瀹℃壒澶勭悊鍘熷洜")
     private String approveNodeReason;
 
     /**
      * 瀹℃壒鑺傜偣澶囨敞
      */
+    @ApiModelProperty(value = "瀹℃壒鑺傜偣澶囨敞")
     private String approveNodeRemark;
+
+    @ApiModelProperty(value = "瀹℃壒鑺傜偣鍚嶇О")
+    private String approveNodeName;
+
+    @ApiModelProperty(value = "鏉′欢瀛楁")
+    private String conditionField;
+
+    @ApiModelProperty(value = "鏉′欢鎿嶄綔绗�")
+    private String conditionOperator;
+
+    @ApiModelProperty(value = "鏉′欢鍊�")
+    private String conditionValue;
+
+    @ApiModelProperty(value = "鏄惁涓哄綋鍓嶈妭鐐癸細0鍚︼紝1鏄�")
+    private Integer isCurrent;
 
     private static final long serialVersionUID = 1L;
 
 
-}
\ No newline at end of file
+}

--
Gitblit v1.9.3