xujun

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

@@ -221,7 +221,6 @@ public class ComProjectBasicDTO extends BaseDTO {
     @Length(max=500, message = "第三年目标500")
     private String year3Goal;
 
-
     /** 备注 */
     @ApiModelProperty(value = "备注", position = 38 )
     @Length(max=65535, message = "备注不能大于65535")

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

@@ -291,14 +291,11 @@ public class ComProjectDTO extends BaseDTO {
     @Length(max=500, message = "第三年目标500")
     private String year3Goal;
 
-
     /** 备注 */
     @ApiModelProperty(value = "备注", position = 38 )
     @Length(max=65535, message = "备注不能大于65535")
     private String remark;
 
-
-
     /** 项目组成员_总人数 */
     @ApiModelProperty(value = "项目组成员_总人数", position = 17 )
     private Integer memCount;

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

@@ -64,5 +64,4 @@ public class ComProjectKpitDTO extends BaseDTO {
     /** 年度3指标 */
     @ApiModelProperty(value = "年度3指标", position = 7)
     private Integer yearValue3;
-
 }

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

@@ -39,6 +39,7 @@ public class ProjectKPIStatisticDTO extends BaseDTO {
     private String year2Goal;
     private String year3Goal;
 
+
     private Integer totalRowSpan; //总合并行数
     private Integer outTarget; //一级指标(产出指标)
     private Integer benefitTarget; //一级指标(效益指标)

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java

@@ -777,7 +777,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         // 项目绩效指标表
         comProjectKpitDetailService.insertList(dto.getProjectKPI().getKpiList(), comProject.getId());
 
-
         // 项目经费构成表
         comProjectFundCompositionService.insertList(dto.getFundCompositions(), comProject.getId());
         // 在研或完成基础研究项目情况