From 714ec3cc8e9c0ab12660c1371e832b7dc5532964 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 25 五月 2026 15:44:00 +0800
Subject: [PATCH] feat(approve): 添加销售审批功能并优化相关服务
---
src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
index 64177e8..89e0c3e 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;
/**
* 瀹℃壒娴佺▼琛�
@@ -24,7 +23,7 @@
@ApiModel
public class ApproveProcess{
/**
- *
+ *
*/
@TableId(type = IdType.AUTO)
private Long id;
@@ -79,6 +78,8 @@
@ApiModelProperty(value = "鐢宠鍘熷洜")
@Excel(name = "瀹℃壒浜嬬敱")
private String approveReason;
+ //涓氬姟id
+ private Long recordId;
/**
* 褰撳墠瀹℃壒鐢ㄦ埛ID
@@ -127,9 +128,12 @@
private Long tenantId;
/**
- * 瀹℃壒绫诲瀷
+ * 瀹℃壒绫诲瀷 1-鍏嚭绠＄悊 2-璇峰亣绠＄悊 3-鍑哄樊绠＄悊 4-鎶ラ攢绠＄悊 5-閲囪喘瀹℃壒 6-鎶ヤ环瀹℃壒 7-鍙戣揣瀹℃壒 8-鍗遍櫓浣滀笟瀹℃壒
*/
private Integer approveType;
+
+ @TableField(exist = false)
+ private String approveTypeName;
/**
* 瀹℃壒澶囨敞
@@ -168,4 +172,11 @@
private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+}
--
Gitblit v1.9.3