111

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

@@ -25,19 +25,19 @@ public class ComProjectResearch extends BaseEntity {
     private String objectId;
     /** 项目编号 */
     @ApiModelProperty(value = "项目编号", position = 2 )
-    @Length(max=50, message = "项目编号不能大于100")
+    @Length(max=100, message = "项目编号不能大于100")
     private String projNo;
     /** 项目名称 */
     @ApiModelProperty(value = "项目名称", position = 3 )
-    @Length(max=200, message = "项目名称不能大于100")
+    @Length(max=100, message = "项目名称不能大于100")
     private String projName;
     /** 批准单位 */
     @ApiModelProperty(value = "批准单位", position = 4 )
-    @Length(max=200, message = "批准单位不能大于100")
+    @Length(max=100, message = "批准单位不能大于100")
     private String approveUnit;
     /** 负责人 */
     @ApiModelProperty(value = "负责人", position = 5 )
-    @Length(max=60, message = "负责人不能大于100")
+    @Length(max=100, message = "负责人不能大于100")
     private String leader;
     /** 起止年限（开始） */
     @ApiModelProperty(value = "起止年限", position = 6 )

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

@@ -387,7 +387,7 @@ public class ComProjectDTO extends BaseDTO {
     /** 项目经费构成表   */
     private List<ComProjectFundCompositionDTO> fundCompositions;
     /** 在研或完成基础研究项目情况 */
-    private List<ComProjectResearchDTO> researchList;
+    private List<ComProjectResearchDTO> projectResearchList;
     /** 项目课颖设置表 */
     private List<ComProjectSubDTO> projectSubList;
     /** 单位科研项目及资金管理制度表 */

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

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 项目申请书在研项目情况表DTO
@@ -25,26 +26,26 @@ public class ComProjectResearchDTO extends BaseDTO {
     private String objectId;
     /** 项目编号 */
     @ApiModelProperty(value = "项目编号", position = 2 )
-    @Length(max=50, message = "项目编号不能大于100")
+    @Length(max=100, message = "项目编号不能大于100")
     private String projNo;
     /** 项目名称 */
     @ApiModelProperty(value = "项目名称", position = 3 )
-    @Length(max=200, message = "项目名称不能大于100")
+    @Length(max=100, message = "项目名称不能大于100")
     private String projName;
     /** 批准单位 */
     @ApiModelProperty(value = "批准单位", position = 4 )
-    @Length(max=200, message = "批准单位不能大于100")
+    @Length(max=100, message = "批准单位不能大于100")
     private String approveUnit;
     /** 负责人 */
     @ApiModelProperty(value = "负责人", position = 5 )
-    @Length(max=60, message = "负责人不能大于100")
+    @Length(max=100, message = "负责人不能大于100")
     private String leader;
     /** 起止年限（开始） */
     @ApiModelProperty(value = "起止年限", position = 6 )
-    private Data startDate;
+    private Date startDate;
     /** 起止年限（结束） */
     @ApiModelProperty(value = "起止年限", position = 6 )
-    private Data endDate;
+    private Date endDate;
     /** 项目经费 */
     @ApiModelProperty(value = "项目经费", position = 7 )
     private BigDecimal funds;

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

@@ -25,19 +25,19 @@ public class ComProjectResearchQueryVO extends PaginationVO{
     private String objectId;
     /** 项目编号 */
     @ApiModelProperty(value = "项目编号", position = 2 )
-    @Length(max=50, message = "项目编号不能大于100")
+    @Length(max=100, message = "项目编号不能大于100")
     private String projNo;
     /** 项目名称 */
     @ApiModelProperty(value = "项目名称", position = 3 )
-    @Length(max=200, message = "项目名称不能大于100")
+    @Length(max=100, message = "项目名称不能大于100")
     private String projName;
     /** 批准单位 */
     @ApiModelProperty(value = "批准单位", position = 4 )
-    @Length(max=200, message = "批准单位不能大于100")
+    @Length(max=100, message = "批准单位不能大于100")
     private String approveUnit;
     /** 负责人 */
     @ApiModelProperty(value = "负责人", position = 5 )
-    @Length(max=60, message = "负责人不能大于100")
+    @Length(max=100, message = "负责人不能大于100")
     private String leader;
     /** 起止年限（开始） */
     @ApiModelProperty(value = "起止年限", position = 6 )

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

@@ -372,8 +372,8 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         LoadProjectKPIInfo(dto);
 
         // 在研或完成基础研究项目情况
-        List<ComProjectResearchDTO> researchList = comProjectResearchService.getListByObjectId(dto.getId());
-        dto.setResearchList(researchList);
+        List<ComProjectResearchDTO> projectResearchList = comProjectResearchService.getListByObjectId(dto.getId());
+        dto.setProjectResearchList(projectResearchList);
 
 
         // 项目课颖设置表
@@ -723,13 +723,12 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         // 仪器、设备
         comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), id);
         // 在研或完成基础研究项目情况
-        comProjectResearchService.insertList(dto.getResearchList(), id);
+        comProjectResearchService.insertList(dto.getProjectResearchList(), id);
         // 项目课颖设置表
         comProjectSubService.insertList(dto.getProjectSubList(), id);
         // 单位科研项目及资金管理制度表
         comProjectManagementRuleService.insertList(dto.getManagementRuleList(), id);
 
-
 //        // 项目安排及阶段目标
 //        comProjectStageGoalService.insertList(dto.getStageGoals(), id);
 //        // 成果形式
@@ -778,10 +777,11 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         // 项目绩效指标表
         comProjectKpitDetailService.insertList(dto.getProjectKPI().getKpiList(), comProject.getId());
 
+
         // 项目经费构成表
         comProjectFundCompositionService.insertList(dto.getFundCompositions(), comProject.getId());
         // 在研或完成基础研究项目情况
-        comProjectResearchService.insertList(dto.getResearchList(), comProject.getId());
+        comProjectResearchService.insertList(dto.getProjectResearchList(), comProject.getId());
         // 项目课颖设置表
         comProjectSubService.insertList(dto.getProjectSubList(), comProject.getId());
         // 单位科研项目及资金管理制度表