Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/BuildingMaterialsMarketListParam.java

@@ -28,9 +28,9 @@ public class BuildingMaterialsMarketListParam extends PageRequest {
     private List<String> goodsTypes;
 
     /**
-     * 省份code集合（全国为空）
+     * 省份code
      */
-    private List<Integer> provinceCodes;
+    private Integer provinceCode;
 
     /**
      * 交易方式(预付款、货到付款、线下付款）

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/GoodsListParam.java

@@ -6,7 +6,6 @@ import lombok.Setter;
 import lombok.ToString;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * @desc: 查询商品列表请求参数
@@ -38,17 +37,17 @@ public class GoodsListParam {
     /**
      * 状态集合
      */
-    private List<Integer> status;
+    private Integer status;
 
     /**
-     * 商品类型集合
+     * 商品类型
      */
-    private List<String> goodsTypes;
+    private String goodsType;
 
     /**
-     * 交易方式集合
+     * 交易方式
      */
-    private List<String> tradings;
+    private String trading;
 
 
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/SelectGoodsListParam.java

@@ -37,19 +37,19 @@ public class SelectGoodsListParam extends PageRequest {
     private Date endCreateTime;
 
     /**
-     * 状态集合
+     * 状态
      */
-    private List<Integer> status;
+    private Integer status;
 
     /**
-     * 商品类型集合
+     * 商品类型
      */
-    private List<String> goodsTypes;
+    private String goodsType;
 
     /**
-     * 交易方式集合
+     * 交易方式
      */
-    private List<String> tradings;
+    private String trading;
 
     /**
      * 商品ids

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -407,9 +407,9 @@ public class KwpGoodsService {
         } else {
             wrapper.ge(Objects.nonNull(params.getStartCreateTime()), KwpGoods::getCreateTime, params.getStartCreateTime())
                     .le(Objects.nonNull(params.getEndCreateTime()), KwpGoods::getCreateTime, params.getEndCreateTime())
-                    .in(CollectionUtils.isNotEmpty(params.getTradings()), KwpGoods::getTrading, params.getTradings())
-                    .in(CollectionUtils.isNotEmpty(params.getGoodsTypes()), KwpGoods::getGoodsType, params.getGoodsTypes())
-                    .in(CollectionUtils.isNotEmpty(params.getStatus()), KwpGoods::getStatus, params.getStatus());
+                    .eq(StringUtils.isNotBlank(params.getTrading()), KwpGoods::getTrading, params.getTrading())
+                    .eq(StringUtils.isNotBlank(params.getGoodsType()), KwpGoods::getGoodsType, params.getGoodsType())
+                    .eq(Objects.nonNull(params.getStatus()), KwpGoods::getStatus, params.getStatus());
             if (StringUtils.isNotBlank(params.getKeywords())) {
                 List<EntCacheResDto> entList = remoteSystemService.queryEntCacheByName(params.getKeywords());
                 List<Long> entIds = entList.stream().map(EntCacheResDto::getId).toList();
@@ -563,7 +563,7 @@ public class KwpGoodsService {
         LambdaQueryWrapper<KwpGoods> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(CollectionUtils.isNotEmpty(params.getGoodsTypes()), KwpGoods::getGoodsType, params.getGoodsTypes())
                 .in(CollectionUtils.isNotEmpty(params.getTradings()), KwpGoods::getTrading, params.getTradings())
-                .in(CollectionUtils.isNotEmpty(params.getProvinceCodes()), KwpGoods::getProvinceCode, params.getProvinceCodes())
+                .eq(Objects.nonNull(params.getProvinceCode()), KwpGoods::getProvinceCode, params.getProvinceCode())
                 .eq(KwpGoods::getStatus, GoodsStatusEnum.PUT_ON_SHELVES.getCode()).eq(KwpGoods::getDelFlag, Global.NO);
         if (StringUtils.isNotBlank(params.getKeywords())) {
             List<EntCacheResDto> entList = remoteSystemService.queryEntCacheByName(params.getKeywords());

sckw-modules/sckw-report/src/main/java/com/sckw/report/controller/KwTransportController.java

@@ -96,19 +96,6 @@ public class KwTransportController {
         }
     }
 
-    /**
-     * 根据当前登录 id获取派给当前id的车辆运单
-     *
-     * @return
-     */
-    @RequestMapping(value = "/getWaybillDriverDetail", method = RequestMethod.GET)
-    public HttpResult getWaybillDriverDetail(@RequestParam("id") Long id, @RequestParam("type") String type) {
-        try {
-            return transportService.getWaybillDriverDetail(id,type);
-        } catch (Exception e) {
-            log.error("派车给当前司机单据查询 error:{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
+
 
 }

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwTransportService.java

@@ -268,7 +268,7 @@ public class KwTransportService {
     }
 
     /**
-     * 司机端 运单详情页面
+     * 司机端 运单详情页面-【作废】
      * @param id
      * @param type
      * @return

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/DriverController.java

@@ -23,10 +23,25 @@ public class DriverController {
     @Autowired
     private DriverService driverService;
 
+    /**
+     * 根据当前登录 id获取派给当前id的车辆运单
+     *
+     * @return
+     */
+    @RequestMapping(value = "/getWaybillDriverDetail", method = RequestMethod.GET)
+    public HttpResult getWaybillDriverDetail(@RequestParam("id") Long id, @RequestParam("type") String type) {
+        try {
+            return driverService.getWaybillDriverDetail(id, type);
+        } catch (Exception e) {
+            log.error("派车给当前司机单据查询 error:{}", e.getMessage(), e);
+            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
+        }
+    }
+
     /**
      * 司机app top统计
      *
-     * @param id
+     * @param id 司机id
      * @return
      */
     @RequestMapping(value = "/statistics", method = RequestMethod.POST)

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderMapper.java

@@ -1,6 +1,7 @@
 package com.sckw.transport.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.mongo.model.TobleTop;
 import com.sckw.transport.model.KwtWaybillOrder;
 import com.sckw.transport.model.dto.OrderCarDTO;
 import org.apache.ibatis.annotations.Mapper;
@@ -25,4 +26,21 @@ public interface KwtWaybillOrderMapper extends BaseMapper<KwtWaybillOrder> {
     List<OrderCarDTO> selectWaybillOrderCarList(@Param("id") String id, @Param("page") int page, @Param("pageSize") int pageSize);
 
     Long selectWaybillOrderCarCount(@Param("id") String id);
+
+    /**
+     * 根据司机id+定义状态统计
+     *
+     * @param id
+     * @param status
+     * @return
+     */
+    TobleTop statistics(@Param("id") Long id, @Param("status") List<Long> status);
+
+    /**
+     * 根据司机id+运单状态获取物流订单id
+     * @param id
+     * @param status
+     * @return
+     */
+    List<Long> selectDriverOrder(@Param("id") Long id, @Param("status") List<Long> status);
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/DocumentParamDTO.java

@@ -20,7 +20,7 @@ public class DocumentParamDTO {
      */
     private String documentNo;
     /**
-     * 单据类型(销售订单:0;采购订单:1;承运订单:3;托运订单:4)
+     * 单据类型(销售订单:0;采购订单:1;承运订单:2;托运订单:3)
      */
     @NotBlank(message = "单据类型不能为空")
     private String documentType;

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillOrderVO.java

@@ -0,0 +1,256 @@
+package com.sckw.transport.model.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author lfdc
+ * @description 运单待接单列表vo
+ * @date 2023-07-18 13:50:57
+ */
+@Data
+public class WaybillOrderVO {
+
+    /**
+     * 主键
+     */
+    private Long wOrderId;
+
+    /**
+     * 编号
+     */
+    private String wOrderNo;
+
+    /**
+     * 主键
+     */
+    private Long lOrderId;
+
+    /**
+     * 物流订单编号
+     */
+    private String lOrderNo;
+
+    /**
+     * 交易订单id（kwo_trade_order）
+     */
+    private Long tOrderId;
+
+    /**
+     * 交易订单编号（kwo_trade_order）
+     */
+    private String tOrderNo;
+
+    /**
+     * 车队班组
+     */
+    private String truckFleetName;
+
+    /**
+     * 车牌号
+     */
+    private String truckNo;
+
+    /**
+     * 司机主键ID
+     */
+    private Long driverId;
+
+    /**
+     * 司机姓名
+     */
+    private String driverName;
+
+    /**
+     * 司机手机号码
+     */
+    private String driverPhone;
+
+    /**
+     * 司机身份证号
+     */
+    private String driverIdcard;
+
+    /**
+     * 装货日期
+     */
+    private Date loadTime;
+
+    /**
+     * 卸货日期
+     */
+    private Date unloadTime;
+
+    /**
+     * 已委托量
+     */
+    private BigDecimal entrustAmount;
+
+    /**
+     * 装货重量
+     */
+    private BigDecimal loadAmount;
+
+    /**
+     * 商品主键
+     */
+    private Integer goodsId;
+
+    /**
+     * 商品编号
+     */
+    private String goodsCode;
+
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+
+    /**
+     * 装货地址类型
+     */
+    private Long loadType;
+
+    /**
+     * 装货联系人姓名
+     */
+    private String loadContacts;
+
+    /**
+     * 装货联系电话
+     */
+    private String loadPhone;
+
+    /**
+     * 装货所在地区
+     */
+    private Integer loadCityCode;
+
+    /**
+     * 装货所属区域名称
+     */
+    private String loadCityName;
+
+    /**
+     * 装货详细地址
+     */
+    private String loadDetailAddress;
+
+    /**
+     * 装货纬度
+     */
+    private String loadLat;
+
+    /**
+     * 装货纬度
+     */
+    private String loadLng;
+
+    /**
+     * 卸货地址类型
+     */
+    private Long unloadType;
+
+    /**
+     * 卸货联系人姓名
+     */
+    private String unloadContacts;
+
+    /**
+     * 卸货联系电话
+     */
+    private String unloadPhone;
+
+    /**
+     * 卸货所在地区
+     */
+    private Integer unloadCityCode;
+
+    /**
+     * 卸货所属区域名称
+     */
+    private String unloadCityName;
+
+    /**
+     * 卸货详细地址
+     */
+    private String unloadDetailAddress;
+
+    /**
+     * 卸货纬度
+     */
+    private String unloadLat;
+
+    /**
+     * 卸货纬度
+     */
+    private String unloadLng;
+
+    /**
+     * 创建人主键id
+     */
+    private Long createBy;
+
+    /**
+     * 创建人姓名
+     */
+    private String createByName;
+
+    /**
+     * 派车时间-创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新人主键id
+     */
+    private Long updateBy;
+
+    /**
+     * 更新人姓名
+     */
+    private String updateByName;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 是否删除（0未删除，1删除）
+     */
+    private Integer delFlag;
+
+    /**
+     * 单据状态
+     */
+    private String status;
+
+    /**
+     * 循环/趟次
+     */
+    private String type;
+
+    /**
+     * 车队id
+     */
+    private String fleetId;
+    /**
+     * 车队姓名
+     */
+    private String fleetName;
+
+    /**
+     * 计划结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 计划开始时间
+     */
+    private Date startTime;
+
+
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/AcceptCarriageOrderService.java

@@ -307,6 +307,7 @@ public class AcceptCarriageOrderService {
         waybillCarDTO.setEntId(logisticsOrder.getEntId());
         waybillCarDTO.setFirmName(remoteSystemService.queryEntCacheById(logisticsOrder.getEntId()).getFirmName());
         waybillCarDTO.setTruckNo(carListDTO.getTruckNo());
+        //todo 司机dubbo查询
 //        waybillCarDTO.setTruckType();
 //        waybillCarDTO.setTruckEnergyType();
 //        waybillCarDTO.setTruckColor()

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/DriverService.java

@@ -1,13 +1,26 @@
 package com.sckw.transport.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sckw.core.common.enums.NumberConstant;
+import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.transport.dao.KwtWaybillOrderMapper;
-import com.sckw.transport.dao.KwtWaybillOrderTicketMapper;
-import com.sckw.transport.dao.KwtWaybillOrderTrackMapper;
+import com.sckw.mongo.model.TobleTop;
+import com.sckw.transport.common.enums.CarWaybillEnum;
+import com.sckw.transport.dao.*;
+import com.sckw.transport.model.KwtLogisticsOrderAddress;
+import com.sckw.transport.model.KwtLogisticsOrderGoods;
+import com.sckw.transport.model.KwtWaybillOrder;
+import com.sckw.transport.model.vo.WaybillOrderVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * @author lfdc
  * @description 司机端service
@@ -26,9 +39,20 @@ public class DriverService {
     @Autowired
     private KwtWaybillOrderTicketMapper waybillOrderTicketMapper;
 
+    @Autowired
+    private KwtLogisticsOrderMapper logisticsOrderMapper;
+
+    @Autowired
+    private KwtLogisticsOrderUnitMapper logisticsOrderUnitMapper;
+
+    @Autowired
+    private KwtLogisticsOrderAddressMapper logisticsOrderAddressMapper;
+
+    @Autowired
+    private KwtLogisticsOrderGoodsMapper logisticsOrderGoodsMapper;
+
 
     /**
-     *
      * @param id
      * @return
      */
@@ -40,6 +64,110 @@ public class DriverService {
          * 执行:对应[已出车][到达装货地点]、[已装货]、[到达卸货地点]
          * 完结: 对应[已卸货]、[已核单]
          * */
-        return null;
+        List<Long> status = new ArrayList<>();
+        List<TobleTop> list = new ArrayList<>();
+        status.add(CarWaybillEnum.PENDING_ORDER.getCode().longValue());
+        TobleTop top = waybillOrderMapper.statistics(id, status);
+        top.setName("计划");
+        top.setValue(String.valueOf(NumberConstant.ONE));
+        status.clear();
+        status.add(CarWaybillEnum.PENDING_VEHICLE.getCode().longValue());
+        TobleTop top1 = waybillOrderMapper.statistics(id, status);
+        top1.setName("出车");
+        top1.setValue(String.valueOf(NumberConstant.TWO));
+        status.clear();
+        status.add(CarWaybillEnum.EXIT_COMPLETED.getCode().longValue());
+        status.add(CarWaybillEnum.WAIT_LOADING.getCode().longValue());
+        status.add(CarWaybillEnum.COMPLETION_LOADING.getCode().longValue());
+        status.add(CarWaybillEnum.WAIT_UNLOADING.getCode().longValue());
+        TobleTop top2 = waybillOrderMapper.statistics(id, status);
+        top2.setName("执行");
+        top2.setValue(String.valueOf(NumberConstant.THREE));
+        status.clear();
+        status.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode().longValue());
+        status.add(CarWaybillEnum.APPROVAL_COMPLETED.getCode().longValue());
+        TobleTop top3 = waybillOrderMapper.statistics(id, status);
+        top3.setName("完结");
+        top3.setValue(String.valueOf(NumberConstant.FOUR));
+        list.add(top);
+        list.add(top1);
+        list.add(top2);
+        list.add(top3);
+        return HttpResult.ok(list);
+    }
+
+    /**
+     * 根据当前登录 id获取派给当前id的车辆运单
+     * @param id 司机id
+     * @param type  展示页签类型
+     * @return
+     */
+    public HttpResult getWaybillDriverDetail(Long id, String type) {
+        /**
+         * 当前司机端页面 页面【计划】=1；【出车】=2；【执行】=3；【完结】=4
+         * 计划:对应运单状态的[待接单]
+         * 出车:对应运单状态的[待出车]
+         * 执行:对应[已出车][到达装货地点]、[已装货]、[到达卸货地点]
+         * 完结: 对应[已卸货]、[已核单]
+         * */
+        HttpResult result = new HttpResult();
+        List<Long> status = new ArrayList<>();
+        if (String.valueOf(NumberConstant.ONE).equals(type)) {
+            status.add(CarWaybillEnum.PENDING_ORDER.getCode().longValue());
+        } else if (String.valueOf(NumberConstant.TWO).equals(type)) {
+            status.add(CarWaybillEnum.PENDING_VEHICLE.getCode().longValue());
+        } else if (String.valueOf(NumberConstant.THREE).equals(type)) {
+            status.add(CarWaybillEnum.EXIT_COMPLETED.getCode().longValue());
+            status.add(CarWaybillEnum.WAIT_LOADING.getCode().longValue());
+            status.add(CarWaybillEnum.COMPLETION_LOADING.getCode().longValue());
+            status.add(CarWaybillEnum.WAIT_UNLOADING.getCode().longValue());
+        } else if (String.valueOf(NumberConstant.FOUR).equals(type)) {
+            status.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode().longValue());
+            status.add(CarWaybillEnum.APPROVAL_COMPLETED.getCode().longValue());
+        } else {
+            result.setMsg("类型错误");
+            result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
+            return result;
+        }
+        List<Long> list = waybillOrderMapper.selectDriverOrder(id, status);
+        List<WaybillOrderVO> orderVOList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (Long aLong : list) {
+                KwtLogisticsOrderAddress loadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
+                        .eq(KwtLogisticsOrderAddress::getLOrderId, aLong).eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE));
+                KwtLogisticsOrderAddress unloadAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
+                        .eq(KwtLogisticsOrderAddress::getLOrderId, aLong).eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO));
+                KwtLogisticsOrderGoods orderGoods = logisticsOrderGoodsMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderGoods>()
+                        .eq(KwtLogisticsOrderGoods::getLOrderId, aLong));
+                List<KwtWaybillOrder> waybillOrders = waybillOrderMapper.selectList(new LambdaQueryWrapper<KwtWaybillOrder>()
+                        .eq(KwtWaybillOrder::getLOrderId, aLong).eq(KwtWaybillOrder::getDriverId, id));
+                for (KwtWaybillOrder waybill : waybillOrders) {
+                    WaybillOrderVO vo = new WaybillOrderVO();
+                    vo.setLOrderId(aLong);
+                    vo.setLoadCityCode(loadAddress.getCityCode());
+                    vo.setLoadCityName(loadAddress.getCityName());
+                    vo.setLoadDetailAddress(loadAddress.getDetailAddress());
+                    vo.setUnloadCityName(unloadAddress.getCityName());
+                    vo.setUnloadCityCode(unloadAddress.getCityCode());
+                    vo.setGoodsName(orderGoods == null ? null : (orderGoods.getGoodsName() == null ? null : orderGoods.getGoodsName()));
+                    vo.setGoodsCode(orderGoods == null ? null : (orderGoods.getSkuId() == null ? null : String.valueOf(orderGoods.getSkuId())));
+                    vo.setWOrderId(waybill.getId());
+                    vo.setWOrderNo(waybill.getWOrderNo());
+                    vo.setCreateTime(waybill.getCreateTime());
+                    vo.setStartTime(waybill.getStartTime());
+                    vo.setEndTime(waybill.getEndTime());
+                    //todo 查询车队服务dubbo
+//                    vo.setFleetName();
+//                    vo.setFleetId();
+//                    vo.setTruckFleetName();
+                    vo.setEntrustAmount(waybill.getEntrustAmount());
+                    vo.setType(waybill.getType());
+                    vo.setTruckNo(waybill.getTruckNo());
+                    orderVOList.add(vo);
+                }
+            }
+            orderVOList = orderVOList.stream().sorted(Comparator.comparing(WaybillOrderVO::getCreateTime)).collect(Collectors.toList());
+        }
+        return HttpResult.ok(orderVOList);
     }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/TransportCommonService.java

@@ -120,11 +120,11 @@ public class TransportCommonService {
     public HttpResult getOrderDetail(DocumentParamDTO dto) {
         HttpResult httpResult = new HttpResult();
         httpResult.setCode(HttpStatus.SUCCESS_CODE);
-        if (String.valueOf(NumberConstant.FOUR).equals(dto.getDocumentType())) {
+        if (String.valueOf(NumberConstant.THREE).equals(dto.getDocumentType())) {
             //托运订单
             OrderDetailVO orderDetailVO = getOrderData(dto);
             httpResult.setData(orderDetailVO);
-        } else if (String.valueOf(NumberConstant.THREE).equals(dto.getDocumentType())) {
+        } else if (String.valueOf(NumberConstant.TWO).equals(dto.getDocumentType())) {
             //承运订单
             OrderDetailVO orderDetailVO = getOrderData(dto);
             httpResult.setData(orderDetailVO);

sckw-modules/sckw-transport/src/main/resources/mapper/KwtWaybillOrderMapper.xml

@@ -2,29 +2,30 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sckw.transport.dao.KwtWaybillOrderMapper">
     <resultMap id="BaseResultMap" type="com.sckw.transport.model.KwtWaybillOrder">
-        <id column="id" jdbcType="BIGINT" property="id" />
-        <result column="ent_id" jdbcType="BIGINT" property="entId" />
-        <result column="l_order_id" jdbcType="BIGINT" property="lOrderId" />
-        <result column="w_order_no" jdbcType="VARCHAR" property="wOrderNo" />
-        <result column="truck_no" jdbcType="VARCHAR" property="truckNo" />
-        <result column="type" jdbcType="VARCHAR" property="type" />
-        <result column="driver_id" jdbcType="BIGINT" property="driverId" />
-        <result column="entrust_amount" jdbcType="DECIMAL" property="entrustAmount" />
-        <result column="unload_amount" jdbcType="DECIMAL" property="unloadAmount" />
-        <result column="load_amount" jdbcType="DECIMAL" property="loadAmount" />
-        <result column="deficit_amount" jdbcType="DECIMAL" property="deficitAmount" />
-        <result column="remark" jdbcType="VARCHAR" property="remark" />
-        <result column="status" jdbcType="INTEGER" property="status" />
-        <result column="create_by" jdbcType="BIGINT" property="createBy" />
-        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-        <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
-        <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
-        <result column="update_by" jdbcType="BIGINT" property="updateBy" />
-        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-        <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="ent_id" jdbcType="BIGINT" property="entId"/>
+        <result column="l_order_id" jdbcType="BIGINT" property="lOrderId"/>
+        <result column="w_order_no" jdbcType="VARCHAR" property="wOrderNo"/>
+        <result column="truck_no" jdbcType="VARCHAR" property="truckNo"/>
+        <result column="type" jdbcType="VARCHAR" property="type"/>
+        <result column="driver_id" jdbcType="BIGINT" property="driverId"/>
+        <result column="entrust_amount" jdbcType="DECIMAL" property="entrustAmount"/>
+        <result column="unload_amount" jdbcType="DECIMAL" property="unloadAmount"/>
+        <result column="load_amount" jdbcType="DECIMAL" property="loadAmount"/>
+        <result column="deficit_amount" jdbcType="DECIMAL" property="deficitAmount"/>
+        <result column="remark" jdbcType="VARCHAR" property="remark"/>
+        <result column="status" jdbcType="INTEGER" property="status"/>
+        <result column="create_by" jdbcType="BIGINT" property="createBy"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="start_time" jdbcType="TIMESTAMP" property="startTime"/>
+        <result column="end_time" jdbcType="TIMESTAMP" property="endTime"/>
+        <result column="update_by" jdbcType="BIGINT" property="updateBy"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="del_flag" jdbcType="INTEGER" property="delFlag"/>
     </resultMap>
     <sql id="Base_Column_List">
-        id, ent_id, l_order_id, w_order_no, truck_no, driver_id, entrust_amount, unload_amount,
+        id
+        , ent_id, l_order_id, w_order_no, truck_no, driver_id, entrust_amount, unload_amount,
     load_amount, deficit_amount, remark, `status`, create_by, create_time, update_by,
     update_time, del_flag,start_time,end_time
     </sql>
@@ -39,8 +40,8 @@
                  LEFT JOIN kwt_logistics_order b ON a.l_order_id = b.id
         WHERE a.del_flag = '0'
           and b.del_flag = '0'
-          and b.t_order_id = #{id,jdbcType=VARCHAR}
-        limit #{page},#{pageSize}
+          and b.t_order_id = #{id,jdbcType=VARCHAR} limit #{page}
+            , #{pageSize}
     </select>
     <select id="selectWaybillOrderCarCount" resultType="java.lang.Long">
         SELECT count(a.id)
@@ -50,4 +51,41 @@
           and b.del_flag = '0'
           and b.t_order_id = #{id,jdbcType=VARCHAR}
     </select>
+    <select id="statistics" resultType="com.sckw.mongo.model.TobleTop">
+        SELECT count(a.id) AS total
+        FROM kwt_waybill_order a
+        LEFT JOIN kwt_waybill_order_track b ON a.id = b.w_order_id
+        AND a.del_flag = '0'
+        AND b.del_flag = '0'
+        <where>
+            <if test="id != null and id !=''">
+                a.driver_id = #{id,jdbcType=BIGINT}
+            </if>
+            <if test="status != null and status.size() > 0">
+                AND b.`status` IN
+                <foreach collection="status" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+    <select id="selectDriverOrder" resultType="java.lang.Long">
+        SELECT a.l_order_id as lOrderId
+        FROM kwt_waybill_order a
+        LEFT JOIN kwt_waybill_order_track b ON a.id = b.w_order_id
+        AND a.del_flag = '0'
+        AND b.del_flag = '0'
+        <where>
+            <if test="id != null and id !=''">
+                a.driver_id = #{id,jdbcType=BIGINT}
+            </if>
+            <if test="status != null and status.size() > 0">
+                AND b.`status` IN
+                <foreach collection="status" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        group by lOrderId
+    </select>
 </mapper>