From b465cb64b42d207ffd7865c87be531d249f379ee Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 11 七月 2025 17:20:58 +0800
Subject: [PATCH] yys 修改审批协同bug
---
src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
index 58cdddb..57bfdb1 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
@@ -1,6 +1,7 @@
package com.ruoyi.approve.pojo;
import java.io.Serializable;
+import java.time.LocalDateTime;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.*;
@@ -13,7 +14,7 @@
*/
@Data
@TableName("approve_process")
-public class ApproveProcess implements Serializable {
+public class ApproveProcess{
/**
*
*/
@@ -21,7 +22,7 @@
private Long id;
/**
- * 瀹℃壒id
+ * 娴佺▼缂栧彿
*/
private String approveId;
@@ -29,6 +30,11 @@
* 鐢宠浜篿d
*/
private Long approveUser;
+
+ /**
+ * 鐢宠浜哄悕绉�
+ */
+ private String approveUserName;
/**
* 鐢宠閮ㄩ棬id
@@ -41,12 +47,12 @@
private String approveDeptName;
/**
- * 鐢宠鐢ㄦ埛ids
+ * 瀹℃壒鐢ㄦ埛ids
*/
private String approveUserIds;
/**
- * 鐢宠鐢ㄦ埛鍚嶇О
+ * 瀹℃壒鐢ㄦ埛鍚嶇О
*/
private String approveUserNames;
@@ -54,6 +60,16 @@
* 鐢宠鍘熷洜
*/
private String approveReason;
+
+ /**
+ * 褰撳墠瀹℃壒鐢ㄦ埛ID
+ */
+ private Long approveUserCurrentId;
+
+ /**
+ * 褰撳墠瀹℃壒鐢ㄦ埛鍚嶇О
+ */
+ private String approveUserCurrentName;
/**
* 鐢宠鏃ユ湡
@@ -68,7 +84,7 @@
private Date approveOverTime;
/**
- * 瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚
+ * 瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃
*/
private Integer approveStatus;
@@ -80,7 +96,7 @@
/**
* 绉熸埛id
*/
- @TableField(fill = FieldFill.INSERT)
+// @TableField(fill = FieldFill.INSERT)
private Long tenantId;
/**
@@ -93,6 +109,11 @@
*/
private String approveRemark;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private LocalDateTime createTime;
+
private static final long serialVersionUID = 1L;
--
Gitblit v1.9.3