|
@@ -453,7 +453,9 @@ public class GanttServiceImpl implements GanttService {
|
|
|
// dateVo.setText(StringUtils.join(itemNames, "</br>"));
|
|
|
dateVo.setOpen(false);
|
|
|
dateVo.setStart_date(ganttVos.get(0).getPlanstartdate());
|
|
|
- dateVo.setEnd_date(ganttVos.get(0).getPlanenddate());
|
|
|
+ //筛选最晚的结束时间
|
|
|
+ Date lastPlanEndDate = ganttVos.stream().map(GanttVos::getPlanenddate).max(Comparator.comparing(Date::getTime)).orElse(null);
|
|
|
+ dateVo.setEnd_date(lastPlanEndDate);
|
|
|
// dateVo.setName(StringUtils.join(itemNames, "</br>"));
|
|
|
dateVo.setBlankNumber(ganttVos.stream().map(GanttVos::getBlankNumber).distinct().collect(Collectors.joining(",")));
|
|
|
dateVo.setProcessdetailids(ganttVos.stream().map(GanttVos::getId).distinct().collect(Collectors.joining(",")));
|