diff --git a/science-admin/src/main/java/com/yiboshi/science/dao/ComProjectKpitDetailDAO.java b/science-admin/src/main/java/com/yiboshi/science/dao/ComProjectKpitDetailDAO.java index b77193c41adc170be5402a91437a31af4ff062b5..829eb91aee98b53b9058cd8a581731a111d3b971 100644 --- a/science-admin/src/main/java/com/yiboshi/science/dao/ComProjectKpitDetailDAO.java +++ b/science-admin/src/main/java/com/yiboshi/science/dao/ComProjectKpitDetailDAO.java @@ -13,6 +13,6 @@ import java.util.List; public interface ComProjectKpitDetailDAO extends BaseMapper<ComProjectKpitDetail>, BaseDAO<ComProjectKpitDetailQueryVO, ComProjectKpitDetailDTO, ComProjectKpitDetail> { - List<ComProjectKpitDetailDTO> getProjectKpitDetail(String projId); + List<ComProjectKpitDTO> getProjectKpitDetail(String projId); } diff --git a/science-admin/src/main/java/com/yiboshi/science/service/ComProjectKpitDetailService.java b/science-admin/src/main/java/com/yiboshi/science/service/ComProjectKpitDetailService.java index 377491af6079f75cd1d7d2d61853b422ffb0cdf7..799a595e348eac10d25231e050d11387c42c8baf 100644 --- a/science-admin/src/main/java/com/yiboshi/science/service/ComProjectKpitDetailService.java +++ b/science-admin/src/main/java/com/yiboshi/science/service/ComProjectKpitDetailService.java @@ -13,7 +13,7 @@ import java.util.List; public interface ComProjectKpitDetailService extends BaseService<ComProjectKpitDetailQueryVO, ComProjectKpitDetailDTO, ComProjectKpitDetail> { - List<ComProjectKpitDetailDTO> getProjectKpitDetailStatistic(String projId); + List<ComProjectKpitDTO> getProjectKpitDetailStatistic(String projId); void insertList(List<ComProjectKpitDetailDTO> list, String objectId); } diff --git a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectKpitDetailServiceImpl.java b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectKpitDetailServiceImpl.java index b50005f80bd921d57059b3e30ad6216f35153234..e624c3f04d4bc4456d909a870a31104d30b03052 100644 --- a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectKpitDetailServiceImpl.java +++ b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectKpitDetailServiceImpl.java @@ -36,8 +36,8 @@ public class ComProjectKpitDetailServiceImpl extends BaseServiceImpl<ComProjectK } - public List<ComProjectKpitDetailDTO> getProjectKpitDetailStatistic(String projId) { - List<ComProjectKpitDetailDTO> threeLevelList = comProjectKpitDetailDAO.getProjectKpitDetail(projId); + public List<ComProjectKpitDTO> getProjectKpitDetailStatistic(String projId) { + List<ComProjectKpitDTO> threeLevelList = comProjectKpitDetailDAO.getProjectKpitDetail(projId); return threeLevelList; } diff --git a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java index ea9642d017679ac95e01cd9d582eb2593d5f9861..a97539c8085117f5ab0e0e8a55f28a960cca3cf7 100644 --- a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java +++ b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java @@ -97,6 +97,8 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro private final ComProjectUnitPaymentService comProjectUnitPaymentService; @Autowired private ComProjectKpitService comProjectKpitService; + @Autowired + private ComProjectKpitDetailService comProjectKpitDetailService; @Override protected void setCriteriaForQuery(ComProjectQueryVO vo, QueryWrapper<ComProjectQueryVO> criteria) { @@ -271,6 +273,8 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro //年度用款计划表 List<ComProjectFundPlanDTO> fundPlanList = comProjectFundPlanService.getList(); dto.setFundPlan(fundPlanList); + // 项目绩效指标表 + NewProjectKPIInfo(dto); // 附件 List<ComFileDTO> fileList = processAttachmentList(projType); @@ -284,6 +288,15 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro return dto; } + private void NewProjectKPIInfo(ComProjectDTO dto) { + List<ComProjectKpitDTO> ProjectKPIList = comProjectKpitService.getProjectKpitStatistic(); + ProjectKPIStatisticDTO kpiDTO = new ProjectKPIStatisticDTO(); + kpiDTO.setTotalRowSpan(ProjectKPIList.size() + 2); + kpiDTO.setThreeLevel(ProjectKPIList); + + dto.setProjectKPI(kpiDTO); + } + /** * 根据id获取项目信息 * @@ -356,7 +369,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro dto.setUnitPayment(unitPaymentList); // 项目绩效目标表 -// if (dto.getProjState() >= 50) LoadProjectKPIInfo(dto); // 在研或完成基础研究项目情况 @@ -387,7 +399,9 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro } private void LoadProjectKPIInfo(ComProjectDTO dto) { - List<ComProjectKpitDTO> ProjectKPIList = comProjectKpitService.getProjectKpitStatistic(); + List<ComProjectKpitDTO> ProjectKPIList = comProjectKpitDetailService.getProjectKpitDetailStatistic(dto.getId()); + if (null == ProjectKPIList) + ProjectKPIList = comProjectKpitService.getProjectKpitStatistic(); ProjectKPIStatisticDTO kpiDTO = new ProjectKPIStatisticDTO(); kpiDTO.setTotalRowSpan(ProjectKPIList.size() + 2); kpiDTO.setThreeLevel(ProjectKPIList); diff --git a/science-admin/src/main/resources/mapper/ComProjectKpitDetailDAO.xml b/science-admin/src/main/resources/mapper/ComProjectKpitDetailDAO.xml index b298c988a91c1073a41ccd81f435b2f23d50ccb3..7773b60fa1413166eeded631a7ed4eb43a65f42d 100644 --- a/science-admin/src/main/resources/mapper/ComProjectKpitDetailDAO.xml +++ b/science-admin/src/main/resources/mapper/ComProjectKpitDetailDAO.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.yiboshi.science.dao.ComProjectKpitDAO"> +<mapper namespace="com.yiboshi.science.dao.ComProjectKpitDetailDAO"> <sql id="allColumns"> t.id, t.kpit_id, t.kpit_name, t.object_id, t.one_level_name, t.tow_level_name, t.target_value, t.performance_standard, t.year_value1, t.year_value2, t.year_value3, t.display_order, t.one_display, t.tow_display, t.one_row_span, t.tow_row_span, t.created, t.updated </sql> - <select id="getProjectKpitDetail" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectKpitDetailDTO"> + <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> </mapper>