Merge branch 'dev-gantt' into develop

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

@@ -59,8 +59,8 @@ 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.setBtime(getHourMinute(e.getPlanStartTime()));
+            slot.setEtime(getHourMinute(e.getPlanEndTime()));
             slot.setTooltip(getOrderTips(e.getOrderId()));
             OrderSkillProjection orderSkill = orderInfoDao.getOrderSkillCaptionByOrderId(e.getOrderId());
             if (orderSkill != null) {
@@ -78,8 +78,8 @@ public class EngineerGanttServiceImpl implements EngineerGanttService {
             if(e.getArriveElapsed() > 0) {
                 // 有在途，起止时间，分别是订单的开始时间减去在途时间、订单的开始时间
                 slot = new EngineersGanttDTO.Slot();
-                slot.setBtime(getHourMinute(e.getExpectTimeBegin(), -e.getArriveElapsed()));
-                slot.setEtime(getHourMinute(e.getExpectTimeBegin()));
+                slot.setBtime(getHourMinute(e.getPlanStartTime(), -e.getArriveElapsed()));
+                slot.setEtime(getHourMinute(e.getPlanStartTime()));
                 slot.setShapeSize("mini");
                 slot.setBgColor(getColor("ONWAY"));
                 slots.add(slot);