fix：订单返回服务状态

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

@@ -22,6 +22,7 @@ public class ScheduleEngineerOverviewResp {
         private String type;
         private String type;
         private String skill;
         private String skill;
         private String orderStatus;
         private String orderStatus;
+        private String serviceStatus;
         private String orderStatusName;
         private String orderStatusName;
         /**
         /**
          * 在途公里数
          * 在途公里数

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

@@ -17,6 +17,7 @@ import com.dituhui.pea.order.enums.OrderFlowEnum;
 import com.dituhui.pea.order.enums.VehicleEnum;
 import com.dituhui.pea.order.enums.VehicleEnum;
 import com.dituhui.pea.order.service.ScheduleService;
 import com.dituhui.pea.order.service.ScheduleService;
 import com.dituhui.pea.order.utils.CommonUtil;
 import com.dituhui.pea.order.utils.CommonUtil;
+import com.dituhui.pea.order.utils.OrderUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
@@ -288,7 +289,8 @@ public class ScheduleServiceImpl implements ScheduleService {
             item.setLocation(String.format("%s,%s", o.getX(), o.getY()));
             item.setLocation(String.format("%s,%s", o.getX(), o.getY()));
             item.setType(o.getType());
             item.setType(o.getType());
             item.setSkill(o.getSkill());
             item.setSkill(o.getSkill());
-            item.setOrderStatus(o.getAppointmentStatus());
+            item.setOrderStatus(o.getOrderStatus());
+            item.setServiceStatus(OrderUtil.handleServiceStatus(o));
             item.setOrderStatusName("");
             item.setOrderStatusName("");
             item.setDistance(CommonUtil.converMToKm(o.getArriveDistance()));
             item.setDistance(CommonUtil.converMToKm(o.getArriveDistance()));
             item.setTimeType("auto");
             item.setTimeType("auto");