fix：添加服务时间

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

@@ -64,9 +64,13 @@ public class EngineerGanttServiceImpl implements EngineerGanttService {
             // todo 需要根据订单时间和状态，采用expectXXXX或者actualXXXX
             slot.setOrderId(order.getOrderId());
             slot.setServiceStatus(order.getServiceStatus());
+            String startServiceStr = null;
             if (checkOrderIsFinish(order.getServiceStatus())) {
                 slot.setBtime(ObjectUtil.isNull(order.getActualStartTime()) ? null : getHourMinute(order.getActualStartTime()));
-                slot.setEtime(ObjectUtil.isNull(order.getActualEndTime()) ? null :getHourMinute(order.getActualEndTime()));
+                slot.setEtime(ObjectUtil.isNull(order.getActualEndTime()) ? null : getHourMinute(order.getActualEndTime()));
+                if (ObjectUtil.isNotNull(slot.getBtime()) && ObjectUtil.isNotNull(slot.getEtime())) {
+                    startServiceStr = getHourMinute(order.getActualStartTime()) + "-" + getHourMinute(order.getActualEndTime());
+                }
             } else if (order.getPlanStartTime() != null && StringUtils.isNotEmpty(order.getPlanStartTime().toString())) {
                 slot.setBtime(getHourMinute(order.getPlanStartTime()));
                 slot.setEtime(getHourMinute(order.getPlanEndTime()));
@@ -74,7 +78,7 @@ public class EngineerGanttServiceImpl implements EngineerGanttService {
                 slot.setBtime(getHourMinute(order.getExpectTimeBegin()));
                 slot.setEtime(getHourMinute(order.getExpectTimeEnd()));
             }
-            slot.setTooltip(getOrderTips(order));
+            slot.setTooltip(getOrderTips(order, startServiceStr));
             OrderSkillProjection orderSkill = orderInfoDao.getOrderSkillCaptionByOrderIdAndDt(order.getOrderId(), localDate);
             if (orderSkill != null) {
                 slot.setText(orderSkill.getSkillCaption());
@@ -194,7 +198,7 @@ public class EngineerGanttServiceImpl implements EngineerGanttService {
         return tips;
     }
 
-    private List<LabelValueDTO> getOrderTips(OrderInfoEntity order) {
+    private List<LabelValueDTO> getOrderTips(OrderInfoEntity order, String startServiceStr) {
         // log.info("==> getOrderTips: orderId[{}]", orderId);
         List<LabelValueDTO> tips = new ArrayList<>();
         tips.add(new LabelValueDTO().setLabel("工单号码").setValue(order.getOrderId()));
@@ -206,6 +210,9 @@ public class EngineerGanttServiceImpl implements EngineerGanttService {
                 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(startServiceStr)) {
+            tips.add(new LabelValueDTO().setLabel("服务时间").setValue(startServiceStr));
+        }
         if (StringUtils.isNotBlank(order.getApplyNote())) {
             tips.add(new LabelValueDTO().setLabel("备注").setValue(order.getApplyNote()));
         }