Commit 70f425c8 authored by wangxl's avatar wangxl

1

parent 0c3dec51
...@@ -369,10 +369,10 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO ...@@ -369,10 +369,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.getProjStart()) && Objects.nonNull(dto.getProjEnd())) { if (Objects.nonNull(dto.getStartDate()) && Objects.nonNull(dto.getEndDate())) {
kpiDTO.setStartDate(dto.getProjStart()); kpiDTO.setStartDate(dto.getStartDate());
kpiDTO.setEndDate(dto.getProjEnd()); kpiDTO.setEndDate(dto.getEndDate());
kpiDTO.setProjDeadline(DateUtils.FormatDate(dto.getProjStart()) + "至" + DateUtils.FormatDate(dto.getProjEnd())); kpiDTO.setProjDeadline(DateUtils.FormatDate(dto.getStartDate()) + "至" + DateUtils.FormatDate(dto.getEndDate()));
} }
List<ComProjectBudgetDTO> budgetDTO = dto.getBudget(); List<ComProjectBudgetDTO> budgetDTO = dto.getBudget();
if (null != budgetDTO) { if (null != budgetDTO) {
...@@ -431,7 +431,7 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO ...@@ -431,7 +431,7 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
// 附件 // 附件
ComFileService.insertList(dto.getFileList(), id, CommonEnum.fileType.projectTask.getCode()); ComFileService.insertList(dto.getFileList(), id, CommonEnum.fileType.projectTask.getCode());
// 项目安排及阶段目标 // 项目安排及阶段目标
// comProjectStageGoalService.insertList(dto.getStageGoals(), id); comProjectStageGoalService.insertList(dto.getStageGoals(), id);
return id; return id;
} }
......
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