未确认工单虚框返回；增加了各个时间要素；

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

@@ -80,7 +80,7 @@ public class EngineerGanttServiceImpl implements EngineerGanttService {
             }
             slot.setBgColor(getColor(e.getServiceStatus()));
             if (!e.getAppointmentStatus().equals("CONFIRM")) {
-                slot.setBorderStyle("dotted");  // 未确认的指派，统一加上虚框
+                slot.setBorderStyle("dashed");  // 未确认的指派，统一加上虚框
             }
             slots.add(slot);
             if(e.getArriveElapsed() > 0) {
@@ -174,14 +174,15 @@ public class EngineerGanttServiceImpl implements EngineerGanttService {
         tips.add(new LabelValueDTO().setLabel("工单号码").setValue(orderId));
         tips.add(new LabelValueDTO().setLabel("类型/品牌").setValue(String.format("%s %s", order.getBrand(), order.getType())));
         tips.add(new LabelValueDTO().setLabel("电话/地址").setValue(String.format("%s %s\n %s", order.getName(), order.getPhone(), order.getAddress())));
+        tips.add(new LabelValueDTO().setLabel("标签").setValue(order.getTags()));
+        tips.add(new LabelValueDTO().setLabel("技能").setValue(String.format("%s/%s/%s", order.getBrand(), order.getType(), order.getSkill())));
+        tips.add(new LabelValueDTO().setLabel("期望时间").setValue(String.format("%s-%s",
+                DateUtils.formatDateTime(order.getExpectTimeBegin(), "HH:mm"), DateUtils.formatDateTime(order.getExpectTimeEnd(), "HH:mm"))));
+        tips.add(new LabelValueDTO().setLabel("计划时间").setValue(String.format("%s-%s",
+                DateUtils.formatDateTime(order.getPlanStartTime(), "HH:mm"), DateUtils.formatDateTime(order.getPlanEndTime(), "HH:mm"))));
         if (StringUtils.isNotBlank(order.getApplyNote())) {
             tips.add(new LabelValueDTO().setLabel("备注").setValue(order.getApplyNote()));
         }
-        tips.add(new LabelValueDTO().setLabel("标签").setValue(order.getTags()));
-        tips.add(new LabelValueDTO().setLabel("期望最早上门时间").setValue(order.getExpectTimeBegin().toString()));
-        tips.add(new LabelValueDTO().setLabel("期望最迟上门时间").setValue(order.getExpectTimeEnd().toString()));
-        tips.add(new LabelValueDTO().setLabel("计划上门开始时间").setValue(order.getPlanStartTime().toString()));
-        tips.add(new LabelValueDTO().setLabel("计划上门完成时间").setValue(order.getPlanEndTime().toString()));
         return tips;
     }