Skip to content

Y
yn-health-science
Commit a25f793d authored by wangxl's avatar wangxl
Browse files
Options

1

parent 1b2d717f
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectTaskServiceImpl.java
View file @ a25f793d
...@@ -350,7 +350,7 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO ...@@ -350,7 +350,7 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
} }
private void LoadProjectKPIInfo(ComProjectTaskDTO dto) { private void LoadProjectKPIInfo(ComProjectTaskDTO dto) {
List<ComProjectKpitDTO> ProjectKPIList = comProjectKpitDetailService.getProjectKpitDetailStatistic(dto.getId()); List<ComProjectKpitDTO> ProjectKPIList = comProjectKpitDetailService.getProjectKpitDetailStatistic(dto.getProjId());
if (null == ProjectKPIList || ProjectKPIList.size() == 0) if (null == ProjectKPIList || ProjectKPIList.size() == 0)
ProjectKPIList = comProjectKpitService.getProjectKpitStatistic(); ProjectKPIList = comProjectKpitService.getProjectKpitStatistic();
ProjectKPIStatisticDTO kpiDTO = new ProjectKPIStatisticDTO(); ProjectKPIStatisticDTO kpiDTO = new ProjectKPIStatisticDTO();
...@@ -366,10 +366,10 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO ...@@ -366,10 +366,10 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
kpiDTO.setYear1Goal(dto.getYear1Goal()); kpiDTO.setYear1Goal(dto.getYear1Goal());
kpiDTO.setYear2Goal(dto.getYear2Goal()); kpiDTO.setYear2Goal(dto.getYear2Goal());
kpiDTO.setYear3Goal(dto.getYear3Goal()); kpiDTO.setYear3Goal(dto.getYear3Goal());
if (Objects.nonNull(dto.getStartDate()) && Objects.nonNull(dto.getEndDate())) { if (Objects.nonNull(dto.getProjStart()) && Objects.nonNull(dto.getProjEnd())) {
kpiDTO.setStartDate(dto.getStartDate()); kpiDTO.setStartDate(dto.getProjStart());
kpiDTO.setEndDate(dto.getEndDate()); kpiDTO.setEndDate(dto.getProjEnd());
kpiDTO.setProjDeadline(DateUtils.FormatDate(dto.getStartDate()) + "至" + DateUtils.FormatDate(dto.getEndDate())); kpiDTO.setProjDeadline(DateUtils.FormatDate(dto.getProjStart()) + "至" + DateUtils.FormatDate(dto.getProjEnd()));
} }
List<ComProjectBudgetDTO> budgetDTO = dto.getBudget(); List<ComProjectBudgetDTO> budgetDTO = dto.getBudget();
if (null != budgetDTO) { if (null != budgetDTO) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment