派车量bugfix

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

@@ -4,7 +4,6 @@ import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.sckw.core.common.enums.NumberConstant;
-import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.Global;
@@ -41,7 +40,6 @@ import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.stream.function.StreamBridge;
 import org.springframework.stereotype.Service;
@@ -2408,12 +2406,12 @@ public class KwtWaybillOrderService {
         Map<String, Map> map = new HashMap(NumberConstant.SIXTEEN);
         //无效的车辆运单状态(其他状态不参与统计中)
         List<Long> statusList = new ArrayList<>();
-        statusList.add(CarWaybillEnum.PENDING_ORDER.getCode().longValue());
-        statusList.add(CarWaybillEnum.PENDING_VEHICLE.getCode().longValue());
+//        statusList.add(CarWaybillEnum.PENDING_ORDER.getCode().longValue());
+//        statusList.add(CarWaybillEnum.PENDING_VEHICLE.getCode().longValue());
         statusList.add(CarWaybillEnum.REJECT_ORDER.getCode().longValue());
         statusList.add(CarWaybillEnum.REFUSE_TRAFFIC.getCode().longValue());
         statusList.add(CarWaybillEnum.REVOKED.getCode().longValue());
-        statusList.add(CarWaybillEnum.APPROVAL_NO_PASS.getCode().longValue());
+//        statusList.add(CarWaybillEnum.APPROVAL_NO_PASS.getCode().longValue());
         //趟次
         Map<String, Object> tripMap = waybillOrderDao.selectOrderByOrderId(Long.parseLong(orderId), 1, statusList);
         tripMap.put("waitDistributionAmount", waitDistributionAmount);

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

@@ -449,7 +449,7 @@
     </select>
 
     <select id="selectOrderByOrderId" resultType="java.util.Map">
-        SELECT COUNT(id) total,SUM(IFNULL(entrust_amount,0)) AS amount
+        SELECT COUNT(id) total,IFNULL(SUM(entrust_amount),0) AS amount
         FROM
         kwt_waybill_order
         WHERE