xujun

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

@@ -202,9 +202,9 @@ public class ComProjectBasic extends BaseEntity {
     @ApiModelProperty(value = "申请者正在承担的其它研究项目", position = 14 )
     @Length(max=1000, message = "申请者正在承担的其它研究项目1000")
     private String researchProjects;
-    @ApiModelProperty(value = "报告正文", position = 36 )
-    @Length(max=2147483647, message = "报告正文不能大于2147483647")
-    private String projDoc;
+    @ApiModelProperty(value = "项目属性Id", position = 36)
+    @Length(max=36, message = "项目属性Id不能大于36")
+    private String projAttribute;
 
     /** 备注 */
     @ApiModelProperty(value = "备注", position = 38 )

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

@@ -201,9 +201,9 @@ public class ComProjectBasicDTO extends BaseDTO {
     @ApiModelProperty(value = "申请者正在承担的其它研究项目", position = 14 )
     @Length(max=1000, message = "申请者正在承担的其它研究项目1000")
     private String researchProjects;
-    @ApiModelProperty(value = "报告正文", position = 36 )
-    @Length(max=2147483647, message = "报告正文不能大于2147483647")
-    private String projDoc;
+    @ApiModelProperty(value = "项目属性Id", position = 36)
+    @Length(max=36, message = "项目属性Id不能大于36")
+    private String projAttribute;
 
     /** 备注 */
     @ApiModelProperty(value = "备注", position = 38 )

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

@@ -126,7 +126,7 @@ public class ComProjectDTO extends BaseDTO {
     private String legalPerson;
 
     /** 职工总数 */
-    @ApiModelProperty(value = "职工总数", position = 1 )
+    @ApiModelProperty(value = "职工总数", position = 1)
     private Integer workforce;
     /** 其中专科以上人员 */
     @ApiModelProperty(value = "其中专科以上人员", position = 1 )
@@ -271,9 +271,9 @@ public class ComProjectDTO extends BaseDTO {
     @ApiModelProperty(value = "申请者正在承担的其它研究项目", position = 14 )
     @Length(max=1000, message = "申请者正在承担的其它研究项目1000")
     private String researchProjects;
-    @ApiModelProperty(value = "报告正文", position = 36 )
-    @Length(max=2147483647, message = "报告正文不能大于2147483647")
-    private String projDoc;
+    @ApiModelProperty(value = "项目属性Id", position = 36)
+    @Length(max=36, message = "项目属性Id不能大于36")
+    private String projAttribute;
 
     /** 备注 */
     @ApiModelProperty(value = "备注", position = 38 )

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

@@ -2,6 +2,7 @@ package com.yiboshi.science.param.dto;
 
 import com.yiboshi.science.base.BaseDTO;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -10,6 +11,10 @@ import java.util.List;
 @Data
 public class ProjectKPIStatisticDTO extends BaseDTO {
 
+    private Integer reportYear;
+    private String projName;
+    private String appUnitName;
+
     private Integer totalRowSpan; //总合并行数
     private Integer outTarget; //一级指标(产出指标)
     private Integer benefitTarget; //一级指标(效益指标)
@@ -25,5 +30,4 @@ public class ProjectKPIStatisticDTO extends BaseDTO {
     private Integer serviceTarget; //二级指标(服务对象满意度指标)
     private List<ComProjectKpitDTO> threeLevel;
 
-
 }

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

@@ -200,9 +200,9 @@ public class ComProjectBasicQueryVO extends PaginationVO{
     @ApiModelProperty(value = "申请者正在承担的其它研究项目", position = 14 )
     @Length(max=1000, message = "申请者正在承担的其它研究项目1000")
     private String researchProjects;
-    @ApiModelProperty(value = "报告正文", position = 36 )
-    @Length(max=2147483647, message = "报告正文不能大于2147483647")
-    private String projDoc;
+    @ApiModelProperty(value = "项目属性Id", position = 36)
+    @Length(max=36, message = "项目属性Id不能大于36")
+    private String projAttribute;
 
     /** 备注 */
     @ApiModelProperty(value = "备注", position = 38 )

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

@@ -92,6 +92,8 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
     private final ComProjectFundPlanService comProjectFundPlanService;
     @Autowired
     private final ComProjectUnitPaymentService comProjectUnitPaymentService;
+    @Autowired
+    private ComProjectKpitService comProjectKpitService;
 
     @Override
     protected void setCriteriaForQuery(ComProjectQueryVO vo, QueryWrapper<ComProjectQueryVO> criteria) {
@@ -332,7 +334,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
             budgetList = comProjectBudgetService.getList(dto.getProjType());
         dto.setBudget(budgetList);
 
-        //年度用款计划
+        // 年度用款计划
         List<ComProjectFundPlanDTO> fundPlanList = comProjectFundPlanService.getListByObjectId(dto.getId());
         if (null == fundPlanList || fundPlanList.size() == 0)
             fundPlanList = comProjectFundPlanService.getList();
@@ -342,14 +344,18 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         List<ComProjectFundCompositionDTO> fundCompositions = comProjectFundCompositionService.getListByObjectId(dto.getId());
         dto.setFundCompositions(fundCompositions);
 
-        //单位支出明细预算
-        List<ComProjectUnitPaymentDTO> unitPaymentList = comProjectUnitPaymentService.getListByObjectId(dto.getId());
-        dto.setUnitPayment(unitPaymentList);
-
         // 设备仪器经费表
         List<ComProjectEquipmentDTO> equipmentList = comProjectEquipmentService.getListByObjectId(dto.getId());
         dto.setEquipments(equipmentList);
 
+        // 单位支出明细预算
+        List<ComProjectUnitPaymentDTO> unitPaymentList = comProjectUnitPaymentService.getListByObjectId(dto.getId());
+        dto.setUnitPayment(unitPaymentList);
+
+        // 项目绩效目标表
+        if (dto.getProjState() >= 50)
+            LoadProjectKPIInfo(dto);
+
         // 项目课颖设置表
         List<ComProjectSubDTO> projectSubList = comProjectSubService.getListByObjectId(dto.getId());
         dto.setProjectSubList(projectSubList);
@@ -372,6 +378,14 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         return dto;
     }
 
+    private void LoadProjectKPIInfo(ComProjectDTO dto) {
+        List<ComProjectKpitDTO> ProjectKPIList = comProjectKpitService.getProjectKpitStatistic();
+        ProjectKPIStatisticDTO kpiDTO = new ProjectKPIStatisticDTO();
+        kpiDTO.setTotalRowSpan(ProjectKPIList.size() + 2);
+        kpiDTO.setThreeLevel(ProjectKPIList);
+        dto.setProjectKPI(kpiDTO);
+    }
+
     public List<ComFileDTO> checkNecessaryAttachmentFile(Integer projType, List<ComFileDTO> fileList) {
         List<SystemParameter> parameterList;
         //健康领域科技项目
@@ -649,6 +663,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         // 附件
         ComFileService.insertList(dto.getFileList(), id, CommonEnum.fileType.project.getCode());
         dto.setId(id);
+        dto.setProjAttribute("5b9d6509-aece-11ef-b6cb-0c42a1380f01");//默认新增项目
         comProjectBasicService.insertOrUpdate(dto);
         return id;
     }