77

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

@@ -50,7 +50,6 @@ public class ComProjectTask extends BaseEntity {
     @ApiModelProperty(value = "结束日期", position = 8 )
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endDate;
-
     /** 组织机构代码/统一社会信用代码 */
     @ApiModelProperty(value = "组织机构代码/统一社会信用代码", position = 1 )
     @Length(max=50, message = "组织机构代码/统一社会信用代码不能大于50")
@@ -171,10 +170,6 @@ public class ComProjectTask extends BaseEntity {
     @ApiModelProperty(value = "项目实施中形成的示范基地、中试线、生产线及其规模等", position = 35 )
     @Length(max=2147483647, message = "项目实施中形成的示范基地、中试线、生产线及其规模等不能大于2147483647")
     private String achievementTarget;
-    /** 科技报告考核指标 */
-    @ApiModelProperty(value = "科技报告考核指标", position = 35 )
-    @Length(max=2147483647, message = "科技报告考核指标不能大于2147483647")
-    private String technologyReportsTarget;
     /** 其他应考核的指标 */
     @ApiModelProperty(value = "其他应考核的指标", position = 35 )
     @Length(max=2147483647, message = "其他应考核的指标不能大于2147483647")

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

 package com.yiboshi.science.param.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yiboshi.science.base.BaseDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 @Data

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

 package com.yiboshi.science.param.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yiboshi.science.base.BaseDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 @Data

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

 package com.yiboshi.science.param.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yiboshi.science.base.BaseDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
+import java.util.Date;
 import java.util.List;
 
 @Data

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

@@ -2,10 +2,13 @@ package com.yiboshi.science.param.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yiboshi.science.base.BaseDTO;
+import com.yiboshi.science.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import org.hibernate.validator.constraints.Length;
 
 import java.math.BigDecimal;

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

@@ -94,6 +94,7 @@ public class ComProjectDTO extends BaseDTO {
     @ApiModelProperty(value = "平均分", position = 4)
     private BigDecimal averageScore;
 
+
     /** 项目Id */
     @ApiModelProperty(value="项目Id")
     @Length(max=36, message = "Id不能大于36")

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

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
 

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

@@ -84,6 +84,31 @@ public class ComProjectBasicQueryVO extends PaginationVO{
     @ApiModelProperty(value = "其他", position = 43)
     private BigDecimal otherFunding;
 
+    /** 项目实施目标 */
+    @ApiModelProperty(value = "项目实施目标", position = 28 )
+    @Length(max=2147483647, message = "项目实施目标不能大于2147483647")
+    private String researchContent;
+    /** 主要技术指标 */
+    @ApiModelProperty(value = "主要技术指标", position = 35 )
+    @Length(max=2147483647, message = "主要技术指标不能大于2147483647")
+    private String technologyTarget;
+    /** 主要经济指标 */
+    @ApiModelProperty(value = "主要经济指标", position = 35 )
+    @Length(max=2147483647, message = "主要经济指标不能大于2147483647")
+    private String economyTarget;
+    /** 项目实施中形成的示范基地、中试线、生产线及其规模等 */
+    @ApiModelProperty(value = "项目实施中形成的示范基地、中试线、生产线及其规模等", position = 35 )
+    @Length(max=2147483647, message = "项目实施中形成的示范基地、中试线、生产线及其规模等不能大于2147483647")
+    private String achievementTarget;
+    /** 科技报告考核指标 */
+    @ApiModelProperty(value = "科技报告考核指标", position = 35 )
+    @Length(max=2147483647, message = "科技报告考核指标不能大于2147483647")
+    private String technologyReportsTarget;
+    /** 其他应考核的指标 */
+    @ApiModelProperty(value = "其他应考核的指标", position = 35 )
+    @Length(max=2147483647, message = "其他应考核的指标不能大于2147483647")
+    private String otherTarget;
+
     @ApiModelProperty(value = "项目属性Id", position = 36)
     @Length(max=36, message = "项目属性Id不能大于36")
     private String projAttribute;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectBasicController.java

@@ -14,5 +14,5 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/v1/science-admin/com-project-basic")
 public class ComProjectBasicController extends BaseController<ComProjectBasicService, ComProjectBasicQueryVO, ComProjectBasicDTO, ComProjectBasic> {
-11
+
 }