From 83f4a3830b19ef5859708f4795668b74489587c0 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 12 八月 2025 14:25:11 +0800
Subject: [PATCH] yys 协同审批增加附件上传，预览
---
src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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..18c624c 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
@@ -3,9 +3,13 @@
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;
/**
@@ -14,16 +18,21 @@
*/
@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 = "娴佺▼缂栧彿")
private String approveId;
/**
@@ -44,6 +53,7 @@
/**
* 鐢宠閮ㄩ棬鍚嶇О
*/
+ @ApiModelProperty(value = "鐢宠閮ㄩ棬鍚嶇О")
private String approveDeptName;
/**
@@ -59,6 +69,7 @@
/**
* 鐢宠鍘熷洜
*/
+ @ApiModelProperty(value = "鐢宠鍘熷洜")
private String approveReason;
/**
@@ -75,6 +86,7 @@
* 鐢宠鏃ユ湡
*/
@JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鐢宠鏃ユ湡")
private Date approveTime;
/**
@@ -84,8 +96,9 @@
private Date approveOverTime;
/**
- * 瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚
+ * 瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�
*/
+ @ApiModelProperty(value = "瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�")
private Integer approveStatus;
/**
@@ -96,7 +109,7 @@
/**
* 绉熸埛id
*/
- @TableField(fill = FieldFill.INSERT)
+// @TableField(fill = FieldFill.INSERT)
private Long tenantId;
/**
@@ -107,6 +120,7 @@
/**
* 瀹℃壒澶囨敞
*/
+ @ApiModelProperty(value = "瀹℃壒澶囨敞")
private String approveRemark;
/**
--
Gitblit v1.9.3