feat: 新增派单下发，处理派单逻辑重构。

guzijian
1 parent 4d94e096
Showing 14 changed files with 587 additions and 113 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMapper.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMatchHandlerMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchHandler.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/DispatchDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/DispatchDriverVo.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/GarOrderDriverVo.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderMatchHandlerService.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchHandlerServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderMapper.xml
trash-garbage/src/main/resources/mapper/GarOrderMatchHandlerMapper.xml
@@ -76,8 +76,8 @@ public class GarbageOrderController {
     @PutMapping("/update")
     @Log(title = "修改订单状态", businessType = BusinessType.UPDATE)
-    public Result<String> uploadOrder(@RequestBody OrderUpdateDto dto) {
-        return Result.OK(garOrderService.uploadOrder(dto));
+    public Result<String> updateOrder(@RequestBody OrderUpdateDto dto) {
+        return Result.OK(garOrderService.updateOrder(dto));
     }
     @PostMapping("/evaluate")
@@ -93,16 +93,21 @@ public class GarbageOrderController {
     }
     @PutMapping("/dispatch")
-    public Result<?> dispatchOrders(@RequestBody DispatchDto dto){
+    public Result<?> dispatchOrders(@RequestBody DispatchDto dto) {
         garOrderService.dispatchOrder(dto);
         return Result.OK();
     }
     @GetMapping("/queryDispatch/{orderId}")
-    public Result<?> queryDispatch(@PathVariable("orderId") String orderId){
+    public Result<?> queryDispatch(@PathVariable("orderId") String orderId) {
         return Result.OK(garOrderService.queryDispatch(orderId));
     }
+    @GetMapping("/queryOrderHandlerStatus/{orderId}")
+    public Result<?> queryOrderHandlerStatus(@PathVariable("orderId") String orderId) {
+        return Result.OK(garOrderService.queryOrderHandlerStatus(orderId));
+    }
+
     @PostMapping("/upload/imageUrl")
     public Result<?> uploadImageUrlByType(@RequestBody UploadDto dto) {
@@ -2,6 +2,7 @@ package com.trash.garbage.mapper;
 import com.trash.garbage.pojo.domain.GarOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.trash.garbage.pojo.vo.GarOrderDriverVo;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
@@ -16,7 +17,9 @@ public interface GarOrderMapper extends BaseMapper&lt;GarOrder&gt; {
     List<GarOrder> queryCleanNumberByEnterpriseIds(@Param("list") List<Long> enterpriseIds,@Param("status") Integer value);
-    List<GarOrder> queryOrderListByTelWithType(@Param("garUserTel") String garUserTel, @Param("type") Integer type,@Param("cancelFlag") Integer value);
+    List<GarOrderDriverVo> queryOrderListByTelWithType(@Param("garUserTel") String garUserTel, @Param("type") Integer type, @Param("cancelFlag") Integer cancelFlag);
+
+    GarOrderDriverVo queryOrderByTelWithType(@Param("garUserTel") String garUserTel, @Param("orderId") String orderId, @Param("cancelFlag") Integer value);
 }
 package com.trash.garbage.mapper;
-import com.trash.garbage.pojo.domain.GarOrderMatchHandler;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.trash.garbage.pojo.domain.GarOrderMatchHandler;
+import com.trash.garbage.pojo.vo.DispatchDriverVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 /**
 * @author 20412
@@ -11,6 +16,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface GarOrderMatchHandlerMapper extends BaseMapper<GarOrderMatchHandler> {
+    List<DispatchDriverVo> queryDriverListWithDispatchStatus(@Param("orderId") String orderId, @Param("companyId") Long id);
 }
@@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
-import java.util.Objects;
 import lombok.Data;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 /**
  * 派单分发处理表
@@ -86,9 +87,21 @@ public class GarOrderMatchHandler implements Serializable {
     /**
      *
      */
-    private String garRemark;
+    private String garReason;
     private Integer garCancelFlag;
+    /**
+     * 分配车号
+     */
+    private String garHandlerCarCode;
+
+    public String getGarHandlerCarCode() {
+        return garHandlerCarCode;
+    }
+
+    public void setGarHandlerCarCode(String garHandlerCarCode) {
+        this.garHandlerCarCode = garHandlerCarCode;
+    }
     public Integer getGarCancelFlag() {
         return garCancelFlag;
@@ -197,26 +210,29 @@ public class GarOrderMatchHandler implements Serializable {
         this.garUpdateBy = garUpdateBy;
     }
-    public String getGarRemark() {
-        return garRemark;
+    public String getGarReason() {
+        return garReason;
     }
-    public void setGarRemark(String garRemark) {
-        this.garRemark = garRemark;
+    public void setGarReason(String garReason) {
+        this.garReason = garReason;
     }
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
+
         if (o == null || getClass() != o.getClass()) return false;
+
         GarOrderMatchHandler that = (GarOrderMatchHandler) o;
-        return Objects.equals(getGarId(), that.getGarId()) && Objects.equals(getGarOrderId(), that.getGarOrderId()) && Objects.equals(getGarOrderHandlerTel(), that.getGarOrderHandlerTel()) && Objects.equals(getGarOrderHandlerStatus(), that.getGarOrderHandlerStatus()) && Objects.equals(getGarOrderStatus(), that.getGarOrderStatus()) && Objects.equals(getGarOrderHandlerName(), that.getGarOrderHandlerName()) && Objects.equals(getGarOrderHandlerCompanyId(), that.getGarOrderHandlerCompanyId()) && Objects.equals(getGarOrderHandlerCompanyName(), that.getGarOrderHandlerCompanyName()) && Objects.equals(getGarCreateTime(), that.getGarCreateTime()) && Objects.equals(getGarUpdateTime(), that.getGarUpdateTime()) && Objects.equals(getGarCreateBy(), that.getGarCreateBy()) && Objects.equals(getGarUpdateBy(), that.getGarUpdateBy()) && Objects.equals(getGarRemark(), that.getGarRemark()) && Objects.equals(getGarCancelFlag(), that.getGarCancelFlag());
+
+        return new EqualsBuilder().append(getGarId(), that.getGarId()).append(getGarOrderId(), that.getGarOrderId()).append(getGarOrderHandlerTel(), that.getGarOrderHandlerTel()).append(getGarOrderHandlerStatus(), that.getGarOrderHandlerStatus()).append(getGarOrderStatus(), that.getGarOrderStatus()).append(getGarOrderHandlerName(), that.getGarOrderHandlerName()).append(getGarOrderHandlerCompanyId(), that.getGarOrderHandlerCompanyId()).append(getGarOrderHandlerCompanyName(), that.getGarOrderHandlerCompanyName()).append(getGarCreateTime(), that.getGarCreateTime()).append(getGarUpdateTime(), that.getGarUpdateTime()).append(getGarCreateBy(), that.getGarCreateBy()).append(getGarUpdateBy(), that.getGarUpdateBy()).append(getGarReason(), that.getGarReason()).append(getGarCancelFlag(), that.getGarCancelFlag()).append(getGarHandlerCarCode(), that.getGarHandlerCarCode()).isEquals();
     }
     @Override
     public int hashCode() {
-        return Objects.hash(getGarId(), getGarOrderId(), getGarOrderHandlerTel(), getGarOrderHandlerStatus(), getGarOrderStatus(), getGarOrderHandlerName(), getGarOrderHandlerCompanyId(), getGarOrderHandlerCompanyName(), getGarCreateTime(), getGarUpdateTime(), getGarCreateBy(), getGarUpdateBy(), getGarRemark(), getGarCancelFlag());
+        return new HashCodeBuilder(17, 37).append(getGarId()).append(getGarOrderId()).append(getGarOrderHandlerTel()).append(getGarOrderHandlerStatus()).append(getGarOrderStatus()).append(getGarOrderHandlerName()).append(getGarOrderHandlerCompanyId()).append(getGarOrderHandlerCompanyName()).append(getGarCreateTime()).append(getGarUpdateTime()).append(getGarCreateBy()).append(getGarUpdateBy()).append(getGarReason()).append(getGarCancelFlag()).append(getGarHandlerCarCode()).toHashCode();
     }
     @Override
@@ -234,8 +250,9 @@ public class GarOrderMatchHandler implements Serializable {
                 ", garUpdateTime=" + garUpdateTime +
                 ", garCreateBy='" + garCreateBy + '\'' +
                 ", garUpdateBy='" + garUpdateBy + '\'' +
-                ", garRemark='" + garRemark + '\'' +
+                ", garRemark='" + garReason + '\'' +
                 ", garCancelFlag=" + garCancelFlag +
+                ", garHandlerCarCode='" + garHandlerCarCode + '\'' +
                 '}';
     }
 }
 \ No newline at end of file
 package com.trash.garbage.pojo.dto;
 import lombok.Data;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import java.util.List;
 @Data
 public class DispatchDto {
     private String garOrderId;
-    private List<String> tel;
+    private List<DispatchDetail> dispatchList;
+
+    @Data
+    public static class DispatchDetail{
+        private String carCode;
+        private String tel;
+        private String name;
+
+        public String getCarCode() {
+            return carCode;
+        }
+
+        public void setCarCode(String carCode) {
+            this.carCode = carCode;
+        }
+
+        public String getTel() {
+            return tel;
+        }
+
+        public void setTel(String tel) {
+            this.tel = tel;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String toString() {
+            return "DispatchDetail{" +
+                    "carCode='" + carCode + '\'' +
+                    ", tel='" + tel + '\'' +
+                    ", name='" + name + '\'' +
+                    '}';
+        }
+
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+
+            if (o == null || getClass() != o.getClass()) return false;
+
+            DispatchDetail that = (DispatchDetail) o;
+
+            return new EqualsBuilder().append(getCarCode(), that.getCarCode()).append(getTel(), that.getTel()).append(getName(), that.getName()).isEquals();
+        }
+
+        @Override
+        public int hashCode() {
+            return new HashCodeBuilder(17, 37).append(getCarCode()).append(getTel()).append(getName()).toHashCode();
+        }
+    }
+
+
+
+    public String getGarOrderId() {
+        return garOrderId;
+    }
+
+    public void setGarOrderId(String garOrderId) {
+        this.garOrderId = garOrderId;
+    }
+
+    public List<DispatchDetail> getDispatchList() {
+        return dispatchList;
+    }
+
+    public void setDispatchList(List<DispatchDetail> dispatchList) {
+        this.dispatchList = dispatchList;
+    }
+
+
+    @Override
+    public String toString() {
+        return "DispatchDto{" +
+                "garOrderId='" + garOrderId + '\'' +
+                ", detailList=" + dispatchList +
+                '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+
+        if (o == null || getClass() != o.getClass()) return false;
+
+        DispatchDto that = (DispatchDto) o;
+
+        return new EqualsBuilder().append(getGarOrderId(), that.getGarOrderId()).append(getDispatchList(), that.getDispatchList()).isEquals();
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder(17, 37).append(getGarOrderId()).append(getDispatchList()).toHashCode();
+    }
 }
@@ -3,49 +3,114 @@ package com.trash.garbage.pojo.vo;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import java.util.List;
+
 /**
  * @author 20412
  */
 @ToString
 @EqualsAndHashCode
 public class DispatchDriverVo {
-    private String name;
-    private String tel;
-    private Boolean checked;
+    /**
+     * 车牌号
+     */
     private String licensePlateNumber;
+    /**
+     * 车辆类型
+     */
+    private String containerVolume;
-    public String getLicensePlateNumber() {
-        return licensePlateNumber;
-    }
+    private List<Personnel> personnelInfo;
-    public void setLicensePlateNumber(String licensePlateNumber) {
-        this.licensePlateNumber = licensePlateNumber;
+    /**
+     * 人员信息
+     */
+    @EqualsAndHashCode
+    public static class Personnel {
+        /**
+         * 姓名
+         */
+        private String name;
+        /**
+         * 手机号
+         */
+        private String tel;
+
+        /**
+         * 是否选择
+         */
+        private Boolean checked;
+
+        private String garHandlerCarCode;
+
+        @Override
+        public String toString() {
+            return "Personnel{" +
+                    "name='" + name + '\'' +
+                    ", tel='" + tel + '\'' +
+                    ", checked=" + checked +
+                    ", garHandlerCarCode='" + garHandlerCarCode + '\'' +
+                    '}';
+        }
+
+        public String getGarHandlerCarCode() {
+            return garHandlerCarCode;
+        }
+
+        public void setGarHandlerCarCode(String garHandlerCarCode) {
+            this.garHandlerCarCode = garHandlerCarCode;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getTel() {
+            return tel;
+        }
+
+        public void setTel(String tel) {
+            this.tel = tel;
+        }
+
+        public Boolean getChecked() {
+            return checked;
+        }
+
+        public void setChecked(Boolean checked) {
+            this.checked = checked;
+        }
     }
-    public Boolean getChecked() {
-        return checked;
+    public List<Personnel> getPersonnelInfo() {
+        return personnelInfo;
     }
-    public void setChecked(Boolean checked) {
-        this.checked = checked;
+    public void setPersonnelInfo(List<Personnel> personnelInfo) {
+        this.personnelInfo = personnelInfo;
     }
-    public String getName() {
-        return name;
+    public String getContainerVolume() {
+        return containerVolume;
     }
-    public void setName(String name) {
-        this.name = name;
+    public void setContainerVolume(String containerVolume) {
+        this.containerVolume = containerVolume;
     }
-    public String getTel() {
-        return tel;
+    public String getLicensePlateNumber() {
+        return licensePlateNumber;
     }
-    public void setTel(String tel) {
-        this.tel = tel;
+    public void setLicensePlateNumber(String licensePlateNumber) {
+        this.licensePlateNumber = licensePlateNumber;
     }
+
 }
+package com.trash.garbage.pojo.vo;
+
+import com.trash.garbage.pojo.domain.GarOrder;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 用于驾驶员的状态管理
+ */
+@EqualsAndHashCode
+public class GarOrderDriverVo extends GarOrder {
+
+    /**
+     * gar_order_status 代表订单的全局状态  员order 的gar_order_handler_status 变为代表分发后驾驶员自己处理派单的状态
+     */
+    private Integer garOrderStatus;
+
+    private String garHandlerCarCode;
+
+    private Integer garCancelFlag;
+
+    @Override
+    public String toString() {
+        return "GarOrderDriverVo{" +
+                "garOrderStatus=" + garOrderStatus +
+                ", garHandlerCarCode='" + garHandlerCarCode + '\'' +
+                ", garCancelFlag=" + garCancelFlag +
+                '}';
+    }
+
+    public String getGarHandlerCarCode() {
+        return garHandlerCarCode;
+    }
+
+    public void setGarHandlerCarCode(String garHandlerCarCode) {
+        this.garHandlerCarCode = garHandlerCarCode;
+    }
+
+    public Integer getGarOrderStatus() {
+        return garOrderStatus;
+    }
+
+    public void setGarOrderStatus(Integer garOrderStatus) {
+        this.garOrderStatus = garOrderStatus;
+    }
+
+    @Override
+    public Integer getGarCancelFlag() {
+        return garCancelFlag;
+    }
+
+    @Override
+    public void setGarCancelFlag(Integer garCancelFlag) {
+        this.garCancelFlag = garCancelFlag;
+    }
+}
@@ -123,6 +123,13 @@ public class OrderDetailVo {
      */
     private Boolean handleFlag;
+
+    private Integer garOrderMatchFlag;
+
+    private Integer garOrderStatus;
+
+    private String garHandlerCarCode;
+
     public OrderDetailVo() {
         this.currentImages = new ArrayList<>();
         this.putDownImages = new ArrayList<>();
@@ -130,6 +137,65 @@ public class OrderDetailVo {
         this.garHandlerEvaluateFlag = GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue();
     }
+    @Override
+    public String toString() {
+        return "OrderDetailVo{" +
+                "garCancelFlag=" + garCancelFlag +
+                ", garReason='" + garReason + '\'' +
+                ", garOrderHandlerId='" + garOrderHandlerId + '\'' +
+                ", garEvaluateFlag=" + garEvaluateFlag +
+                ", garHandlerEvaluateFlag=" + garHandlerEvaluateFlag +
+                ", garOrderHandleName='" + garOrderHandleName + '\'' +
+                ", garOrderHandleTel='" + garOrderHandleTel + '\'' +
+                ", garOrderAddress='" + garOrderAddress + '\'' +
+                ", currentImages=" + currentImages +
+                ", putOnImages=" + putOnImages +
+                ", putDownImages=" + putDownImages +
+                ", garOrderAddressDetails='" + garOrderAddressDetails + '\'' +
+                ", garOrderContactName='" + garOrderContactName + '\'' +
+                ", garOrderTrashType='" + garOrderTrashType + '\'' +
+                ", garCarInfoList=" + garCarInfoList +
+                ", garOrderHandlerStatus=" + garOrderHandlerStatus +
+                ", garCreateTime=" + garCreateTime +
+                ", garOrderContactTel='" + garOrderContactTel + '\'' +
+                ", garOrderCompanyId='" + garOrderCompanyId + '\'' +
+                ", garOrderCompanyName='" + garOrderCompanyName + '\'' +
+                ", garOrderCompanyTel='" + garOrderCompanyTel + '\'' +
+                ", garOrderAgreementTime='" + garOrderAgreementTime + '\'' +
+                ", garRemark='" + garRemark + '\'' +
+                ", handleFlag=" + handleFlag +
+                ", garOrderMatchFlag=" + garOrderMatchFlag +
+                ", garOrderStatus=" + garOrderStatus +
+                ", garHandlerCarCode='" + garHandlerCarCode + '\'' +
+                '}';
+    }
+
+
+    public String getGarHandlerCarCode() {
+        return garHandlerCarCode;
+    }
+
+    public void setGarHandlerCarCode(String garHandlerCarCode) {
+        this.garHandlerCarCode = garHandlerCarCode;
+    }
+
+    public Integer getGarOrderStatus() {
+        return garOrderStatus;
+    }
+
+    public void setGarOrderStatus(Integer garOrderStatus) {
+        this.garOrderStatus = garOrderStatus;
+    }
+
+
+    public Integer getGarOrderMatchFlag() {
+        return garOrderMatchFlag;
+    }
+
+    public void setGarOrderMatchFlag(Integer garOrderMatchFlag) {
+        this.garOrderMatchFlag = garOrderMatchFlag;
+    }
+
     public List<GarOrderCar> getGarCarInfoList() {
         return garCarInfoList;
     }
@@ -2,6 +2,10 @@ package com.trash.garbage.service;
 import com.trash.garbage.pojo.domain.GarOrderMatchHandler;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.trash.garbage.pojo.vo.DispatchDriverVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 /**
 * @author 20412
@@ -10,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface GarOrderMatchHandlerService extends IService<GarOrderMatchHandler> {
+    List<DispatchDriverVo> queryDriverListWithDispatchStatus(String orderId, Long companyId);
 }
@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.trash.enterprise.domain.TransportationEnterprise;
 import com.trash.garbage.pojo.domain.GarOrder;
 import com.trash.garbage.pojo.domain.GarOrderEvaluate;
+import com.trash.garbage.pojo.domain.GarOrderMatchHandler;
 import com.trash.garbage.pojo.dto.*;
 import com.trash.garbage.pojo.vo.DispatchDriverVo;
 import com.trash.garbage.pojo.vo.OrderDetailVo;
@@ -47,7 +48,7 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; {
      * @param dto
      * @return
      */
-    String uploadOrder(OrderUpdateDto dto);
+    String updateOrder(OrderUpdateDto dto);
     /**
      * 上传图片url执行图片type
@@ -71,4 +72,6 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; {
     void dispatchOrder(DispatchDto dto);
     List<DispatchDriverVo> queryDispatch(String orderId);
+
+    List<GarOrderMatchHandler> queryOrderHandlerStatus(String orderId);
 }
 package com.trash.garbage.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.trash.garbage.mapper.GarOrderMatchHandlerMapper;
 import com.trash.garbage.pojo.domain.GarOrderMatchHandler;
+import com.trash.garbage.pojo.vo.DispatchDriverVo;
 import com.trash.garbage.service.GarOrderMatchHandlerService;
-import com.trash.garbage.mapper.GarOrderMatchHandlerMapper;
 import org.springframework.stereotype.Service;
+import java.util.List;
+
 /**
-* @author 20412
-* @description 针对表【gar_order_match_handler(派单分发处理表)】的数据库操作Service实现
-* @createDate 2024-01-09 14:26:09
-*/
+ * @author 20412
+ * @description 针对表【gar_order_match_handler(派单分发处理表)】的数据库操作Service实现
+ * @createDate 2024-01-09 14:26:09
+ */
 @Service
 public class GarOrderMatchHandlerServiceImpl extends ServiceImpl<GarOrderMatchHandlerMapper, GarOrderMatchHandler>
-    implements GarOrderMatchHandlerService{
+        implements GarOrderMatchHandlerService {
+    @Override
+    public List<DispatchDriverVo> queryDriverListWithDispatchStatus(String orderId, Long id) {
+        return baseMapper.queryDriverListWithDispatchStatus(orderId, id);
+    }
 }
@@ -10,6 +10,7 @@ import com.trash.garbage.global.ResultCode;
 import com.trash.garbage.pojo.domain.*;
 import com.trash.garbage.pojo.dto.*;
 import com.trash.garbage.pojo.vo.DispatchDriverVo;
+import com.trash.garbage.pojo.vo.GarOrderDriverVo;
 import com.trash.garbage.pojo.vo.TransportationEnterpriseVo;
 import com.trash.garbage.service.*;
 import org.apache.commons.lang3.StringUtils;
@@ -111,12 +112,58 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     @Override
     public OrderDetailVo queryOrderDetail(String id) {
-        GarOrder order = this.getById(id);
+
         GarUser user = garUserService.getById(SecurityUtils.getLoginUser().getUser().getUserId());
+        if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription())
+                || user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription())) {
+            return getOrderDetailVoResponsible(id, user);
+        }
+        // TODO 订单分发获取 处理人员
+        if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription())) {
+            return getOrderDetailVoDriver(id, user);
+        }
+        throw new BizException(ResultCode.CODE_500, "没有当前角色");
+    }
+
+    private OrderDetailVo getOrderDetailVoDriver(String orderId, GarUser user) {
+        LambdaQueryWrapper<GarOrderImage> qwi = new LambdaQueryWrapper<>();
+        qwi.eq(GarOrderImage::getGarOrderId, orderId)
+                .eq(GarOrderImage::getGarCreateBy, user.getGarUserId());
+        OrderDetailVo vo = new OrderDetailVo();
+        GarOrderDriverVo orderVo = baseMapper.queryOrderByTelWithType(user.getGarUserTel(), orderId, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
+        vo.setHandleFlag(true);
+        BeanUtils.copyBeanProp(vo, orderVo);
+        // 获取图片
+        List<GarOrderImage> imageAll = new ArrayList<>();
+        List<GarOrderImage> currentImageList = garOrderImageService.list(new LambdaQueryWrapper<GarOrderImage>()
+                .eq(GarOrderImage::getGarOrderId, orderId)
+                .eq(GarOrderImage::getGarOrderImageType, GlobalStatus.GarOrderStatus.IMAGE_TYPE_CURRENT.getValue()));
+        imageAll.addAll(garOrderImageService.list(qwi));
+        imageAll.addAll(currentImageList);
+        for (GarOrderImage image : imageAll) {
+            if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_CURRENT.getValue().equals(image.getGarOrderImageType())) {
+                vo.getCurrentImages().add(image.getGarOrderImageUrl());
+            }
+            if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_ON.getValue().equals(image.getGarOrderImageType())) {
+                vo.getPutOnImages().add(image.getGarOrderImageUrl());
+            }
+            if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_DOWN.getValue().equals(image.getGarOrderImageType())) {
+                vo.getPutDownImages().add(image.getGarOrderImageUrl());
+            }
+        }
+        // 获取车辆信息
+        LambdaQueryWrapper<GarOrderCar> qwc = new LambdaQueryWrapper<>();
+        qwc.eq(GarOrderCar::getGarOrderId, orderVo.getGarOrderId());
+        List<GarOrderCar> carList = garOrderCarService.list(qwc);
+        vo.setGarCarInfoList(carList);
+        return vo;
+    }
+
+    private OrderDetailVo getOrderDetailVoResponsible(String id, GarUser user) {
+        GarOrder order = this.getById(id);
         LambdaQueryWrapper<GarOrderImage> qwi = new LambdaQueryWrapper<>();
         qwi.eq(GarOrderImage::getGarOrderId, id);
         OrderDetailVo vo = new OrderDetailVo();
-//        List<DriverVo> driverVos = null;
         if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription())) {
             vo.setHandleFlag(true);
             // 防止其他人员处理订单
@@ -138,23 +185,11 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 vo.getPutDownImages().add(image.getGarOrderImageUrl());
             }
         }
-
         // 获取车辆信息
         LambdaQueryWrapper<GarOrderCar> qwc = new LambdaQueryWrapper<>();
         qwc.eq(GarOrderCar::getGarOrderId, order.getGarOrderId());
         List<GarOrderCar> carList = garOrderCarService.list(qwc);
         vo.setGarCarInfoList(carList);
-        // TODO 订单分发获取 处理人员
-//        if (StringUtils.isNotEmpty(vo.getGarOrderHandlerId())) {
-//            GarUser handleUser = garUserService.getById(vo.getGarOrderHandlerId());
-//            DriverVo driverVo = new DriverVo();
-//            driverVo.setPhoneNo(handleUser.getGarUserTel());
-//            driverVos = driverService.selectDriverList(driverVo);
-//            if (CollectionUtil.isNotEmpty(driverVos)) {
-//                vo.setGarOrderHandleName(driverVos.get(0).getName());
-//                vo.setGarOrderHandleTel(driverVos.get(0).getPhoneNo());
-//            }
-//        }
         return vo;
     }
@@ -178,6 +213,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
                 return pageInfo;
             }
+
             // 全部
             if (GlobalStatus.GarOrderStatus.ALL_ORDER.getValue().equals(type)) {
                 qw.eq(GarOrder::getGarOrderUserId, userId);
@@ -192,14 +228,14 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)
                     || GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
                     || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
-                List<GarOrder> orderList = baseMapper.queryOrderListByTelWithType(user.getGarUserTel(), type, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
-                PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
+                List<GarOrderDriverVo> orderList = baseMapper.queryOrderListByTelWithType(user.getGarUserTel(), type, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
+                PageInfo<GarOrderDriverVo> pageInfo = new PageInfo<GarOrderDriverVo>(orderList, pageSize);
                 return pageInfo;
             }
             // 全部
             if (GlobalStatus.GarOrderStatus.ALL_ORDER.getValue().equals(type)) {
-                List<GarOrder> orderList = baseMapper.queryOrderListByTelWithType(user.getGarUserTel(), null, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
-                PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
+                List<GarOrderDriverVo> orderList = baseMapper.queryOrderListByTelWithType(user.getGarUserTel(), null, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
+                PageInfo<GarOrderDriverVo> pageInfo = new PageInfo<GarOrderDriverVo>(orderList, pageSize);
                 return pageInfo;
             }
         }
@@ -225,10 +261,59 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     }
     @Override
-    public String uploadOrder(OrderUpdateDto dto) {
-        GarOrder order = getById(dto.getGarOrderId());
+    public String updateOrder(OrderUpdateDto dto) {
         String userId = SecurityUtils.getLoginUser().getUser().getUserId();
         GarUser user = garUserService.getById(userId);
+        // 处理用户派单 居民用户 | 企业负责人
+        if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription())
+                || user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription())) {
+            return handlerOrderStatus(dto, user);
+        }
+        // 处理分发派单 驾驶员
+        else if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription())) {
+            return handlerDispatchOrderStatus(dto, user);
+        }
+
+        throw new BizException(ResultCode.CODE_500);
+
+    }
+
+    private String handlerDispatchOrderStatus(OrderUpdateDto dto, GarUser user) {
+//        GarOrder order = getById(dto.getGarOrderId());
+        GarOrderDriverVo order = baseMapper.queryOrderByTelWithType(user.getGarUserTel(), dto.getGarOrderId(), GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
+        // 取消订单
+        if (GlobalStatus.GarOrderStatus.CANCEL_FLAG_YES.getValue().equals(dto.getGarCancelFlag())) {
+            LambdaUpdateWrapper<GarOrderMatchHandler> uw = new LambdaUpdateWrapper<>();
+            uw.set(GarOrderMatchHandler::getGarCancelFlag, dto.getGarCancelFlag())
+                    .set(GarOrderMatchHandler::getGarReason, dto.getGarReason())
+                    .eq(GarOrderMatchHandler::getGarOrderId, dto.getGarOrderId());
+            handlerService.update(uw);
+            return "已取消派单";
+        } else {
+            // 公司所属 待清运- 》 清运中
+            if (order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue())
+                    || GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(dto.getHandleType())) {
+                LambdaUpdateWrapper<GarOrderMatchHandler> uw = new LambdaUpdateWrapper<>();
+                uw.eq(GarOrderMatchHandler::getGarOrderId, dto.getGarOrderId())
+                        .set(GarOrderMatchHandler::getGarOrderStatus, GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue())
+                        .set(GarOrderMatchHandler::getGarOrderHandlerTel, user.getGarUserTel());
+                handlerService.update(uw);
+                return "已接受派单";
+            }
+            // 运输驾驶员 清运中 ==》已完成
+            if (GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(order.getGarOrderHandlerStatus())
+                    && GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(dto.getHandleType())) {
+                LambdaUpdateWrapper<GarOrderMatchHandler> uw = new LambdaUpdateWrapper<>();
+                uw.eq(GarOrderMatchHandler::getGarOrderId, dto.getGarOrderId())
+                        .set(GarOrderMatchHandler::getGarOrderStatus, GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue());
+                handlerService.update(uw);
+            }
+            return "派单已完成";
+        }
+    }
+
+    private String handlerOrderStatus(OrderUpdateDto dto, GarUser user) {
+        GarOrder order = getById(dto.getGarOrderId());
         // 取消订单
         if (GlobalStatus.GarOrderStatus.CANCEL_FLAG_YES.getValue().equals(dto.getGarCancelFlag())) {
             LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
@@ -239,7 +324,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             return "订单取消成功";
         }
         // 企业负责人 TODO
-        if (GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription().equals(user.getGarUserType())) {
+        else {
             // 公司所属 待清运- 》 清运中
             if (order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue())
                     || GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(dto.getHandleType())) {
@@ -265,9 +350,6 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             }
             return "派单已完成";
         }
-        throw new BizException(ResultCode.CODE_500);
-
-//        return "什么都没发生";
     }
     @Override
@@ -397,10 +479,12 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     public void dispatchOrder(DispatchDto dto) {
         // TODO
         GarOrder order = getById(dto.getGarOrderId());
-        List<GarOrderMatchHandler> handlerList = new ArrayList<>(dto.getTel().size());
-        for (String tel : dto.getTel()) {
+        List<GarOrderMatchHandler> handlerList = new ArrayList<>(dto.getDispatchList().size());
+        for (DispatchDto.DispatchDetail detail : dto.getDispatchList()) {
             GarOrderMatchHandler handler = new GarOrderMatchHandler();
-            handler.setGarOrderHandlerTel(tel);
+            handler.setGarOrderHandlerTel(detail.getTel());
+            handler.setGarOrderHandlerName(detail.getName());
+            handler.setGarHandlerCarCode(detail.getCarCode());
             handler.setGarCancelFlag(order.getGarCancelFlag());
             handler.setGarOrderId(order.getGarOrderId());
             handler.setGarOrderHandlerStatus(order.getGarOrderHandlerStatus());
@@ -415,30 +499,30 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     }
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public List<DispatchDriverVo> queryDispatch(String orderId) {
+        GarOrder order = getById(orderId);
+        order.setGarOrderMatchFlag(GlobalStatus.GarOrderStatus.MATCH_YES.getValue());
+        updateById(order);
         String tel = SecurityUtils.getLoginUser().getUser().getPhonenumber();
         TransportationEnterprise enterprise = new TransportationEnterprise();
         enterprise.setServicePhone(tel);
         List<TransportationEnterprise> enterprises = transportationEnterpriseService.selectTransportationEnterpriseList(enterprise);
-        DriverVo vo = new DriverVo();
-        vo.setCompanyId(enterprises.get(0).getId());
-        List<DriverVo> driverList = iDriverService.selectDriverList(vo);
         // 选中的司机
         LambdaQueryWrapper<GarOrderMatchHandler> qw = new LambdaQueryWrapper<>();
         qw.eq(GarOrderMatchHandler::getGarOrderId, orderId);
-        Map<String, GarOrderMatchHandler> handlerMap = handlerService.list(qw).stream().collect(Collectors.toMap(GarOrderMatchHandler::getGarOrderHandlerTel, item -> item));
-
-        List<DispatchDriverVo> voList = driverList.stream().map(item -> {
-            DispatchDriverVo dispatchVo = new DispatchDriverVo();
-            dispatchVo.setName(item.getName());
-            dispatchVo.setTel(item.getPhoneNo());
-//            dispatchVo.setLicensePlateNumber(item.);
-//            dispatchVo.setChecked();
-            return dispatchVo;
-        }).collect(Collectors.toList());
+        List<DispatchDriverVo> voList = handlerService.queryDriverListWithDispatchStatus(orderId, enterprises.get(0).getId());
         return voList;
     }
+    @Override
+    public List<GarOrderMatchHandler> queryOrderHandlerStatus(String orderId) {
+        List<GarOrderMatchHandler> list =
+                handlerService.list(new LambdaQueryWrapper<GarOrderMatchHandler>()
+                        .eq(GarOrderMatchHandler::getGarOrderId, orderId));
+        return list;
+    }
+
     private void handleCleanNumber(TransportationEnterpriseVo vo, List<GarOrder> orderList) {
         Long cleanNumber = 0L;
         for (GarOrder order : orderList) {
@@ -38,7 +38,7 @@
         gar_order_company_name,gar_order_company_tel,gar_order_handler_status,
         gar_order_agreement_time,gar_create_time,gar_update_time,
         gar_create_by,gar_update_by,gar_remark,gar_reason,gar_cancel_flag,
-        gar_evaluate_flag,gar_order_car_number,gar_order_car_type,gar_handler_evaluate_flag,gar_order_match_flag
+        gar_evaluate_flag,gar_handler_evaluate_flag,gar_order_match_flag
     </sql>
     <select id="queryCleanNumberByEnterpriseIds" resultType="com.trash.garbage.pojo.domain.GarOrder">
         select gar_order_company_id, count(gar_order_company_id) as count
@@ -50,18 +50,41 @@
         </foreach>
         group by gar_order_company_id
     </select>
-    <select id="queryOrderListByTelWithType" resultType="com.trash.garbage.pojo.domain.GarOrder">
-        select <include refid="Base_Column_List"></include> from gar_order
-        where gar_order_id in (
-        select gar_order_id from gar_order_match_handler
-        where gar_order_handler_tel = #{garUserTel}
-        <if test="type != null">
-            and gar_order_status = #{type}
-        </if>
-        <if test="cancelFlag != null">
-            and gar_cancel_flag = #{cancelFlag}
-        </if>
-        )
-
+    <select id="queryOrderListByTelWithType" resultType="com.trash.garbage.pojo.vo.GarOrderDriverVo">
+        SELECT
+        `order`.gar_order_id ,`order`.gar_order_user_id,`order`.gar_order_handler_id,
+        `order`.gar_order_address,`order`.gar_order_address_details,`order`.gar_order_contact_name,
+        `order`.gar_order_trash_type,`order`.gar_order_contact_tel,`order`.gar_order_company_id,
+        `order`.gar_order_company_name,`order`.gar_order_company_tel,`order`.gar_order_match_flag,
+        `order`.gar_order_agreement_time,`order`.gar_remark,`order`.gar_handler_evaluate_flag,`order`.gar_order_handler_status gar_order_status,
+        `handler`.gar_order_status gar_order_handler_status,`handler`.gar_cancel_flag,`handler`.gar_reason
+        FROM gar_order `order`
+        INNER JOIN gar_order_match_handler `handler` ON `order`.gar_order_id = `handler`.gar_order_id
+        <where>
+            `handler`.gar_order_handler_tel = #{garUserTel}
+            <if test="type != null">
+                AND `handler`.gar_order_status = #{type}
+            </if>
+            <if test="cancelFlag != null">
+                AND `handler`.gar_cancel_flag = #{cancelFlag}
+            </if>
+        </where>
+    </select>
+    <select id="queryOrderByTelWithType" resultType="com.trash.garbage.pojo.vo.GarOrderDriverVo">
+        SELECT
+        `order`.gar_order_id ,`order`.gar_order_user_id,`order`.gar_order_handler_id,
+        `order`.gar_order_address,`order`.gar_order_address_details,`order`.gar_order_contact_name,
+        `order`.gar_order_trash_type,`order`.gar_order_contact_tel,`order`.gar_order_company_id,
+        `order`.gar_order_company_name,`order`.gar_order_company_tel,`order`.gar_order_match_flag,
+        `order`.gar_order_agreement_time,`order`.gar_remark,`order`.gar_handler_evaluate_flag,`order`.gar_order_handler_status gar_order_status,
+        `handler`.gar_order_status gar_order_handler_status,`handler`.gar_cancel_flag,`handler`.gar_reason,`handler`.gar_handler_car_code
+        FROM gar_order `order`
+        INNER JOIN gar_order_match_handler `handler` ON `order`.gar_order_id = `handler`.gar_order_id AND `order`.gar_order_id = #{orderId}
+        <where>
+            `handler`.gar_order_handler_tel = #{garUserTel}
+            <if test="cancelFlag != null">
+                AND `handler`.gar_cancel_flag = #{cancelFlag}
+            </if>
+        </where>
     </select>
 </mapper>
@@ -2,28 +2,61 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.trash.garbage.pojo.domain.GarOrderMatchHandler">
+<mapper namespace="com.trash.garbage.mapper.GarOrderMatchHandlerMapper">
     <resultMap id="BaseResultMap" type="com.trash.garbage.pojo.domain.GarOrderMatchHandler">
-            <id property="garId" column="gar_id" jdbcType="VARCHAR"/>
-            <result property="garOrderId" column="gar_order_id" jdbcType="VARCHAR"/>
-            <result property="garOrderHandlerTel" column="gar_order_handler_tel" jdbcType="VARCHAR"/>
-            <result property="garOrderHandlerStatus" column="gar_order_handler_status" jdbcType="TINYINT"/>
-            <result property="garCancelFlag" column="gar_cancel_flag" jdbcType="TINYINT"/>
-            <result property="garOrderHandlerName" column="gar_order_handler_name" jdbcType="VARCHAR"/>
-            <result property="garOrderHandlerCompanyId" column="gar_order_handler_company_id" jdbcType="VARCHAR"/>
-            <result property="garOrderHandlerCompanyName" column="gar_order_handler_company_name" jdbcType="VARCHAR"/>
-            <result property="garCreateTime" column="gar_create_time" jdbcType="TIMESTAMP"/>
-            <result property="garUpdateTime" column="gar_update_time" jdbcType="TIMESTAMP"/>
-            <result property="garCreateBy" column="gar_create_by" jdbcType="VARCHAR"/>
-            <result property="garUpdateBy" column="gar_update_by" jdbcType="VARCHAR"/>
-            <result property="garRemark" column="gar_remark" jdbcType="VARCHAR"/>
+        <id property="garId" column="gar_id" jdbcType="VARCHAR"/>
+        <result property="garOrderId" column="gar_order_id" jdbcType="VARCHAR"/>
+        <result property="garOrderHandlerTel" column="gar_order_handler_tel" jdbcType="VARCHAR"/>
+        <result property="garOrderHandlerStatus" column="gar_order_handler_status" jdbcType="TINYINT"/>
+        <result property="garCancelFlag" column="gar_cancel_flag" jdbcType="TINYINT"/>
+        <result property="garOrderHandlerName" column="gar_order_handler_name" jdbcType="VARCHAR"/>
+        <result property="garOrderHandlerCompanyId" column="gar_order_handler_company_id" jdbcType="VARCHAR"/>
+        <result property="garOrderHandlerCompanyName" column="gar_order_handler_company_name" jdbcType="VARCHAR"/>
+        <result property="garCreateTime" column="gar_create_time" jdbcType="TIMESTAMP"/>
+        <result property="garUpdateTime" column="gar_update_time" jdbcType="TIMESTAMP"/>
+        <result property="garCreateBy" column="gar_create_by" jdbcType="VARCHAR"/>
+        <result property="garUpdateBy" column="gar_update_by" jdbcType="VARCHAR"/>
+        <result property="garReason" column="gar_reason" jdbcType="VARCHAR"/>
+        <result property="garHandlerCarCode" column="gar_handler_car_code" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <resultMap id="DispatchDriverVo" type="com.trash.garbage.pojo.vo.DispatchDriverVo">
+        <result property="licensePlateNumber" column="car_code" jdbcType="VARCHAR"/>
+        <result property="containerVolume" column="container_volume" jdbcType="TINYINT"/>
+        <collection property="personnelInfo" ofType="com.trash.garbage.pojo.vo.DispatchDriverVo$Personnel">
+            <id property="name" column="name" jdbcType="VARCHAR"/>
+            <result property="tel" column="phoneNo" jdbcType="VARCHAR"/>
+            <result property="checked" column="checked"/>
+        </collection>
     </resultMap>
     <sql id="Base_Column_List">
-        gar_id,gar_order_id,gar_order_handler_tel,
+        gar_id
+        ,gar_order_id,gar_order_handler_tel,
         gar_order_handler_status,gar_cancel_flag,gar_order_handler_name,gar_order_handler_company_id,
         gar_order_handler_company_name,gar_create_time,gar_update_time,
-        gar_craete_by,gar_update_by,gar_remark
+        gar_craete_by,gar_update_by,gar_reason,gar_handler_car_code
     </sql>
+    <select id="queryDriverListWithDispatchStatus" resultMap="DispatchDriverVo">
+        SELECT
+            driver.`name` AS `name`,
+            driver.phoneNo AS phoneNo,
+            car.car_code AS car_code,
+            car.container_volume AS container_volume,
+            gar.gar_handler_car_code,
+            gar.gar_order_id,
+            CASE
+                WHEN gar.gar_order_id IS NULL THEN 0
+                ELSE 1
+                END AS checked
+        FROM
+            driver
+                INNER JOIN car_driver_relation relation ON relation.driver_id = driver.id
+                INNER JOIN car_info car ON car.id = relation.car_id
+                LEFT JOIN gar_order_match_handler gar ON gar.gar_order_handler_tel = driver.phoneNo
+                AND gar.gar_order_id = #{orderId} AND gar.gar_handler_car_code = car.car_code
+        WHERE
+            driver.company_id = #{companyId}
+    </select>
 </mapper>