Merge branch 'dev-gantt' into develop

project-order/src/main/java/com/dituhui/pea/order/dto/EngineersGanttDTO.java

@@ -80,6 +80,7 @@ public class EngineersGanttDTO {
 
     @lombok.Data
     public static class Slot {
+        private String orderId;
         private String bgColor = "#016FFF";
         private String borderColor = "#016FFF";
         private String borderStyle = "solid";

project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerGanttServiceImpl.java

@@ -58,6 +58,7 @@ public class EngineerGanttServiceImpl implements EngineerGanttService {
             // 服务工单本体
             EngineersGanttDTO.Slot slot = new EngineersGanttDTO.Slot();
             // todo 需要根据订单时间和状态，采用expectXXXX或者actualXXXX
+            slot.setOrderId(e.getOrderId());
             slot.setBtime(getHourMinute(e.getExpectTimeBegin()));
             slot.setEtime(getHourMinute(e.getExpectTimeEnd()));
             slot.setTooltip(getOrderTips(e.getOrderId()));