|
@@ -121,7 +121,6 @@ public class GanttServiceImpl implements GanttService {
|
|
|
workShopVo.setText(workShopEntry.getValue().get(0).getProcessworkshop());
|
|
|
workShopVo.setOpen(true);
|
|
|
workShopVo.setType(DEFAULT_TYPE);
|
|
|
-
|
|
|
workShopVo.setStart_date(workShopEntry.getValue().get(0).getPlanstartdate());
|
|
|
resultVo.add(workShopVo);
|
|
|
// 对数据按照设备进行分组
|
|
@@ -135,7 +134,7 @@ public class GanttServiceImpl implements GanttService {
|
|
|
deviceVo.setOpen(true);
|
|
|
deviceVo.setType(DEFAULT_TYPE);
|
|
|
deviceVo.setParent(workShopVo.getId());
|
|
|
- deviceVo.setDevicetype(workShopEntry.getValue().get(0).getDevicetype());
|
|
|
+ deviceVo.setDevicetype(deviceEntry.getValue().get(0).getDevicetype());
|
|
|
deviceVo.setRender(DEFAULT_RENDER);
|
|
|
deviceVo.setStart_date(deviceEntry.getValue().get(0).getPlanstartdate());
|
|
|
resultVo.add(deviceVo);
|