From 1040b2655e02b8ff2ec3a9f053cf0cdd5c41dda7 Mon Sep 17 00:00:00 2001
From: WendyYang <realwendyyang@qq.com>
Date: Thu, 19 Sep 2024 13:45:44 +0800
Subject: [PATCH] =?UTF-8?q?modify:=201.=20=E9=A1=B9=E7=9B=AE=E7=AB=8B?=
 =?UTF-8?q?=E9=A1=B9=E5=A2=9E=E5=8A=A0=E5=B9=B4=E5=BA=A6=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java | 1 +
 .../com/hz/pm/api/projectdeclared/model/vo/PurchaseAdaptionListVO.java | 3 +++
 .../java/com/hz/pm/api/projectlib/manage/DeclaredRecordManage.java     | 1 +
 .../java/com/hz/pm/api/projectlib/model/vo/DeclaredProjectListVO.java  | 3 +++
 4 files changed, 8 insertions(+)

diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java
index 1fc6e2f..81af26f 100644
--- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java
+++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java
@@ -708,6 +708,7 @@ public class PurchaseManage {
             adaption.setBizName(w.getBidName());
             adaption.setProjectId(w.getProjectId());
             Project project = projectMap.get(w.getProjectId());
+            adaption.setProjectYear(project.getProjectYear());
             adaption.setProjectName(project.getProjectName());
             adaption.setBuildOrg(project.getBuildOrgName());
             adaption.setProjectStatus(project.getStatus());
diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseAdaptionListVO.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseAdaptionListVO.java
index 5cfeb33..8ec135b 100644
--- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseAdaptionListVO.java
+++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseAdaptionListVO.java
@@ -31,6 +31,9 @@ public class PurchaseAdaptionListVO {
     @ApiModelProperty("标段名称")
     private String bizName;
 
+    @ApiModelProperty("项目年份")
+    private Integer projectYear;
+
     @ApiModelProperty("项目名称")
     private String projectName;
 
diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/DeclaredRecordManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/DeclaredRecordManage.java
index 10d859b..7625ced 100644
--- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/DeclaredRecordManage.java
+++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/DeclaredRecordManage.java
@@ -251,6 +251,7 @@ public class DeclaredRecordManage {
             item.setReviewAmount(w.getReviewAmount());
             item.setApprovedAmount(w.getApprovalAmount());
             item.setCreateTime(w.getCreateOn());
+            item.setProjectYear(w.getProjectYear());
             ProjectStatus status = getDeclaredRecordStatus(w.getStatus());
             item.setStatus(status.getCode());
             item.setStage(status.getStage());
diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/vo/DeclaredProjectListVO.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/vo/DeclaredProjectListVO.java
index 8a0aac1..850da91 100644
--- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/vo/DeclaredProjectListVO.java
+++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/vo/DeclaredProjectListVO.java
@@ -17,6 +17,9 @@ import java.time.LocalDateTime;
 @Data
 public class DeclaredProjectListVO {
 
+    @ApiModelProperty("项目年份")
+    private Integer projectYear;
+
     @ApiModelProperty("项目名称")
     private String projectName;