feat：甘特图返回添加服务类型

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

@@ -83,5 +83,10 @@ public class EngineersGanttDTO {
         private String text;
         private List<LabelValueDTO> tooltip;
         private String url;
+
+        /**
+         * 服务状态：INIT-初始化/PENDING待服务/CONTACTED已排期/STARTED-已开始/FINISHED已完成/UNFINISHED-已上门未完成
+         */
+        private String serviceStatus;
     }
 }

project-order/src/main/java/com/dituhui/pea/order/entity/OrderInfoEntity.java

 package com.dituhui.pea.order.entity;
 
-import com.dituhui.pea.order.enums.OrderFlowEnum;
+import com.dituhui.pea.order.enums.ServiceStatusEnum;
 import lombok.Data;
 
 import javax.persistence.*;
@@ -132,7 +132,7 @@ public class OrderInfoEntity {
     private String orderStatus = "NORMAL";
 
     @Column(name = "service_status", nullable = true, length = 20, columnDefinition = "varchar(20) default 'INIT'")
-    private String serviceStatus = OrderFlowEnum.INIT.name();
+    private String serviceStatus = ServiceStatusEnum.INIT.getCode();
 
     @Column(name = "engineer_code", nullable = true, length = 32, columnDefinition = "varchar(32) default ''")
     private String engineerCode = "";

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

@@ -427,7 +427,7 @@ public class DispatchServiceImpl implements DispatchService {
         } else if (groupTagId.equals(OrderGroupEnum.four.getCode()) && StringUtils.isNotEmpty(item.getSkill())) {
             makeOrderMap(groupByMap, item, item.getSkill());
         } else if (groupTagId.equals(OrderGroupEnum.five.getCode()) && StringUtils.isNotEmpty(item.getMultipleOrders())) {
-            makeOrderMap(groupByMap, item, item.getMultipleOrders());
+            makeOrderMap(groupByMap, item, "一家多台ID：" + item.getMultipleOrders());
         } else {
             makeOrderMap(groupByMap, item, "其他");
         }

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

@@ -62,6 +62,7 @@ public class EngineerGanttServiceImpl implements EngineerGanttService {
             EngineersGanttDTO.Slot slot = new EngineersGanttDTO.Slot();
             // todo 需要根据订单时间和状态，采用expectXXXX或者actualXXXX
             slot.setOrderId(order.getOrderId());
+            slot.setServiceStatus(order.getServiceStatus());
             if (checkOrderIsFinish(order.getServiceStatus())) {
                 slot.setBtime(getHourMinute(order.getActualStartTime()));
                 slot.setEtime(getHourMinute(order.getActualEndTime()));