1、4.2接口调整；

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

@@ -138,7 +138,7 @@ public class KwtLogisticsConsignmentController {
     public HttpResult purchaseLogisticsCar(@Valid @RequestBody OrderQuery orderQuery) {
         log.info("采购订单-车辆详情 传递参数信息:{}", JSONObject.toJSONString(orderQuery));
         try {
-            return HttpResult.ok(logisticsConsignmentService.purchaseLogisticsCar(orderQuery.getIds(), orderQuery.getPage(), orderQuery.getPageSize()));
+            return HttpResult.ok(logisticsConsignmentService.sellLogisticsCar(orderQuery.getIds(), orderQuery.getPage(), orderQuery.getPageSize()));
         } catch (Exception e) {
             log.error("采购订单-车辆详情 error :{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());

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

@@ -71,7 +71,6 @@ public class KwtWaybillOrderController {
      **/
     @PostMapping("/select")
     public HttpResult findListPage(@RequestBody WaybillOrderQueryDto params) throws SystemException {
-        params.setEntId(LoginUserHolder.getEntId());
         // 设置分页参数
         PageHelper.startPage(params.getPage(), params.getPageSize());
         List<WaybillOrderSelectVo> list = waybillOrderV1Service.findListPage(params);

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

@@ -3,6 +3,7 @@ package com.sckw.transport.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.core.model.vo.TableTop;
 import com.sckw.transport.model.KwtWaybillOrderV1;
+import com.sckw.transport.model.dto.OrderCarDTO;
 import com.sckw.transport.model.dto.WaybillOrderQueryDto;
 import com.sckw.transport.model.dto.WaybillSubtaskOrderQueryDto;
 import com.sckw.transport.model.vo.WaybillCountVo;
@@ -91,4 +92,11 @@ public interface KwtWaybillOrderV1Mapper extends BaseMapper<KwtWaybillOrderV1> {
      * @return 统计信息
      */
     WaybillCountVo findTicketCountByAddress(Map<String, Object> params);
+
+    /**
+     * 易订单id查找相关联车辆信息
+     * @param params {tOrderIds 贸易订单ID, page , pageSize}
+     * @return 车辆信息
+     */
+    List<OrderCarDTO> selectWaybillOrderCarPage(Map<String, Object> params);
 }

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

@@ -156,7 +156,7 @@ public class LogisticsConsignmentDto implements Serializable {
     /**
      * 扣亏损值单位
      */
-    @NotBlank(message = "扣亏损值单位不能为空")
+    //@NotBlank(message = "扣亏损值单位不能为空")
     private String goodsPriceUnit;
 
     /**
@@ -199,7 +199,7 @@ public class LogisticsConsignmentDto implements Serializable {
      */
     @Digits(integer = 10, fraction = 2, message = "订单总量格式不正确")
     @DecimalMin(value = "0.00", message = "订单总量不能小于{value}")
-    private BigDecimal amount;
+    private BigDecimal carryingCapacity;
 
     /**
      * 开始时间
@@ -227,7 +227,8 @@ public class LogisticsConsignmentDto implements Serializable {
      * 合同信息
      */
     @NotNull(message = "合同信息不能为空")
-    private List<ContractDto> contractInfo;
+    //private List<ContractDto> contractInfo;
+    private Long contractId;
 
     /**
      * 地址信息

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

@@ -96,8 +96,17 @@ public class WaybillOrderQueryDto extends PageRequest{
     @JsonProperty("status")
     @NotNull(message = "订单状态不能为空")
     private Integer status;
+
+    /**
+     * 界面状态匹配实际业务状态
+     */
     private String queryWstatus;
 
+    /**
+     * 用户ID
+     */
+    private List<Long> userIds;
+
     public void setLoadCityCodeLevel(Integer loadCityCodeLevel) {
         this.loadCityCodeLevel = loadCityCodeLevel != null && loadCityCodeLevel == 3 ? 0 : loadCityCodeLevel == 2 ? 4 : 2;
     }

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

@@ -18,6 +18,7 @@ import com.sckw.core.model.enums.CarWaybillEnum;
 import com.sckw.core.model.enums.LogisticsOrderEnum;
 import com.sckw.core.model.enums.OrderRuleEnum;
 import com.sckw.core.model.enums.RedisOrderGenerateEnum;
+import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageRes;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.*;
@@ -139,6 +140,9 @@ public class KwtLogisticsConsignmentService {
     @Autowired
     public KwtWaybillOrderMapper waybillOrderMapper;
 
+    @Autowired
+    public KwtWaybillOrderV1Mapper waybillOrderV1Mapper;
+
     /**
      * 采购订单-物流托运生成托运订单
      *
@@ -999,64 +1003,6 @@ public class KwtLogisticsConsignmentService {
         return list;
     }
 
-//    /**
-//     * 采购订单获取车辆信息
-//     *
-//     * @param id
-//     * @param page
-//     * @param pageSize
-//     * @return
-//     */
-//    public HttpResult purchaseLogisticsCar(String id, Integer page, Integer pageSize) {
-//        Long count = getLogisticsCarDataCount(id);
-//        Integer newPage = page - 1;
-//        List<OrderCarDTO> list = getLogisticsCarData(id, newPage, pageSize);
-//        PageResult build = PageResult.build(page, pageSize, count, list);
-//        return HttpResult.ok(build);
-//    }
-
-
-    /**
-     * 采购订单获取车辆信息
-     *
-     * @param ids      订单ids
-     * @param page     当前页
-     * @param pageSize 每页条数
-     * @return 车辆运单数据
-     */
-    public PageRes<OrderCarDTO> purchaseLogisticsCar(String ids, Integer page, Integer pageSize) {
-        PageHelper.startPage(page, pageSize);
-        List<String> stringList = StringUtils.splitStrToList(ids, String.class);
-        if (CollectionUtils.isEmpty(stringList)) {
-            PageRes<OrderCarDTO> pageRes = new PageRes<>();
-            pageRes.setPages(page);
-            pageRes.setPageSize(pageSize);
-            return pageRes;
-        }
-        List<Long> idsList = StringUtils.splitStrToList(ids, Long.class);
-        List<OrderCarDTO> orderCarList = waybillOrderMapper.selectWaybillOrderCarListByTradeOrderId(idsList);
-        PageInfo<OrderCarDTO> info = new PageInfo<>(orderCarList);
-        if (CollectionUtils.isEmpty(orderCarList)) {
-            PageRes<OrderCarDTO> pageRes = new PageRes<>();
-            pageRes.setPage(page);
-            pageRes.setPageSize(pageSize);
-            return pageRes;
-        }
-        List<String> collected = orderCarList.stream().map(OrderCarDTO::getTruckNo).distinct().collect(Collectors.toList());
-        for (OrderCarDTO orderCarDTO : orderCarList) {
-            if (CollectionUtils.isNotEmpty(collected)) {
-                Map<String, RTruckVo> truck = remoteFleetService.findTruck(collected);
-                orderCarDTO.setStatusLabel(CarWaybillEnum.getName(orderCarDTO.getStatus()));
-                orderCarDTO.setLoadAmount(truck.get(orderCarDTO.getTruckNo()) == null ?
-                        null : (truck.get(orderCarDTO.getTruckNo()).getActualWeight() == null ?
-                        null : (String.valueOf(truck.get(orderCarDTO.getTruckNo()).getActualWeight()))));
-            }
-        }
-        List<OrderCarDTO> returnList = new ArrayList<>();
-        returnList.addAll(orderCarList);
-        return PageRes.build(info, returnList);
-    }
-
     /**
      * 销售订单-车辆列表-销售订单id
      *
@@ -1066,34 +1012,29 @@ public class KwtLogisticsConsignmentService {
      * @return
      */
     public HttpResult sellLogisticsCar(String ids, Integer page, Integer pageSize) {
-        List<String> stringList = StringUtils.splitStrToList(ids, String.class);
+        List<Long> stringList = StringUtils.splitStrToList(ids, Long.class);
         if (CollectionUtils.isEmpty(stringList)) {
             return HttpResult.ok();
         }
-        List<OrderCarDTO> returnList = new ArrayList<>();
-        stringList = stringList.stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList());
-        for (String id : stringList) {
-            List<OrderCarDTO> list = waybillOrderMapper.selectWaybillOrderCarListNotPage(id);
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("tOrderIds", stringList);
+        params.put("page", page);
+        params.put("pageSize", pageSize);
+        PageHelper.startPage(PageResult.getPage(params), PageResult.getPageSize(params));
+        List<OrderCarDTO> list = waybillOrderV1Mapper.selectWaybillOrderCarPage(params);
+        if (CollectionUtils.isNotEmpty(list)) {
             List<String> collect = list.stream().map(OrderCarDTO::getTruckNo).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(collect)) {
-                Map<String, RTruckVo> truck = remoteFleetService.findTruck(collect);
-                for (OrderCarDTO orderCarDTO : list) {
-                    orderCarDTO.setStatusLabel(CarWaybillEnum.getName(orderCarDTO.getStatus()));
-                    orderCarDTO.setLoadAmount(truck.get(orderCarDTO.getTruckNo()) == null ?
-                            null : (truck.get(orderCarDTO.getTruckNo()).getActualWeight() == null ?
-                            null : (String.valueOf(truck.get(orderCarDTO.getTruckNo()).getActualWeight()))));
-                }
-            }
-            if (CollectionUtils.isNotEmpty(list)) {
-                returnList.addAll(list);
+            Map<String, RTruckVo> truck = remoteFleetService.findTruck(collect);
+            for (OrderCarDTO orderCarDTO:list) {
+                orderCarDTO.setStatusLabel(CarWaybillEnum.getName(orderCarDTO.getStatus()));
+                orderCarDTO.setLoadAmount(truck.get(orderCarDTO.getTruckNo()) == null ?
+                        null : (truck.get(orderCarDTO.getTruckNo()).getActualWeight() == null ?
+                        null : (String.valueOf(truck.get(orderCarDTO.getTruckNo()).getActualWeight()))));
             }
         }
-        List<OrderCarDTO> subList = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(returnList)) {
-            subList = returnList.stream().skip((page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-        }
-        PageResult build = PageResult.build(page, pageSize, returnList.stream().count(), subList);
-        return HttpResult.ok(build);
+        PageResult pageResult = PageHelperUtil.getPageResult(new PageInfo<>(list));
+        return HttpResult.ok(pageResult);
     }
 
     private Long getLogisticsCarDataCount(String id) {

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

@@ -162,7 +162,7 @@ public class KwtLogisticsOrderConsignmentService {
         KwtLogisticsOrder order = new KwtLogisticsOrder();
         if (!dto.getIsFullDose()) {
             //BigDecimal amount = tradeOrder.getAmount().subtract(tradeOrder.getEntrustAmount());
-            BigDecimal amount = dto.getAmount();
+            BigDecimal amount = dto.getCarryingCapacity();
             if (amount.compareTo(NumberConstant.ZERO_TWO) == 0) {
                 log.error("可分配量分配错误:{}", dto.getTOrderId());
                 throw new BusinessException("可分配量分配必须填写大于0");
@@ -173,10 +173,10 @@ public class KwtLogisticsOrderConsignmentService {
                 log.error("可分配量分配错误:{}", dto.getTOrderId());
                 throw new BusinessException("可分配量分配错误");
             }
-            if (ArrayUtil.isEmpty(dto.getAmount())) {
+            if (ArrayUtil.isEmpty(dto.getCarryingCapacity())) {
                 throw new BusinessException("不是全量分配时,分配量不能为空!");
             }
-            order.setAmount(dto.getAmount());
+            order.setAmount(dto.getCarryingCapacity());
         } else {
             order.setAmount(NumberConstant.ZERO_TWO);
             order.setSubcontractAmount(NumberConstant.ZERO_TWO);
@@ -185,8 +185,8 @@ public class KwtLogisticsOrderConsignmentService {
         checkBillingMode(dto);
         Long orderId = new IdWorker(NumberConstant.ONE).nextId();
         order.setId(orderId);
-        List<ContractDto> contractInfo = dto.getContractInfo();
-        long contractId = contractInfo.get(0).getContractId();
+        //List<ContractDto> contractInfo = dto.getContractInfo();
+        long contractId = dto.getContractId();
         List<Long> contractList = new ArrayList<>();
         contractList.add(contractId);
         Map<Long, ContractCommonInfoResDto> longContractCommonInfoResDtoMap = contractService.queryContractBaseInfo(contractList);
@@ -317,12 +317,12 @@ public class KwtLogisticsOrderConsignmentService {
                 null : Long.parseLong(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getPriceType()).getValue()));
 
         if (!bo.getIsFullDose()) {
-            if (ArrayUtil.isEmpty(bo.getAmount())) {
+            if (ArrayUtil.isEmpty(bo.getCarryingCapacity())) {
                 throw new RuntimeException("不是全量分配时,分配量不能为空!");
             }
-            logisticsOrder.setAmount(bo.getAmount());
+            logisticsOrder.setAmount(bo.getCarryingCapacity());
             logisticsOrder.setUnit(bo.getCarryingCapacityUnit());
-            logisticsOrder.setCarryingCapacity(bo.getAmount());
+            logisticsOrder.setCarryingCapacity(bo.getCarryingCapacity());
         } else {
             logisticsOrder.setAmount(NumberConstant.ZERO_TWO);
             logisticsOrder.setSubcontractAmount(NumberConstant.ZERO_TWO);
@@ -347,9 +347,9 @@ public class KwtLogisticsOrderConsignmentService {
         KwpGoods goods = goodsInfoService.getGoodsById(bo.getGoodsId());
         logisticsOrder.setGoodsType(goods == null ? null : goods.getGoodsType());
         logisticsOrder.setGoodsSpec(goods == null ? null : goods.getSpec());
-        List<ContractDto> contractInfo = bo.getContractInfo();
-        contractInfo.forEach(contract -> {
-            Long contractId = contract.getContractId();
+        //List<ContractDto> contractInfo = bo.getContractInfo();
+        //contractInfo.forEach(contract -> {
+            Long contractId = bo.getContractId();
             Map<Long, ContractCommonInfoResDto> longContractCommonInfoResDtoMap = contractService.queryContractBaseInfo(Collections.singletonList(contractId));
             if (longContractCommonInfoResDtoMap != null && (longContractCommonInfoResDtoMap.get(contractId) != null)) {
                 String contractCode = longContractCommonInfoResDtoMap.get(contractId).getContractCode();
@@ -360,7 +360,7 @@ public class KwtLogisticsOrderConsignmentService {
                 logisticsOrder.setContractName(contactName);
                 logisticsOrder.setContractSigningWay(String.valueOf(signingWay));
             }
-        });
+        //});
         logisticsOrder.setCheckEntId(Long.parseLong(bo.getCheckCompanyId()));
         logisticsOrder.setCheckFirmName(bo.getCheckCompany());
         logisticsOrder.setCheckContacts(bo.getCheckContacts());
@@ -720,9 +720,9 @@ public class KwtLogisticsOrderConsignmentService {
     }
 
     private void saveLogisticsOrderContract(LogisticsConsignmentDto dto, Long orderId) {
-        List<ContractDto> contractInfo = dto.getContractInfo();
-        contractInfo.forEach(contract -> {
-            Long contractId = contract.getContractId();
+        //List<ContractDto> contractInfo = dto.getContractInfo();
+        //contractInfo.forEach(contract -> {
+            Long contractId = dto.getContractId();
             Map<Long, ContractCommonInfoResDto> longContractCommonInfoResDtoMap = contractService.queryContractBaseInfo(Collections.singletonList(contractId));
             if (longContractCommonInfoResDtoMap != null && (longContractCommonInfoResDtoMap.get(contractId) != null)) {
                 String contractCode = longContractCommonInfoResDtoMap.get(contractId).getContractCode();
@@ -742,7 +742,7 @@ public class KwtLogisticsOrderConsignmentService {
                 kwtLogisticsOrderContract.setUpdateTime(new Date());
                 logisticsOrderContractMapper.insert(kwtLogisticsOrderContract);
             }
-        });
+        //});
     }
 
     private void saveLogisticsOrder(LogisticsConsignmentDto bo, String lOrderNo, KwtLogisticsOrder order, OrderDetailRes tradeOrder, Long orderId, Integer orderStatus) {

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

@@ -444,7 +444,7 @@ public class KwtLogisticsOrderGoodsService {
     public boolean chenkLogisticsAmount(LogisticsConsignmentDto logisticsOrder, OrderDetailRes tradeOrder) {
         List<GoodsUnitParam> assistUnit = logisticsOrder.getAssistUnit();
         BigDecimal amount = tradeOrder.getAmount().subtract(tradeOrder.getEntrustAmount());
-        BigDecimal arryingCapacity = logisticsOrder.getAmount();
+        BigDecimal arryingCapacity = logisticsOrder.getCarryingCapacity();
         String unit = tradeOrder.getUnit();
         if (logisticsOrder.getCarryingCapacityUnit().equals(unit)) {
             if (amount.compareTo(arryingCapacity) >= 0) {

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

@@ -120,6 +120,10 @@ public class KwtWaybillOrderV1Service {
      * @date 2024/3/8
      **/
     public List<TableTop> statistics(WaybillOrderQueryDto params){
+        // 运单创建人或有关授权用户
+        List<Long> userIds = LoginUserHolder.getAuthUserIdList();
+        params.setUserIds(userIds);
+        params.setEntId(LoginUserHolder.getEntId());
         //统计信息
         List<TableTop> tableTops = waybillOrderV1Dao.statistics(params);
 
@@ -154,7 +158,11 @@ public class KwtWaybillOrderV1Service {
      * @date 2024/3/8
      **/
     public List<WaybillOrderSelectVo> findListPage(WaybillOrderQueryDto params){
+        // 运单创建人或有关授权用户
+        List<Long> userIds = LoginUserHolder.getAuthUserIdList();
+        params.setUserIds(userIds);
         params.setQueryWstatus(CarWaybillTableTopEnum.getValue(params.getStatus()));
+        params.setEntId(LoginUserHolder.getEntId());
         List<WaybillOrderSelectVo> list = waybillOrderV1Dao.findListPage(params);
         if (CollectionUtils.isEmpty(list)) {
             return list;
@@ -179,14 +187,17 @@ public class KwtWaybillOrderV1Service {
      * @date 2024/3/8
      **/
     public PageResult findNdexPage(WaybillOrderQueryDto params){
+        // 运单创建人或有关授权用户
+        List<Long> userIds = LoginUserHolder.getAuthUserIdList();
+        params.setUserIds(userIds);
         params.setEntId(LoginUserHolder.getEntId());
+        params.setQueryWstatus(CarWaybillTableTopEnum.getValue(params.getStatus()));
         // 设置分页参数
         PageHelper.startPage(params.getPage(), params.getPageSize());
-        params.setQueryWstatus(CarWaybillTableTopEnum.getValue(params.getStatus()));
         List<WaybillOrderSelectVo> list = waybillOrderV1Dao.findListPage(params);
 
         //用户ID
-        List<Long> userIds = list.stream().map(WaybillOrderSelectVo::getCreateBy).toList();
+        userIds = list.stream().map(WaybillOrderSelectVo::getCreateBy).toList();
         List<UserCacheResDto> users = remoteSystemService.queryUserCacheByIds(userIds);
         Map<Long, UserCacheResDto> usersMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         users.forEach(e -> usersMap.put(e.getId(), e));
@@ -2284,9 +2295,6 @@ public class KwtWaybillOrderV1Service {
         Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(List.of(DictTypeEnum.UNIT_TYPE.getType()));
         Map<String, String> unitMap = CollectionUtils.isNotEmpty(dict) ? dict.get(DictTypeEnum.UNIT_TYPE.getType()) : new HashMap<>(NumberConstant.SIXTEEN);
 
-
-
-
         /*数据处理*/
         List<Map<String, Object>> addressList = new ArrayList<>();
         List<Integer> typeList = new ArrayList<>(){{add(AddressDefaultTypeEnum.SHIPMENT.getCode()); add(AddressDefaultTypeEnum.TAKE.getCode());}};
@@ -2302,7 +2310,6 @@ public class KwtWaybillOrderV1Service {
                 KwtWaybillOrderTicket ticket = waybillOrderTicketDao.findWaybillOrderTicketV2(address.getId(), subtask.getUnit());
                 //辅助单位
                 List<WaybillOrderLoadingVO> loading = waybillOrderTicketService.agreementV1(subtask, address.getId());
-
                 Map<String, Object> trackData = new HashMap<>(NumberConstant.SIXTEEN);
                 trackData.put("wTicketId", ticket != null ? ticket.getId() : null);
                 trackData.put("wOrderId", ticket != null ? ticket.getWOrderId() : null);
@@ -2330,6 +2337,7 @@ public class KwtWaybillOrderV1Service {
             }
         }
 
+        //数据组装
         Map<String, Object> result = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         result.put("wOrderId", wOrderId);
         result.put("wOrderNo", waybillOrder.getWOrderNo());
@@ -2384,6 +2392,7 @@ public class KwtWaybillOrderV1Service {
         //辅助单位
         List<GoodsUnitVo> assistUnit = kwtLogisticsOrderGoodsService.assistUnit(subtask.getLOrderId());
 
+        //数据组装
         Map<String, Object> result = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         result.put("wOrderId", wOrderId);
         result.put("wOrderNo", waybillOrder.getWOrderNo());
@@ -2502,6 +2511,7 @@ public class KwtWaybillOrderV1Service {
             }
         }
 
+        //数据组装
         Map<String, Object> result = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         result.put("wOrderId", wOrderId);
         result.put("wOrderNo", waybillOrder.getWOrderNo());
@@ -2529,6 +2539,7 @@ public class KwtWaybillOrderV1Service {
             return HttpResult.error("车辆运单不存在！");
         }
 
+        //数据组装
         Map<String, Object> result = new HashMap<>(NumberConstant.SIXTEEN);
         result.put("id", wOrderId);
         result.put("wOrderId", wOrderId);
@@ -2536,7 +2547,6 @@ public class KwtWaybillOrderV1Service {
         result.put("statusName", CarWaybillEnum.getName(waybillOrder.getStatus()));
         result.put("truckNo", waybillOrder.getTruckNo());
         result.put("truckId", waybillOrder.getTruckId());
-
         result.put("driverId", waybillOrder.getDriverId());
         result.put("driverPhone", waybillOrder.getDriverPhone());
         result.put("driverIdcard", waybillOrder.getDriverIdcard());
@@ -2665,9 +2675,7 @@ public class KwtWaybillOrderV1Service {
         if (StringUtils.isBlank(type) || StringUtils.isBlank(value)) {
             return null;
         }
-        List<String> dictKey = new ArrayList<>() {{
-            add(type + Global.POUND + value);
-        }};
+        List<String> dictKey = new ArrayList<>() {{ add(type + Global.POUND + value); }};
         Map<String, SysDictResDto> dicts = remoteSystemService.queryDictMapByTypeValues(String.join(Global.COMMA, dictKey));
         SysDictResDto dict = dicts == null ? null : dicts.get(DictTypeEnum.APPROVED_DRIVING.getType() + Global.POUND + value);
         return dict != null ? dict.getLabel() : null;

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

@@ -12,6 +12,12 @@
         <if test="entId != null and entId != ''">
             and wo.ent_id = #{entId, jdbcType=VARCHAR}
         </if>
+        <if test="userIds != null and userIds.size() > 0">
+            and wo.create_by IN
+            <foreach collection="userIds" open="(" close=")" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="(loadCityCode != null and loadCityCode != '') or (unloadCityCode != null and unloadCityCode != '')">
             and wo.id in (
             SELECT w_order_id from kwt_waybill_order_address where del_flag = 0
@@ -70,6 +76,12 @@
         <if test="entId != null and entId != ''">
             and wo.ent_id = #{entId, jdbcType=VARCHAR}
         </if>
+        <if test="userIds != null and userIds.size() > 0">
+            and wo.create_by IN
+            <foreach collection="userIds" open="(" close=")" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="queryWstatus != null and queryWstatus != ''">
             and wo.status in (#{queryWstatus, jdbcType=VARCHAR})
         </if>
@@ -277,4 +289,30 @@
         </if>
     </select>
 
+    <select id="selectWaybillOrderCarPage" parameterType="java.util.Map" resultType="com.sckw.transport.model.dto.OrderCarDTO">
+        SELECT
+        kwo.id as wOrderId,
+        kwo.w_order_no    as wOrderNo,
+        kwo.driver_id     as driverId,
+        kwo.driver_name   as driverName,
+        kwo.driver_phone  as driverPhone,
+        kwo.driver_idcard as driverCard,
+        kwo.truck_no      as truckNo,
+        kwo.status        as status,
+        kwos.l_order_id    as lOrderId,
+        klo.l_order_no    as lOrderNo,
+        klo.t_order_id    as tOrderId,
+        klo.t_order_no    as tOrderNo
+        FROM kwt_waybill_order kwo
+        left join kwt_waybill_order_subtask kwos on kwos.w_order_id = kwo.id
+        LEFT JOIN kwt_logistics_order klo ON kwos.l_order_id = klo.id
+        WHERE kwo.del_flag = 0 and kwos.del_flag = 0 and klo.del_flag = 0
+        <if test="tOrderIds != null and tOrderIds.size() > 0">
+            and klo.t_order_id in
+            <foreach collection="tOrderIds" item="item" close=")" open="(" separator=",">
+                #{item,jdbcType=BIGINT}
+            </foreach>
+        </if>
+    </select>
+
 </mapper>