From 064c8bbbbfddb866307356d62f30dbc9e5710e96 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 17 九月 2025 16:01:18 +0800
Subject: [PATCH] feat(collaborativeApproval): 新增会议管理相关功能

---
 src/main/java/com/ruoyi/warehouse/pojo/Documentation.java |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java b/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java
index cc3ea71..0c1a612 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java
@@ -1,14 +1,15 @@
 package com.ruoyi.warehouse.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -23,111 +24,151 @@
      * 
      */
     @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "鏂囨。ID")
     private Long id;
 
     /**
-     * 绫诲埆鍚嶇О
+     * 绫诲埆鍚嶇Оid
      */
-    private String categoryName;
+    @Excel(name = "绫诲埆鍚嶇Оid")
+    @ApiModelProperty(value = "绫诲埆鍚嶇Оid")
+    private Long documentClassificationId;
 
     /**
      * 鏂囨。鍚嶇О
      */
+    @Excel(name = "鏂囨。鍚嶇О")
+    @ApiModelProperty(value = "鏂囨。鍚嶇О")
     private String docName;
 
     /**
      * 鏂囨。缂栧彿
      */
-    private Long docNumber;
+    @Excel(name = "鏂囨。缂栧彿")
+    @ApiModelProperty(value = "鏂囨。缂栧彿")
+    private String docNumber;
 
     /**
      * 骞翠唤
      */
+    @Excel(name = "骞翠唤")
+    @ApiModelProperty(value = "骞翠唤")
     private Long year;
 
     /**
      * 璐ｄ换浜�
      */
+    @Excel(name = "璐ｄ换浜�")
+    @ApiModelProperty(value = "璐ｄ换浜�")
     private String responsiblePerson;
 
     /**
      * 鏂囨。鏀剧疆浣嶇疆
      */
+    @Excel(name = "鏂囨。鏀剧疆浣嶇疆")
+    @ApiModelProperty(value = "鏂囨。鏀剧疆浣嶇疆")
     private Long warehouseGoodsShelvesRowcolId;
 
     /**
      * 鏂囨。鏃ユ湡
      */
+
+    @Excel(name = "鏂囨。鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
+    @ApiModelProperty(value = "鏂囨。鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime docDate;
 
     /**
      * 淇濈鏈熼檺
      */
+    @Excel(name = "淇濈鏈熼檺")
+    @ApiModelProperty(value = "淇濈鏈熼檺")
     private Long retentionPeriod;
 
     /**
      * 淇濆瘑绾у埆
      */
+    @Excel(name = "淇濆瘑绾у埆")
+    @ApiModelProperty(value = "淇濆瘑绾у埆")
     private String securityLevel;
 
     /**
      * 浠芥暟
      */
+    @Excel(name = "浠芥暟")
+    @ApiModelProperty(value = "浠芥暟")
     private Long copyCount;
 
     /**
      * 椤垫暟
      */
+    @Excel(name = "椤垫暟")
+    @ApiModelProperty(value = "椤垫暟")
     private Long pageCount;
 
     /**
      * 鏂囨。绫诲埆
      */
+    @Excel(name = "鏂囨。绫诲埆")
+    @ApiModelProperty(value = "鏂囨。绫诲埆")
     private String docCategory;
 
     /**
      * 鏂囨。绉嶇被
      */
+    @Excel(name = "鏂囨。绉嶇被")
+    @ApiModelProperty(value = "鏂囨。绉嶇被")
     private String docType;
 
     /**
      * 绱ф�ョ▼搴�
      */
+    @Excel(name = "绱ф�ョ▼搴�")
+    @ApiModelProperty(value = "绱ф�ョ▼搴�")
     private String urgencyLevel;
 
     /**
      * 鏂囨。鐘舵��
      */
+    @Excel(name = "鏂囨。鐘舵��")
+    @ApiModelProperty(value = "鏂囨。鐘舵��")
     private String docStatus;
 
     /**
      * 澶囨敞
      */
+    @Excel(name = "澶囨敞")
+    @ApiModelProperty(value = "澶囨敞")
     private String remark;
 
     /**
      * 鍒涘缓鏃堕棿
      */
+    @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;
 
     /**
      * 鍒涘缓鐢ㄦ埛
      */
-    private Long createUser;
+    @TableField(fill = FieldFill.INSERT)
+    private Integer createUser;
 
     /**
      * 淇敼鏃堕棿
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime updateTime;
 
     /**
      * 淇敼鐢ㄦ埛
      */
-    private Long updateUser;
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Integer updateUser;
 
     /**
      * 绉熸埛ID
      */
+    @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
     private static final long serialVersionUID = 1L;

--
Gitblit v1.9.3