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/ApproveProcess.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
index 8ede335..db80da3 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
@@ -3,9 +3,15 @@
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
+import java.util.List;
+import java.math.BigDecimal;
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,107 +20,160 @@
*/
@Data
@TableName("approve_process")
+@ApiModel
public class ApproveProcess{
/**
*
*/
+ @ApiModelProperty(value = "涓婚敭ID")
@TableId(type = IdType.AUTO)
private Long id;
+
+ @ApiModelProperty(value = "闄勪欢鍒楄〃")
+ @TableField(exist = false)
+ private List<CommonFile> commonFileList;
/**
* 娴佺▼缂栧彿
*/
+ @ApiModelProperty(value = "娴佺▼缂栧彿")
+ @Excel(name = "娴佺▼缂栧彿")
private String approveId;
/**
* 鐢宠浜篿d
*/
+ @ApiModelProperty(value = "鐢宠浜篒D")
private Long approveUser;
/**
* 鐢宠浜哄悕绉�
*/
+ @ApiModelProperty(value = "鐢宠浜哄悕绉�")
+ @Excel(name = "鐢宠浜�")
private String approveUserName;
/**
* 鐢宠閮ㄩ棬id
*/
+ @ApiModelProperty(value = "鐢宠閮ㄩ棬ID")
private Long approveDeptId;
/**
* 鐢宠閮ㄩ棬鍚嶇О
*/
+ @ApiModelProperty(value = "鐢宠閮ㄩ棬鍚嶇О")
+ @Excel(name = "鐢宠閮ㄩ棬")
private String approveDeptName;
/**
* 瀹℃壒鐢ㄦ埛ids
*/
+ @ApiModelProperty(value = "瀹℃壒鐢ㄦ埛ID鍒楄〃锛屽涓互閫楀彿鍒嗛殧")
private String approveUserIds;
/**
* 瀹℃壒鐢ㄦ埛鍚嶇О
*/
+ @ApiModelProperty(value = "瀹℃壒鐢ㄦ埛鍚嶇О鍒楄〃")
private String approveUserNames;
/**
* 鐢宠鍘熷洜
*/
+ @ApiModelProperty(value = "鐢宠鍘熷洜")
+ @Excel(name = "瀹℃壒浜嬬敱")
private String approveReason;
/**
* 褰撳墠瀹℃壒鐢ㄦ埛ID
*/
+ @ApiModelProperty(value = "褰撳墠瀹℃壒鐢ㄦ埛ID")
private Long approveUserCurrentId;
/**
* 褰撳墠瀹℃壒鐢ㄦ埛鍚嶇О
*/
+ @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瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�
*/
+ @ApiModelProperty(value = "瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�")
+ @Excel(name = "瀹℃壒鐘舵��", readConverterExp = "0=寰呭鏍�,1=瀹℃牳涓�,2=瀹℃牳瀹屾垚,3=瀹℃牳鏈�氳繃,4=宸查噸鏂版彁浜�")
private Integer approveStatus;
/**
* 瀹℃壒鏄惁鍒犻櫎锛�0姝ｅ父锛�1鍒犻櫎
*/
+ @ApiModelProperty(value = "鍒犻櫎鏍囧織锛�0姝ｅ父锛�1鍒犻櫎")
private Integer approveDelete;
/**
* 绉熸埛id
*/
// @TableField(fill = FieldFill.INSERT)
+ @ApiModelProperty(value = "绉熸埛ID")
private Long tenantId;
/**
* 瀹℃壒绫诲瀷
*/
+ @ApiModelProperty(value = "瀹℃壒绫诲瀷锛�1鑷敱鍗忓悓锛�2璇峰亣锛�3閿�鍞紝4鎶ラ攢锛�5閲囪喘锛�6鎶ヤ环锛�7鍑哄簱")
private Integer approveType;
/**
* 瀹℃壒澶囨敞
*/
+ @ApiModelProperty(value = "瀹℃壒澶囨敞")
private String approveRemark;
+
+ @ApiModelProperty(value = "鍏宠仈涓氬姟涓婚敭")
+ private Long businessId;
+
+ @ApiModelProperty(value = "涓氬姟缂栧彿")
+ private String businessNo;
+
+ @ApiModelProperty(value = "瀹℃壒涓氬姟鏍囬")
+ private String businessTitle;
+
+ @ApiModelProperty(value = "涓氬姟閲戦")
+ private BigDecimal amount;
+
+ @ApiModelProperty(value = "涓氬姟鏁版嵁JSON蹇収")
+ private String businessData;
+
+ @ApiModelProperty(value = "娴佺▼瀹氫箟ID")
+ private Long flowDefinitionId;
/**
* 鍒涘缓鏃堕棿
*/
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private LocalDateTime updateTime;
private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3