xujun

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

@@ -34,7 +34,6 @@ public class ProjectKPIStatisticDTO extends BaseDTO {
     /** 自筹资金 */
     private BigDecimal yearSelf;
 
-
     private Integer totalRowSpan; //总合并行数
     private Integer outTarget; //一级指标(产出指标)
     private Integer benefitTarget; //一级指标(效益指标)

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);
 
 
@@ -389,7 +389,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         kpiDTO.setProjName(dto.getProjName());
         kpiDTO.setAppUnitName(dto.getAppUnitName());
         kpiDTO.setProjAttribute(dto.getProjAttribute());
-        kpiDTO.setProjDeadline(dto.getStartDateStr() + "至" + dto.getEndDateStr());
+        kpiDTO.setProjDeadline(DateUtils.FormatDate(dto.getStartDate()) + "至" + DateUtils.FormatDate(dto.getEndDate()));
         List<ComProjectBudgetDTO> budgetDTO = dto.getBudget();
         if (null != budgetDTO) {
             // 资金总额

science-admin/src/main/java/com/yiboshi/science/utils/DateUtils.java

 package com.yiboshi.science.utils;
 
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -10,4 +11,9 @@ public class DateUtils {
     public static int getYear(){
         return Calendar.getInstance().get(Calendar.YEAR);
     }
+
+    public static String FormatDate(Date date) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(date);
+    }
 }