1、司机、车辆数据统计调整；

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

@@ -1597,11 +1597,11 @@ public class KwtWaybillOrderService {
         ticket.setOperateTime(params.getOperateTime());
         waybillOrderTicketDao.insert(ticket);
 
-        /**5跟新司机/车辆数据
+        /**5跟新司机/车辆数据**/
          //更新司机信息
          editDriver(waybillOrder.getDriverId());
          //更新车辆信息
-         editTruck(waybillOrder.getTruckId());**/
+         editTruck(waybillOrder.getTruckId());
 
         /**6更新承运订单entrustAmount
          KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(waybillOrder.getLOrderId());
@@ -1724,11 +1724,11 @@ public class KwtWaybillOrderService {
             editSckwWaybillOrder(wOrder, null, 3);
         }
 
-        /**6跟新司机/车辆数据
+        /**6跟新司机/车辆数据**/
          //更新司机信息
          editDriver(waybillOrder.getDriverId());
          //更新车辆信息
-         editTruck(waybillOrder.getTruckId());**/
+         editTruck(waybillOrder.getTruckId());
 
         /**7更新承运订单entrustAmount
          //更新卸货量/卸货时间/亏吨/亏吨扣款

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

@@ -155,7 +155,7 @@
         SELECT
         count(case when wo.status = 8 then 1 end) totalComplete,
         count(case when wo.status not in (1, 9, 10, 11) then 1 end) totalTake,
-        count(case when wo.status not in (3, 4, 5, 6) then 1 end) totalExecute,
+        count(case when wo.status in (3, 4, 5, 6) then 1 end) totalExecute,
         count(DISTINCT case when lo.status in (0, 1, 2, 3) then lo.id end) totalUnfinished,
         IFNULL(SUM(wo.entrust_amount), 0.0) entrustAmount, IFNULL(SUM(wo.load_amount), 0.0) loadAmount,
         IFNULL(SUM(wo.unload_amount), 0.0) unloadAmount, IFNULL(SUM(wo.deficit_amount), 0.0) deficitAmount,