From 366b67926809852c1090f14c5a24fe00109a81b5 Mon Sep 17 00:00:00 2001 From: maven <2163098428@qq.com> Date: 星期一, 28 七月 2025 17:59:52 +0800 Subject: [PATCH] yys 首页接口开发 --- src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java | 42 ++++++++++++++++++++++++++++++++++++------ 1 files changed, 36 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..02e9f45 100644 --- a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java +++ b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java @@ -1,10 +1,13 @@ package com.ruoyi.approve.pojo; import java.io.Serializable; +import java.time.LocalDateTime; import java.util.Date; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -13,7 +16,8 @@ */ @Data @TableName("approve_process") -public class ApproveProcess implements Serializable { +@ApiModel +public class ApproveProcess{ /** * */ @@ -21,14 +25,20 @@ private Long id; /** - * 瀹℃壒id + * 娴佺▼缂栧彿 */ + @ApiModelProperty(value = "娴佺▼缂栧彿") private String approveId; /** * 鐢宠浜篿d */ private Long approveUser; + + /** + * 鐢宠浜哄悕绉� + */ + private String approveUserName; /** * 鐢宠閮ㄩ棬id @@ -38,27 +48,40 @@ /** * 鐢宠閮ㄩ棬鍚嶇О */ + @ApiModelProperty(value = "鐢宠閮ㄩ棬鍚嶇О") private String approveDeptName; /** - * 鐢宠鐢ㄦ埛ids + * 瀹℃壒鐢ㄦ埛ids */ private String approveUserIds; /** - * 鐢宠鐢ㄦ埛鍚嶇О + * 瀹℃壒鐢ㄦ埛鍚嶇О */ private String approveUserNames; /** * 鐢宠鍘熷洜 */ + @ApiModelProperty(value = "鐢宠鍘熷洜") private String approveReason; + + /** + * 褰撳墠瀹℃壒鐢ㄦ埛ID + */ + private Long approveUserCurrentId; + + /** + * 褰撳墠瀹℃壒鐢ㄦ埛鍚嶇О + */ + private String approveUserCurrentName; /** * 鐢宠鏃ユ湡 */ @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "鐢宠鏃ユ湡") private Date approveTime; /** @@ -68,8 +91,9 @@ private Date approveOverTime; /** - * 瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 + * 瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜� */ + @ApiModelProperty(value = "瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�") private Integer approveStatus; /** @@ -80,7 +104,7 @@ /** * 绉熸埛id */ - @TableField(fill = FieldFill.INSERT) +// @TableField(fill = FieldFill.INSERT) private Long tenantId; /** @@ -91,8 +115,14 @@ /** * 瀹℃壒澶囨敞 */ + @ApiModelProperty(value = "瀹℃壒澶囨敞") private String approveRemark; + /** + * 鍒涘缓鏃堕棿 + */ + private LocalDateTime createTime; + private static final long serialVersionUID = 1L; -- Gitblit v1.9.3