From ba4bf099087a6bd10944fef200807eeb6efd32f9 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Mon, 18 Sep 2023 10:38:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E6=8A=A5=E9=A1=B9=E7=9B=AE=20?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/projectdeclared/model/entity/ProjectDraft.java         | 6 ++++++
 .../pmapi/projectdeclared/model/vo/ProjectDraftVO.java           | 6 ++++++
 .../com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java    | 9 ++++++---
 .../com/ningdatech/pmapi/projectlib/model/entity/Project.java    | 6 ++++++
 .../ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java    | 6 ++++++
 5 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java
index a0ea45d..f0df7d3 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java
@@ -337,6 +337,12 @@ public class ProjectDraft implements Serializable {
     @ApiModelProperty("其他附件")
     private String baseProjOtherFile;
 
+    @ApiModelProperty("项目内容与预期成效")
+    private String beseExpectedResults;
+
+    @ApiModelProperty("内容类别")
+    private String baseConstructionType;
+
     private Long createBy;
     private Long updateBy;
 }
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java
index bbcd882..98389ee 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java
@@ -337,6 +337,12 @@ public class ProjectDraftVO implements Serializable {
     @ApiModelProperty("其他附件")
     private String baseProjOtherFile;
 
+    @ApiModelProperty("项目内容与预期成效")
+    private String beseExpectedResults;
+
+    @ApiModelProperty("内容类别")
+    private String baseConstructionType;
+
     private Long createBy;
     private Long updateBy;
 }
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java
index 14884a6..c7072a5 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java
@@ -328,9 +328,6 @@ public class ProjectDTO implements Serializable {
     //P省级，M市级，C县（市、区）级，T乡镇（街道、办事处）级，V村（社区）级
     private String baseLowestLevel;
 
-    //01软件，02硬件，03服务，多个时用中文；分割
-    private String baseConstructionType;
-
     //01评审中；02待立项；03已驳回；04已立项；05已采购；06已初验；07已终验；00已终止
     private String baseProjSetProg;
 
@@ -351,4 +348,10 @@ public class ProjectDTO implements Serializable {
 
     @ApiModelProperty("其他附件")
     private String baseProjOtherFile;
+
+    @ApiModelProperty("项目内容与预期成效")
+    private String beseExpectedResults;
+
+    @ApiModelProperty("内容类别")
+    private String baseConstructionType;
 }
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java
index 02c9f20..04f96bd 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java
@@ -518,6 +518,12 @@ public class Project implements Serializable {
     @ApiModelProperty("是否退回|驳回的项目版本")
     private Boolean isBackReject;
 
+    @ApiModelProperty("项目内容与预期成效")
+    private String beseExpectedResults;
+
+    @ApiModelProperty("内容类别")
+    private String baseConstructionType;
+
     @ApiModelProperty("可研报告")
     private String baseResearchReportFile;
 
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java
index 2a71164..3550788 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java
@@ -493,6 +493,12 @@ public class ProjectDetailVO {
     @ApiModelProperty("安全风险监测信息")
     private SafetyMonitorVO safetyInfo;
 
+    @ApiModelProperty("项目内容与预期成效")
+    private String beseExpectedResults;
+
+    @ApiModelProperty("内容类别")
+    private String baseConstructionType;
+
     @ApiModelProperty("可研报告")
     private String baseResearchReportFile;