xujun

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

@@ -5,6 +5,7 @@ import com.yiboshi.science.base.BaseDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 
@@ -14,7 +15,24 @@ public class ProjectKPIStatisticDTO extends BaseDTO {
     private Integer reportYear;
     private String projName;
     private String appUnitName;
-
+    private String projAttribute;
+    private String projDeadline;
+    /** 总预算数 */
+    @ApiModelProperty(value = "总预算数", position = 3)
+    private BigDecimal totalBudget;
+    /** 申请专项经费(临床科技项目) */
+    @ApiModelProperty(value = "申请专项经费", position = 4)
+    private BigDecimal applyFunds;
+    /** 自筹经费(临床科技项目) */
+    @ApiModelProperty(value = "自筹经费", position = 5)
+    private BigDecimal selfFunds;
+
+    /** 用款总额 */
+    private BigDecimal yearTotal;
+    /** 省级财政资金 */
+    private BigDecimal yearApply;
+    /** 自筹资金 */
+    private BigDecimal yearSelf;
 
     private Integer totalRowSpan; //总合并行数
     private Integer outTarget; //一级指标(产出指标)

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

@@ -353,7 +353,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         dto.setUnitPayment(unitPaymentList);
 
         // 项目绩效目标表
-        if (dto.getProjState() >= 50)
+        //if (dto.getProjState() >= 50)
         LoadProjectKPIInfo(dto);
 
         // 项目课颖设置表
@@ -383,6 +383,49 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         ProjectKPIStatisticDTO kpiDTO = new ProjectKPIStatisticDTO();
         kpiDTO.setTotalRowSpan(ProjectKPIList.size() + 2);
         kpiDTO.setThreeLevel(ProjectKPIList);
+
+        kpiDTO.setReportYear(dto.getReportYear());
+        kpiDTO.setProjName(dto.getProjName());
+        kpiDTO.setAppUnitName(dto.getAppUnitName());
+        kpiDTO.setProjAttribute(dto.getProjAttribute());
+        kpiDTO.setProjDeadline(dto.getStartDateStr() + "至" + dto.getEndDateStr());
+        List<ComProjectBudgetDTO> budgetDTO = dto.getBudget();
+        if (null != budgetDTO) {
+            // 资金总额
+            List<ComProjectBudgetDTO> FindList = budgetDTO.stream().filter(e -> e.getBudgetId().equals("3b1f57d3-6aec-4129-aef5-702a1accfe01")).collect(Collectors.toList());
+            if (null != FindList)
+                kpiDTO.setTotalBudget(FindList.get(0).getTotalBudget());
+            // 省级财政资金
+            FindList = budgetDTO.stream().filter(e -> e.getBudgetId().equals("3b1f57d3-6aec-4129-aef5-702a1accfe02")).collect(Collectors.toList());
+            if (null != FindList)
+                kpiDTO.setApplyFunds(FindList.get(0).getTotalBudget());
+            // 自筹资金
+            FindList = budgetDTO.stream().filter(e -> e.getBudgetId().equals("3b1f57d3-6aec-4129-aef5-702a1accfe03")).collect(Collectors.toList());
+            if (null != FindList)
+                kpiDTO.setSelfFunds(FindList.get(0).getTotalBudget());
+        } else {
+            kpiDTO.setTotalBudget(new BigDecimal(0.00));
+            kpiDTO.setApplyFunds(new BigDecimal(0.00));
+            kpiDTO.setSelfFunds(new BigDecimal(0.00));
+        }
+
+        List<ComProjectFundPlanDTO> fundPlanDTO = dto.getFundPlan();
+        if (null != fundPlanDTO) {
+            List<ComProjectFundPlanDTO> FindList = fundPlanDTO.stream().filter(e -> e.getFundId().equals("6a18820d-ad2b-11ef-b6cb-0c42a1380f01")).collect(Collectors.toList());
+            if (null != FindList)
+                kpiDTO.setYearTotal(FindList.get(0).getYearValue1());
+            FindList = fundPlanDTO.stream().filter(e -> e.getFundId().equals("6a18820d-ad2b-11ef-b6cb-0c42a1380f02")).collect(Collectors.toList());
+            if (null != FindList)
+                kpiDTO.setYearApply(FindList.get(0).getYearValue1());
+            FindList = fundPlanDTO.stream().filter(e -> e.getFundId().equals("6a18820d-ad2b-11ef-b6cb-0c42a1380f03")).collect(Collectors.toList());
+            if (null != FindList)
+                kpiDTO.setYearSelf(FindList.get(0).getYearValue1());
+        } else {
+            kpiDTO.setYearTotal(new BigDecimal(0.00));
+            kpiDTO.setYearApply(new BigDecimal(0.00));
+            kpiDTO.setYearSelf(new BigDecimal(0.00));
+        }
+
         dto.setProjectKPI(kpiDTO);
     }
 

science-admin/src/main/resources/mapper/ComProjectDAO.xml

@@ -45,7 +45,7 @@
                ic.research_person_count,ic.lead_unit,ic.recommend_unit,ic.technology_innovation_base,ic.total_funding,ic.gov_funding,ic.unit_funding,ic.self_funding,ic.other_funding,ic.link_name,ic.link_mobile,ic.link_email,ic.proj_abstract,
                ic.proj_keywords,ic.proj_content,ic.mem_resume, ic.research_progress,
                ic.research_content,ic.technology_target,ic.economy_target,ic.achievement_target,
-               ic.other_target,ic.proj_basis,ic.research_plan,ic.main_features,ic.expected_results,ic.research_projects,ic.proj_doc,ic.remark
+               ic.other_target,ic.proj_basis,ic.research_plan,ic.main_features,ic.expected_results,ic.research_projects,ic.proj_attribute,ic.remark
         from com_project a
         left join com_project_basic ic on a.id=ic.proj_id
         left join system_parameter b on a.knowledge_id=b.id