From 0e4534e51dbea1eb0b95d61cc7d0206022ead4a1 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期一, 29 三月 2021 17:31:21 +0800
Subject: [PATCH] update 项目管理/项目归档

---
 src/main/java/com/whyc/pojo/ProjectManage.java |   40 +++++++++++++++++++++++++++++++++-------
 1 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/whyc/pojo/ProjectManage.java b/src/main/java/com/whyc/pojo/ProjectManage.java
index 6f89ec9..1b6344c 100644
--- a/src/main/java/com/whyc/pojo/ProjectManage.java
+++ b/src/main/java/com/whyc/pojo/ProjectManage.java
@@ -30,18 +30,22 @@
     /**
      * 椤圭洰鍚嶇О鍞竴璇嗗埆鐮�(200001010101 骞存湀鏃ユ椂鍒嗙
      */
-    @NotNull
     private String proNameCode;
 
     /**
-     * 椤圭洰绫诲瀷
+     * 椤圭洰绫诲瀷/绫诲埆
      */
-    private Integer proSort;
+    private String proSort;
 
     /**
      * 椤圭洰璐熻矗浜�
      */
     private String proAdmin;
+
+    /**
+     * 鎵�鍦ㄩ儴闂�
+     */
+    private String proDepartment;
 
     /**
      * 鑱旂郴鏂瑰紡
@@ -67,6 +71,12 @@
     private Date proExecutionDate1;
 
     /**
+     * 褰掓。鏃ユ湡
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai")
+    private Date proArchiveDate;
+
+    /**
      * 鍙備笌浜哄憳
      */
     private String proPerson;
@@ -87,12 +97,12 @@
     private String proContent;
 
     /**
-     * 椤圭洰鐘舵��/杩涜涓�0-4锛屽繁缁撴潫5锛屽繁褰掓。6
+     * 椤圭洰鐘舵��/杩涜涓�1-4锛屽繁缁撴潫5锛屽繁褰掓。6
      */
     private Integer proState;
 
     /**
-     * 椤圭洰杩涘害锛�0-6 绔嬮」銆佸鎵广�佺爺绌躲�佺粨棰樸�侀獙鏀躲�佸綊妗ｏ級
+     * 椤圭洰杩涘害锛�1-6 绔嬮」銆佸鎵广�佺爺绌躲�佺粨棰樸�侀獙鏀躲�佸綊妗ｏ級
      */
     private Integer proProgress;
 
@@ -132,11 +142,11 @@
         this.proNameCode = proNameCode;
     }
 
-    public Integer getProSort() {
+    public String getProSort() {
         return proSort;
     }
 
-    public void setProSort(Integer proSort) {
+    public void setProSort(String proSort) {
         this.proSort = proSort;
     }
 
@@ -146,6 +156,14 @@
 
     public void setProAdmin(String proAdmin) {
         this.proAdmin = proAdmin;
+    }
+
+    public String getProDepartment() {
+        return proDepartment;
+    }
+
+    public void setProDepartment(String proDepartment) {
+        this.proDepartment = proDepartment;
     }
 
     public String getProTel() {
@@ -180,6 +198,14 @@
         this.proExecutionDate1 = proExecutionDate1;
     }
 
+    public Date getProArchiveDate() {
+        return proArchiveDate;
+    }
+
+    public void setProArchiveDate(Date proArchiveDate) {
+        this.proArchiveDate = proArchiveDate;
+    }
+
     public String getProPerson() {
         return proPerson;
     }

--
Gitblit v1.9.1