Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop

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

@@ -93,5 +93,12 @@ public class DispatchEngineerOrderListResp {
          * 是否是特殊时间段，0否 1是 默认0
          * 是否是特殊时间段，0否 1是 默认0
          */
          */
         private Integer isSpecialTime;
         private Integer isSpecialTime;
+
+        /**
+         * 是否是cutoff，0否 1是 默认0
+         */
+        private Integer isCutoff = 0;
+
+        private String beanTags;
     }
     }
 }
 }

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

@@ -109,6 +109,11 @@ public class OrderServiceList {
     private String planEndTime;
     private String planEndTime;
 
 
     /**
     /**
+     * 交通工具：1汽车;2电动车;3自行车;4步行 默认是汽车
+     */
+    private String vehicle;
+
+    /**
      * 常规出发地，1配件仓，2家庭住址，3工作地址 默认工作地址
      * 常规出发地，1配件仓，2家庭住址，3工作地址 默认工作地址
      */
      */
     private Integer departure;
     private Integer departure;

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

@@ -304,6 +304,8 @@ public class DispatchServiceImpl implements DispatchService {
         item.setTranscend(o.getTranscend());
         item.setTranscend(o.getTranscend());
         item.setBeanPriority(o.getBeanPriority());
         item.setBeanPriority(o.getBeanPriority());
         item.setIsSpecialTime(o.getIsSpecialTime());
         item.setIsSpecialTime(o.getIsSpecialTime());
+        item.setIsCutoff(o.getIsCutoff());
+        item.setBeanTags(o.getBeanTags());
         if (isContinue && StringUtils.isNotEmpty(o.getMultipleOrders())) {
         if (isContinue && StringUtils.isNotEmpty(o.getMultipleOrders())) {
             List<OrderInfoEntity> byMultipleOrders = orderInfoDao.findByMultipleOrdersAndOrderIdNot(o.getMultipleOrders(), o.getOrderId());
             List<OrderInfoEntity> byMultipleOrders = orderInfoDao.findByMultipleOrdersAndOrderIdNot(o.getMultipleOrders(), o.getOrderId());
             List<DispatchEngineerOrderListResp.OrderInfo> multipleItems = new ArrayList<>();
             List<DispatchEngineerOrderListResp.OrderInfo> multipleItems = new ArrayList<>();

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

@@ -139,6 +139,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
                     record.setDepartureX(businessEntity.getX());
                     record.setDepartureX(businessEntity.getX());
                     record.setDepartureY(businessEntity.getY());
                     record.setDepartureY(businessEntity.getY());
                     record.setDeparture(businessEntity.getDeparture());
                     record.setDeparture(businessEntity.getDeparture());
+                    record.setVehicle(businessEntity.getVehicle());
                 }
                 }
             }
             }