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/ProjectArchiveManage.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/ProjectArchiveManage.java b/src/main/java/com/whyc/pojo/ProjectArchiveManage.java
index 22ea9c5..3ba4aea 100644
--- a/src/main/java/com/whyc/pojo/ProjectArchiveManage.java
+++ b/src/main/java/com/whyc/pojo/ProjectArchiveManage.java
@@ -35,16 +35,24 @@
/**
* 椤圭洰绫诲瀷
*/
- private Integer proSort;
+ private String proSort;
/**
* 绔嬮」鏉愭枡/鏂囨。鏉愭枡鍦板潃
*/
private String proFilePath;
-
+ /**
+ * 鏂囨。涓婁紶鏃ユ湡
+ */
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai")
private Date proUploadDate;
+
+ /**
+ * 褰掓。鏃ユ湡
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai")
+ private Date proArchiveDate;
/**
* 棰勮鏂囦欢鍚嶅湴鍧�
@@ -62,12 +70,6 @@
private String proDocumentFormat;
/**
- * 褰掓。鏃ユ湡
- */
- @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai")
- private Date proArchiveDate;
-
- /**
* 鎴愭灉鍚嶇О
*/
private String achievementName;
@@ -78,7 +80,7 @@
private String achievementType;
/**
- * 鍙栧緱/鍙戣〃鏃ユ湡
+ * 鍙栧緱/鍙戣揪鏃ユ湡
*/
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai")
private Date gainDate;
@@ -119,11 +121,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;
}
@@ -141,6 +143,14 @@
public void setProUploadDate(Date proUploadDate) {
this.proUploadDate = proUploadDate;
+ }
+
+ public Date getProArchiveDate() {
+ return proArchiveDate;
+ }
+
+ public void setProArchiveDate(Date proArchiveDate) {
+ this.proArchiveDate = proArchiveDate;
}
public String getProPdfFilePath() {
@@ -165,14 +175,6 @@
public void setProDocumentFormat(String proDocumentFormat) {
this.proDocumentFormat = proDocumentFormat;
- }
-
- public Date getProArchiveDate() {
- return proArchiveDate;
- }
-
- public void setProArchiveDate(Date proArchiveDate) {
- this.proArchiveDate = proArchiveDate;
}
public String getAchievementName() {
--
Gitblit v1.9.1