From bfd0ef2ad4c32b6a19e7dc22a9d115ddf8d8f04c Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 20 十月 2025 09:45:38 +0800
Subject: [PATCH] yys  修改-首页-应收应付统计逻辑

---
 src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java |   47 +++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
index 58cdddb..18c624c 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
@@ -1,10 +1,15 @@
 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.*;
 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,22 +18,32 @@
  */
 @Data
 @TableName("approve_process")
-public class ApproveProcess implements Serializable {
+@ApiModel
+public class ApproveProcess{
     /**
      * 
      */
     @TableId(type = IdType.AUTO)
     private Long id;
 
+    @TableField(exist = false)
+    private List<CommonFile> commonFileList;
+
     /**
-     * 瀹℃壒id
+     * 娴佺▼缂栧彿
      */
+    @ApiModelProperty(value = "娴佺▼缂栧彿")
     private String approveId;
 
     /**
      * 鐢宠浜篿d
      */
     private Long approveUser;
+
+    /**
+     * 鐢宠浜哄悕绉�
+     */
+    private String approveUserName;
 
     /**
      * 鐢宠閮ㄩ棬id
@@ -38,27 +53,40 @@
     /**
      * 鐢宠閮ㄩ棬鍚嶇О
      */
+    @ApiModelProperty(value = "鐢宠閮ㄩ棬鍚嶇О")
     private String approveDeptName;
 
     /**
-     * 鐢宠鐢ㄦ埛ids
+     * 瀹℃壒鐢ㄦ埛ids
      */
     private String approveUserIds;
 
     /**
-     * 鐢宠鐢ㄦ埛鍚嶇О
+     * 瀹℃壒鐢ㄦ埛鍚嶇О
      */
     private String approveUserNames;
 
     /**
      * 鐢宠鍘熷洜
      */
+    @ApiModelProperty(value = "鐢宠鍘熷洜")
     private String approveReason;
+
+    /**
+     * 褰撳墠瀹℃壒鐢ㄦ埛ID
+     */
+    private Long approveUserCurrentId;
+
+    /**
+     * 褰撳墠瀹℃壒鐢ㄦ埛鍚嶇О
+     */
+    private String approveUserCurrentName;
 
     /**
      * 鐢宠鏃ユ湡
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "鐢宠鏃ユ湡")
     private Date approveTime;
 
     /**
@@ -68,8 +96,9 @@
     private Date approveOverTime;
 
     /**
-     * 瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚
+     * 瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�
      */
+    @ApiModelProperty(value = "瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�")
     private Integer approveStatus;
 
     /**
@@ -80,7 +109,7 @@
     /**
      * 绉熸埛id
      */
-    @TableField(fill = FieldFill.INSERT)
+//    @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
     /**
@@ -91,8 +120,14 @@
     /**
      * 瀹℃壒澶囨敞
      */
+    @ApiModelProperty(value = "瀹℃壒澶囨敞")
     private String approveRemark;
 
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    private LocalDateTime createTime;
+
     private static final long serialVersionUID = 1L;
 
 

--
Gitblit v1.9.3