From 27aa4dd460ebd996f190315c9f9052b0646b6460 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 25 三月 2026 15:31:43 +0800
Subject: [PATCH] 采购销售审批功能迁移

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

diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
index 1bb5848..440eca1 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
@@ -3,9 +3,14 @@
 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.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.sales.pojo.CommonFile;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -14,16 +19,22 @@
  */
 @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;
+
     /**
      * 娴佺▼缂栧彿
      */
+    @ApiModelProperty(value = "娴佺▼缂栧彿")
+    @Excel(name = "娴佺▼缂栧彿")
     private String approveId;
 
     /**
@@ -34,6 +45,8 @@
     /**
      * 鐢宠浜哄悕绉�
      */
+    @ApiModelProperty(value = "鐢宠浜哄悕绉�")
+    @Excel(name = "鐢宠浜�")
     private String approveUserName;
 
     /**
@@ -44,6 +57,8 @@
     /**
      * 鐢宠閮ㄩ棬鍚嶇О
      */
+    @ApiModelProperty(value = "鐢宠閮ㄩ棬鍚嶇О")
+    @Excel(name = "鐢宠閮ㄩ棬")
     private String approveDeptName;
 
     /**
@@ -59,6 +74,8 @@
     /**
      * 鐢宠鍘熷洜
      */
+    @ApiModelProperty(value = "鐢宠鍘熷洜")
+    @Excel(name = "瀹℃壒浜嬬敱")
     private String approveReason;
 
     /**
@@ -69,23 +86,31 @@
     /**
      * 褰撳墠瀹℃壒鐢ㄦ埛鍚嶇О
      */
+    @ApiModelProperty(value = "褰撳墠瀹℃壒浜�")
+    @Excel(name = "褰撳墠瀹℃壒浜�")
     private String approveUserCurrentName;
 
     /**
      * 鐢宠鏃ユ湡
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "鐢宠鏃ユ湡")
+    @Excel(name = "鐢宠鏃ユ湡" ,dateFormat = "yyyy-MM-dd")
     private Date approveTime;
 
     /**
      * 瀹℃壒瀹屾垚鏃堕棿
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "瀹℃壒瀹屾垚鏃堕棿")
+    @Excel(name = "缁撴潫鏃ユ湡" ,dateFormat = "yyyy-MM-dd")
     private Date approveOverTime;
 
     /**
-     * 瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚
+     * 瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�
      */
+    @ApiModelProperty(value = "瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�")
+    @Excel(name = "瀹℃壒鐘舵��", readConverterExp = "0=寰呭鏍�,1=瀹℃牳涓�,2=瀹℃牳瀹屾垚,3=瀹℃牳鏈�氳繃,4=宸查噸鏂版彁浜�")
     private Integer approveStatus;
 
     /**
@@ -96,17 +121,23 @@
     /**
      * 绉熸埛id
      */
-    @TableField(fill = FieldFill.INSERT)
+//    @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
-    /**
-     * 瀹℃壒绫诲瀷
-     */
+    /** * 瀹℃壒绫诲瀷
+     *     0: "鍗忓悓瀹℃壒绠＄悊琛�",
+     *     1: "鍏嚭绠＄悊瀹℃壒琛�",
+     *     2: "璇峰亣绠＄悊瀹℃壒琛�",
+     *     3: "鍑哄樊绠＄悊瀹℃壒琛�",
+     *     4: "鎶ラ攢绠＄悊瀹℃壒琛�",
+     *     5: "閲囪喘鐢宠瀹℃壒琛�",
+     *     6: "閿�鍞鍗曞鎵硅〃", */
     private Integer approveType;
 
     /**
      * 瀹℃壒澶囨敞
      */
+    @ApiModelProperty(value = "瀹℃壒澶囨敞")
     private String approveRemark;
 
     /**
@@ -117,4 +148,4 @@
     private static final long serialVersionUID = 1L;
 
 
-}
\ No newline at end of file
+}

--
Gitblit v1.9.3