From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro
---
src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java | 58 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
index 42ca0ba..bd56b0f 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
@@ -1,19 +1,18 @@
package com.ruoyi.approve.pojo;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.basic.dto.StorageBlobVO;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.sales.pojo.CommonFile;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.math.BigDecimal;
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;
-import org.springframework.format.annotation.DateTimeFormat;
/**
* 瀹℃壒娴佺▼琛�
@@ -21,7 +20,7 @@
*/
@Data
@TableName("approve_process")
-@ApiModel
+@Schema
public class ApproveProcess{
/**
*
@@ -35,7 +34,7 @@
/**
* 娴佺▼缂栧彿
*/
- @ApiModelProperty(value = "娴佺▼缂栧彿")
+ @Schema(description = "娴佺▼缂栧彿")
@Excel(name = "娴佺▼缂栧彿")
private String approveId;
@@ -47,7 +46,7 @@
/**
* 鐢宠浜哄悕绉�
*/
- @ApiModelProperty(value = "鐢宠浜哄悕绉�")
+ @Schema(description = "鐢宠浜哄悕绉�")
@Excel(name = "鐢宠浜�")
private String approveUserName;
@@ -59,7 +58,7 @@
/**
* 鐢宠閮ㄩ棬鍚嶇О
*/
- @ApiModelProperty(value = "鐢宠閮ㄩ棬鍚嶇О")
+ @Schema(description = "鐢宠閮ㄩ棬鍚嶇О")
@Excel(name = "鐢宠閮ㄩ棬")
private String approveDeptName;
@@ -76,7 +75,7 @@
/**
* 鐢宠鍘熷洜
*/
- @ApiModelProperty(value = "鐢宠鍘熷洜")
+ @Schema(description = "鐢宠鍘熷洜")
@Excel(name = "瀹℃壒浜嬬敱")
private String approveReason;
@@ -88,7 +87,7 @@
/**
* 褰撳墠瀹℃壒鐢ㄦ埛鍚嶇О
*/
- @ApiModelProperty(value = "褰撳墠瀹℃壒浜�")
+ @Schema(description = "褰撳墠瀹℃壒浜�")
@Excel(name = "褰撳墠瀹℃壒浜�")
private String approveUserCurrentName;
@@ -96,7 +95,7 @@
* 鐢宠鏃ユ湡
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "鐢宠鏃ユ湡")
+ @Schema(description = "鐢宠鏃ユ湡")
@Excel(name = "鐢宠鏃ユ湡" ,dateFormat = "yyyy-MM-dd")
private Date approveTime;
@@ -104,14 +103,14 @@
* 瀹℃壒瀹屾垚鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "瀹℃壒瀹屾垚鏃堕棿")
+ @Schema(description = "瀹℃壒瀹屾垚鏃堕棿")
@Excel(name = "缁撴潫鏃ユ湡" ,dateFormat = "yyyy-MM-dd")
private Date approveOverTime;
/**
* 瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�
*/
- @ApiModelProperty(value = "瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�")
+ @Schema(description = "瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�")
@Excel(name = "瀹℃壒鐘舵��", readConverterExp = "0=寰呭鏍�,1=瀹℃牳涓�,2=瀹℃牳瀹屾垚,3=瀹℃牳鏈�氳繃,4=宸查噸鏂版彁浜�")
private Integer approveStatus;
@@ -127,25 +126,28 @@
private Long tenantId;
/**
- * 瀹℃壒绫诲瀷 1-鍏嚭绠＄悊 2-璇峰亣绠＄悊 3-鍑哄樊绠＄悊 4-鎶ラ攢绠＄悊 5-閲囪喘瀹℃壒 6-鎶ヤ环瀹℃壒 7-鍙戣揣瀹℃壒
+ * 瀹℃壒绫诲瀷 1-鍏嚭绠＄悊 2-璇峰亣绠＄悊 3-鍑哄樊绠＄悊 4-鎶ラ攢绠＄悊 5-閲囪喘瀹℃壒 6-鎶ヤ环瀹℃壒 7-鍙戣揣瀹℃壒 8-鍗遍櫓浣滀笟瀹℃壒
*/
private Integer approveType;
+
+ @TableField(exist = false)
+ private String approveTypeName;
/**
* 瀹℃壒澶囨敞
*/
- @ApiModelProperty(value = "瀹℃壒澶囨敞")
+ @Schema(description = "瀹℃壒澶囨敞")
private String approveRemark;
@Excel(name = "寮�濮嬫椂闂�", dateFormat = "yyyy-MM-dd",width = 30)
@JsonFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @Schema(description = "寮�濮嬫椂闂�")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@Excel(name = "缁撴潫鏃堕棿", dateFormat = "yyyy-MM-dd",width = 30)
@JsonFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @Schema(description = "缁撴潫鏃堕棿")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endDate;
@@ -168,4 +170,14 @@
private static final long serialVersionUID = 1L;
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+ @TableField(exist = false)
+ private List<StorageBlobVO> storageBlobVOS;
+
}
--
Gitblit v1.9.3