申报项目 字段更新

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;
 }

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;
 }

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;
 }

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;
 

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;