fix：已完成工单处理工程师交通方式

project-order/src/main/java/com/dituhui/pea/order/constant/OrderConstant.java

+package com.dituhui.pea.order.constant;
+
+/**
+ * 订单所需常量
+ */
+public class OrderConstant {
+
+    /**
+     * 订单辅助工程师技能耗时
+     */
+    public final static Integer sub_engineer_take_time = 15;
+}

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

@@ -108,4 +108,9 @@ public class OrderInfo {
      * 改约原因
      * 改约原因
      */
      */
     private String reschedulingReason;
     private String reschedulingReason;
+
+    /**
+     * 工单交通方式   1汽车;2电动车;3自行车;4步行 默认是汽车
+     */
+    private String vehicle;
 }
 }
\ No newline at end of file

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

@@ -158,6 +158,12 @@ public class OrderInfoEntity {
     @Column(name = "arrive_distance", nullable = true, columnDefinition = "int(11) default '0'")
     @Column(name = "arrive_distance", nullable = true, columnDefinition = "int(11) default '0'")
     private Integer arriveDistance = 0;
     private Integer arriveDistance = 0;
 
 
+    /**
+     * 辅助工程师在途时长
+     */
+    @Column(name = "sub_distance", nullable = true, columnDefinition = "int(11) default '0'")
+    private Integer subDistance = 0;
+
     @Column(name = "actual_start_time")
     @Column(name = "actual_start_time")
     private LocalDateTime actualStartTime;
     private LocalDateTime actualStartTime;
 
 
@@ -246,4 +252,10 @@ public class OrderInfoEntity {
      */
      */
     @Column(name = "rescheduling_reason")
     @Column(name = "rescheduling_reason")
     private String reschedulingReason;
     private String reschedulingReason;
+
+    /**
+     * 工单交通方式   1汽车;2电动车;3自行车;4步行 默认是汽车
+     */
+    @Column(name = "vehicle")
+    private Integer vehicle;
 }
 }

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

@@ -84,6 +84,9 @@ public class OrderInfoServiceImpl implements OrderInfoService {
     @Autowired
     @Autowired
     private EngineerSkillGroupDao engineerSkillGroupDao;
     private EngineerSkillGroupDao engineerSkillGroupDao;
 
 
+    @Autowired
+    private EngineerBusinessDao engineerBusinessDao;
+
 
 
     /**
     /**
      * 新增订单处理一家多单逻辑
      * 新增订单处理一家多单逻辑
@@ -170,6 +173,12 @@ public class OrderInfoServiceImpl implements OrderInfoService {
             }
             }
             if (BeanServiceFlowEnum.FINISHED.getStatus().equals(BeanServiceFlowEnum.getStatusByName(request.getStage()))) {
             if (BeanServiceFlowEnum.FINISHED.getStatus().equals(BeanServiceFlowEnum.getStatusByName(request.getStage()))) {
                 orderInfo.setActualEndTime(LocalDateTimeUtil.of(request.getHappen()));
                 orderInfo.setActualEndTime(LocalDateTimeUtil.of(request.getHappen()));
+                // 已完成工单处理工程师交通方式
+                EngineerBusinessEntity engineer = engineerBusinessDao.getByEngineerCode(orderInfo.getEngineerCode());
+                if (ObjectUtil.isNull(engineer)) {
+                    orderInfo.setVehicle(1);
+                }
+                orderInfo.setVehicle(Integer.valueOf(engineer.getVehicle()));
             }
             }
             orderInfoDao.save(orderInfo);
             orderInfoDao.save(orderInfo);
             //记录流程
             //记录流程

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

@@ -155,7 +155,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());
+                    record.setVehicle(ObjectUtil.isNull(o.getVehicle()) ? businessEntity.getVehicle() : o.getVehicle());
                 }
                 }
             }
             }
 
 
@@ -307,6 +307,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(ObjectUtil.isNull(o.getVehicle()) ? businessEntity.getVehicle() : String.valueOf(o.getVehicle()));
             }
             }
         }
         }