From dae4efc65d5f04626e2f97b7cefa4ab865cee8b4 Mon Sep 17 00:00:00 2001
From: WendyYang <realwendyyang@qq.com>
Date: Thu, 14 Nov 2024 12:27:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=201.=20=E5=A4=8D=E6=A0=B8=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E9=A1=B9=E7=9B=AE=E5=90=8C=E6=AD=A5=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E3=80=81?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E3=80=81ID=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hz/pm/api/open/manage/OpenApiProjectLibManage.java   |  7 +++++--
 .../hz/pm/api/open/model/vo/ReviewPassProjectInfoToMhVO.java | 12 +++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/open/manage/OpenApiProjectLibManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/open/manage/OpenApiProjectLibManage.java
index da70263..f4db542 100644
--- a/hz-pm-api/src/main/java/com/hz/pm/api/open/manage/OpenApiProjectLibManage.java
+++ b/hz-pm-api/src/main/java/com/hz/pm/api/open/manage/OpenApiProjectLibManage.java
@@ -56,8 +56,8 @@ public class OpenApiProjectLibManage {
             sql.append(String.format(" and npsc.create_on >= '%s'", BizDateUtil.toDateStr(po.getReviewPassTime())));
         }
         Wrapper<Project> query = Wrappers.lambdaQuery(Project.class)
-                .select(Project::getProjectCode, Project::getProjectName, Project::getBuildOrgCode,
-                        Project::getProjectYear, Project::getCreateOn, Project::getBuildOrgName)
+                .select(Project::getId, Project::getProjectCode, Project::getProjectName, Project::getBuildOrgCode, Project::getStatus,
+                        Project::getDeclareAmount, Project::getProjectYear, Project::getCreateOn, Project::getBuildOrgName)
                 .exists(sql.toString())
                 .eq(Project::getNewest, Boolean.TRUE)
                 .notIn(Project::getStage, ProjectStatus.CHANGE.getCode(), ProjectStatus.STOPPED.getCode())
@@ -90,6 +90,9 @@ public class OpenApiProjectLibManage {
             item.setProjectName(w.getProjectName());
             item.setBuildOrgCode(w.getBuildOrgCode());
             item.setBuildOrgName(w.getBuildOrgName());
+            item.setDeclareAmount(w.getDeclareAmount());
+            item.setStatus(w.getStatus());
+            item.setId(w.getId());
             List<MhSystemReplaceInfo> replaceInfoList = replaceInfoMap.get(w.getProjectCode());
             if (replaceInfoList != null) {
                 List<ReferSystemReplaceInfoToMhVO> referSystemList = CollUtils.convert(replaceInfoList,
diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/open/model/vo/ReviewPassProjectInfoToMhVO.java b/hz-pm-api/src/main/java/com/hz/pm/api/open/model/vo/ReviewPassProjectInfoToMhVO.java
index 41094ff..34a91bd 100644
--- a/hz-pm-api/src/main/java/com/hz/pm/api/open/model/vo/ReviewPassProjectInfoToMhVO.java
+++ b/hz-pm-api/src/main/java/com/hz/pm/api/open/model/vo/ReviewPassProjectInfoToMhVO.java
@@ -4,12 +4,13 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
 /**
  * <p>
- * ProjectInfoToMhVO
+ * ReviewPassProjectInfoToMhVO
  * </p>
  *
  * @author WendyYang
@@ -37,6 +38,15 @@ public class ReviewPassProjectInfoToMhVO {
     @ApiModelProperty("建设单位名称")
     private String buildOrgName;
 
+    @ApiModelProperty("申报金额")
+    private BigDecimal declareAmount;
+
+    @ApiModelProperty("项目状态")
+    private Integer status;
+
+    @ApiModelProperty("项目ID")
+    private Long id;
+
     @ApiModelProperty("项目系统列表")
     private List<ReferSystemReplaceInfoToMhVO> referSystemList;