绩效评价-指标配置修改

pmapi/src/main/java/com/ningdatech/pmapi/performance/model/dto/PerformanceIndicatorProjectTemplateSaveDTO.java

@@ -34,6 +34,9 @@ public class PerformanceIndicatorProjectTemplateSaveDTO implements Serializable
     @ApiModelProperty("项目类型 ")
     private Integer projectType;
 
+    @ApiModelProperty("建设类型 1 软件、2 硬件、3 软硬件")
+    private Integer constructType;
+
     @ApiModelProperty("项目资金范围 1.500万元以下、2.500-2000万元，3.2000万元及以上")
     private Integer amountRange;
 

pmapi/src/main/java/com/ningdatech/pmapi/performance/model/dto/ProjectCoreBusinessDTO.java

@@ -6,6 +6,9 @@ import java.math.BigDecimal;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.Size;
 
 /**
  * @author CMM
@@ -24,18 +27,23 @@ public class ProjectCoreBusinessDTO implements Serializable {
     private String coreBusiness;
 
     @ApiModelProperty("业务指标分值")
+    @Range(min = 0, max = 10, message = "数值范围不正确,数值应大于0小于10")
     private BigDecimal score;
 
     @ApiModelProperty("业务指标名称")
+    @Size(max = 100)
     private String businessIndicatorName;
 
     @ApiModelProperty("业务指标描述")
+    @Size(max = 100)
     private String businessIndicatorDescription;
 
     @ApiModelProperty("指标设计依据")
+    @Size(max = 100)
     private String indexDesignBasis;
 
     @ApiModelProperty("指标计算方法")
+    @Size(max = 100)
     private String indexCalculationMethod;
 
     @ApiModelProperty("项目ID")

pmapi/src/main/java/com/ningdatech/pmapi/performance/model/dto/ProjectTemplateDetailDTO.java

@@ -3,6 +3,8 @@ package com.ningdatech.pmapi.performance.model.dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.hibernate.validator.constraints.Range;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
@@ -32,6 +34,7 @@ public class ProjectTemplateDetailDTO implements Serializable {
     private Long parentId;
 
     @ApiModelProperty("指标分值 3级指标才有")
+    @Range(min = 0, max = 100, message = "数值范围不正确,数值应大于0小于100")
     private BigDecimal indexScore;
 
     @ApiModelProperty("指标细则 3级指标才有")

pmapi/src/main/java/com/ningdatech/pmapi/performance/model/entity/ProjectCoreBusinessIndicators.java

@@ -38,23 +38,18 @@ public class ProjectCoreBusinessIndicators implements Serializable {
     private String coreBusiness;
 
     @ApiModelProperty("业务指标分值")
-    @Range(min = 0, max = 10, message = "数值范围不正确,数值应大于0小于10")
     private BigDecimal score;
 
     @ApiModelProperty("业务指标名称")
-    @Size(max = 100)
     private String businessIndicatorName;
 
     @ApiModelProperty("业务指标描述")
-    @Size(max = 100)
     private String businessIndicatorDescription;
 
     @ApiModelProperty("指标设计依据")
-    @Size(max = 100)
     private String indexDesignBasis;
 
     @ApiModelProperty("指标计算方法")
-    @Size(max = 100)
     private String indexCalculationMethod;
 
     @ApiModelProperty("项目ID")

pmapi/src/main/java/com/ningdatech/pmapi/performance/model/vo/ProjectTemplateDetailVO.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -25,23 +26,26 @@ public class ProjectTemplateDetailVO implements Serializable {
     @ApiModelProperty("指标名称")
     private String name;
 
-    @ApiModelProperty("指标类型 0阶段 1一级指标 2二级指标 3三级指标")
+    @ApiModelProperty("指标类型 1一级指标 2二级指标 3三级指标")
     private Integer type;
 
     @ApiModelProperty("父级指标id")
     private Long parentId;
 
-    @ApiModelProperty("分数 3级指标才有")
-    private Integer score;
+    @ApiModelProperty("指标分值 3级指标才有")
+    private BigDecimal indexScore;
 
-    @ApiModelProperty("分数细则 3级指标才有")
-    private String scoreRubric;
+    @ApiModelProperty("指标细则 3级指标才有")
+    private String indexDetail;
 
-    @ApiModelProperty("评分pdf")
-    private String pdf;
+    @ApiModelProperty("评分细则")
+    private String gradeDetail;
 
-    @ApiModelProperty("阶段id")
-    private Long stageId;
+    @ApiModelProperty("佐证材料描述")
+    private String supportMaterial;
+
+    @ApiModelProperty("是否为附加指标")
+    private Boolean isAdditional;
 
     @ApiModelProperty("子指标")
     private List<ProjectTemplateDetailVO> children;