xujun

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

@@ -30,6 +30,10 @@ public class ComProjectKpitDTO extends BaseDTO {
     @ApiModelProperty(value = "父Id", position = 8)
     @Length(max=36, message = "父Id不能大于36")
     private String parentId;
+    /** kpitId */
+    @ApiModelProperty(value = "kpitId", position = 8)
+    @Length(max=36, message = "kpitId不能大于36")
+    private String kpitId;
     /** 绩效类型名称 */
     @ApiModelProperty(value = "绩效类型名称", position = 1 )
     @Length(max=200, message = "绩效类型名称不能大于200")

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

@@ -400,7 +400,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
 
     private void LoadProjectKPIInfo(ComProjectDTO dto) {
         List<ComProjectKpitDTO> ProjectKPIList = comProjectKpitDetailService.getProjectKpitDetailStatistic(dto.getId());
-        if (null == ProjectKPIList)
+        if (null == ProjectKPIList || ProjectKPIList.size() == 0)
             ProjectKPIList = comProjectKpitService.getProjectKpitStatistic();
         ProjectKPIStatisticDTO kpiDTO = new ProjectKPIStatisticDTO();
         kpiDTO.setTotalRowSpan(ProjectKPIList.size() + 2);
@@ -410,6 +410,10 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         kpiDTO.setProjName(dto.getProjName());
         kpiDTO.setAppUnitName(dto.getAppUnitName());
         kpiDTO.setProjAttribute(dto.getProjAttribute());
+        kpiDTO.setYearTarget(dto.getYearTarget());
+        kpiDTO.setYear1Goal(dto.getYear1Goal());
+        kpiDTO.setYear2Goal(dto.getYear2Goal());
+        kpiDTO.setYear3Goal(dto.getYear3Goal());
         if (Objects.nonNull(dto.getStartDate()) && Objects.nonNull(dto.getEndDate()))
             kpiDTO.setProjDeadline(DateUtils.FormatDate(dto.getStartDate()) + "至" + DateUtils.FormatDate(dto.getEndDate()));
         List<ComProjectBudgetDTO> budgetDTO = dto.getBudget();

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

@@ -46,7 +46,8 @@
                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_attribute,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,
+               ic.year_target,ic.year1_goal,ic.year2_goal,ic.year3_goal
         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

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

@@ -8,6 +8,6 @@
     </sql>
 
     <select id="getProjectKpit" resultType="com.yiboshi.science.param.dto.ComProjectKpitDTO">
-        select * from com_project_kpit order by type_id, id
+        select *, id as kpitId from com_project_kpit order by type_id, id
     </select>
 </mapper>

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

@@ -9,6 +9,6 @@
     </sql>
 
     <select id="getProjectKpitDetail" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectKpitDTO">
-        select * from com_project_kpit_detail where object_id = #{projId} order by type_id, id
+        select * from com_project_kpit_detail where object_id = #{projId} order by kpit_id
     </select>
 </mapper>