xujun

science-admin/src/main/java/com/yiboshi/science/entity/ComProjectBasic.java

@@ -205,6 +205,22 @@ public class ComProjectBasic extends BaseEntity {
     @ApiModelProperty(value = "项目属性Id", position = 36)
     @Length(max=36, message = "项目属性Id不能大于36")
     private String projAttribute;
+    /** 年度总目标 */
+    @ApiModelProperty(value = "年度总目标", position = 14 )
+    @Length(max=1000, message = "年度总目标1000")
+    private String yearTarget;
+    /** 第一年目标 */
+    @ApiModelProperty(value = "第一年目标", position = 14 )
+    @Length(max=500, message = "第一年目标500")
+    private String year1Goal;
+    /** 第二年目标 */
+    @ApiModelProperty(value = "第二年目标", position = 14 )
+    @Length(max=500, message = "第二年目标500")
+    private String year2Goal;
+    /** 第三年目标 */
+    @ApiModelProperty(value = "第三年目标", position = 14 )
+    @Length(max=500, message = "第三年目标500")
+    private String year3Goal;
 
 
     /** 备注 */

science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectBasicDTO.java

@@ -204,6 +204,22 @@ public class ComProjectBasicDTO extends BaseDTO {
     @ApiModelProperty(value = "项目属性Id", position = 36)
     @Length(max=36, message = "项目属性Id不能大于36")
     private String projAttribute;
+    /** 年度总目标 */
+    @ApiModelProperty(value = "年度总目标", position = 14)
+    @Length(max=1000, message = "年度总目标1000")
+    private String yearTarget;
+    /** 第一年目标 */
+    @ApiModelProperty(value = "第一年目标", position = 14)
+    @Length(max=500, message = "第一年目标500")
+    private String year1Goal;
+    /** 第二年目标 */
+    @ApiModelProperty(value = "第二年目标", position = 14)
+    @Length(max=500, message = "第二年目标500")
+    private String year2Goal;
+    /** 第三年目标 */
+    @ApiModelProperty(value = "第三年目标", position = 14)
+    @Length(max=500, message = "第三年目标500")
+    private String year3Goal;
 
 
     /** 备注 */

science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java

@@ -274,6 +274,22 @@ public class ComProjectDTO extends BaseDTO {
     @ApiModelProperty(value = "项目属性Id", position = 36)
     @Length(max=36, message = "项目属性Id不能大于36")
     private String projAttribute;
+    /** 年度总目标 */
+    @ApiModelProperty(value = "年度总目标", position = 14 )
+    @Length(max=1000, message = "年度总目标1000")
+    private String yearTarget;
+    /** 第一年目标 */
+    @ApiModelProperty(value = "第一年目标", position = 14 )
+    @Length(max=500, message = "第一年目标500")
+    private String year1Goal;
+    /** 第二年目标 */
+    @ApiModelProperty(value = "第二年目标", position = 14 )
+    @Length(max=500, message = "第二年目标500")
+    private String year2Goal;
+    /** 第三年目标 */
+    @ApiModelProperty(value = "第三年目标", position = 14 )
+    @Length(max=500, message = "第三年目标500")
+    private String year3Goal;
 
 
     /** 备注 */

science-admin/src/main/java/com/yiboshi/science/param/dto/ProjectKPIStatisticDTO.java

@@ -34,6 +34,11 @@ public class ProjectKPIStatisticDTO extends BaseDTO {
     /** 自筹资金 */
     private BigDecimal yearSelf;
 
+    private String yearTarget;
+    private String year1Goal;
+    private String year2Goal;
+    private String year3Goal;
+
     private Integer totalRowSpan; //总合并行数
     private Integer outTarget; //一级指标(产出指标)
     private Integer benefitTarget; //一级指标(效益指标)

science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectBasicQueryVO.java

@@ -203,7 +203,22 @@ public class ComProjectBasicQueryVO extends PaginationVO{
     @ApiModelProperty(value = "项目属性Id", position = 36)
     @Length(max=36, message = "项目属性Id不能大于36")
     private String projAttribute;
-
+    /** 年度总目标 */
+    @ApiModelProperty(value = "年度总目标", position = 14 )
+    @Length(max=1000, message = "年度总目标1000")
+    private String yearTarget;
+    /** 第一年目标 */
+    @ApiModelProperty(value = "第一年目标", position = 14 )
+    @Length(max=500, message = "第一年目标500")
+    private String year1Goal;
+    /** 第二年目标 */
+    @ApiModelProperty(value = "第二年目标", position = 14 )
+    @Length(max=500, message = "第二年目标500")
+    private String year2Goal;
+    /** 第三年目标 */
+    @ApiModelProperty(value = "第三年目标", position = 14 )
+    @Length(max=500, message = "第三年目标500")
+    private String year3Goal;
 
     /** 备注 */
     @ApiModelProperty(value = "备注", position = 38 )