From f350465db70d6f9db9494483ee0cec7793a9007b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 19 八月 2026 17:47:57 +0800
Subject: [PATCH] feat(approve): 实现审批流程或签会签功能并优化数据库配置
---
src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
index d6d1d81..d7a267f 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
@@ -3,11 +3,13 @@
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.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
+import java.util.List;
@Data
@TableName("seal_application_management")
@@ -32,7 +34,7 @@
* 鐢ㄥ嵃绫诲瀷
*/
@ApiModelProperty("鐢ㄥ嵃绫诲瀷")
- @Excel(name = "鐢ㄥ嵃绫诲瀷", readConverterExp = "official=鍏珷,contract=鍚堝悓涓撶敤绔�,finance=璐㈠姟涓撶敤绔�,legal=鏈煡")
+ @Excel(name = "鐢ㄥ嵃绫诲瀷", readConverterExp = "official=鍏珷,contract=鍚堝悓涓撶敤绔�,finance=璐㈠姟涓撶敤绔�,legal=娉曚汉绔�")
private String sealType;
/**
* 鐢宠鐢ㄥ嵃鍘熷洜
@@ -51,6 +53,29 @@
@ApiModelProperty("鐘舵��")
@Excel(name = "鐘舵��", readConverterExp = "pending=寰呭鎵�,approved=宸查�氳繃,rejected=宸叉嫆缁�")
private String status;
+
+ /**
+ * 瀹℃壒浜�
+ */
+ private Long approveUserId;
+
+ /**
+ * 鍏宠仈鐨勫崗鍚屽鎵规祦绋嬩富閿甶d锛坅pprove_process.id锛�
+ */
+ @ApiModelProperty("鍗忓悓瀹℃壒娴佺▼id")
+ private Long approveProcessId;
+
+ /**
+ * 闄勪欢鍒楄〃锛堟彁浜ょ敤锛屾潵鑷墠绔� /common/upload 涓婁紶缁撴灉锛�
+ */
+ @TableField(exist = false)
+ private List<CommonFile> attachmentList;
+
+ /**
+ * 闄勪欢鍒楄〃锛堟煡璇㈠睍绀虹敤锛�
+ */
+ @TableField(exist = false)
+ private List<CommonFile> commonFileList;
/**
* 鍒涘缓鑰�
*/
@@ -69,4 +94,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3