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/approve/pojo/ApproveProcess.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
index 6b70139..7a47f0f 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
@@ -1,11 +1,5 @@
package com.ruoyi.approve.pojo;
-import java.io.Serializable;
-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;
@@ -14,6 +8,11 @@
import io.swagger.annotations.ApiModelProperty;
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;
/**
* 瀹℃壒娴佺▼琛�
@@ -93,6 +92,21 @@
private String approveUserCurrentName;
/**
+ * 褰撳墠鑺傜偣寰呭浜篒D锛堥�楀彿鍒嗛殧锛屾垨绛�/浼氱澶氫汉锛�
+ */
+ private String approveUserCurrentIds;
+
+ /**
+ * 褰撳墠鑺傜偣寰呭浜哄鍚嶏紙閫楀彿鍒嗛殧锛�
+ */
+ private String approveUserCurrentNames;
+
+ /**
+ * 鑺傜偣缁撴瀯蹇収JSON锛歔{nodeOrder,mode,userIds,userNames}]锛岀敤浜庣紪杈戦噸寤哄鎵硅妭鐐�
+ */
+ private String approveNodeConfig;
+
+ /**
* 鐢宠鏃ユ湡
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -140,13 +154,13 @@
@ApiModelProperty(value = "瀹℃壒澶囨敞")
private String approveRemark;
- @Excel(name = "寮�濮嬫椂闂�", dateFormat = "yyyy-MM-dd",width = 30)
+ @Excel(name = "寮�濮嬫椂闂�", dateFormat = "yyyy-MM-dd HH:mm:ss",width = 30)
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startDate;
- @Excel(name = "缁撴潫鏃堕棿", dateFormat = "yyyy-MM-dd",width = 30)
+ @Excel(name = "缁撴潫鏃堕棿", dateFormat = "yyyy-MM-dd HH:mm:ss",width = 30)
@ApiModelProperty(value = "缁撴潫鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
--
Gitblit v1.9.3