diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java index 0636f603f..367ef0877 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java @@ -183,13 +183,11 @@ public interface OrderMapper extends BaseMapperX { * @param orderDate * @param organId * @param page - * @param orderIds 父级订单数组 * @return */ IPage selectOrderNear(@Param("orderDate") LocalDate orderDate, @Param("organId") Long organId, - @Param("page") IPage page, - @Param("orderIds") Long... orderIds); + @Param("page") IPage page); /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index 64ddc1f8e..bfc341382 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java @@ -881,30 +881,11 @@ public class OrderServiceImpl implements OrderService { IPage orderNearVOS = orderMapper.selectOrderNear(tomorrow, organId, page); List records = orderNearVOS.getRecords(); - // 查询子单 if (CollUtil.isNotEmpty(records)) { - // 主单id列表 - Long[] mainOrderIds = records.stream().map(OrderOverdueRespVO::getId).toArray(Long[]::new); - PageDTO childPage = new PageDTO<>(pageParam.getPageNo(), PageParam.PAGE_SIZE_NONE); - IPage childOrderNearVOS = orderMapper.selectOrderNear(tomorrow, organId, childPage, mainOrderIds); - - List childList = childOrderNearVOS.getRecords(); - - if (CollUtil.isNotEmpty(childList)) { - // 按 parentId 分组 - Map> childMap = childList.stream() - .collect(Collectors.groupingBy(OrderOverdueRespVO::getParentId)); - - // 回填 child - for (OrderOverdueRespVO order : records) { - order.setChild(childMap.getOrDefault(order.getId(), null)); - } - } return new PageResult<>(records, orderNearVOS.getTotal()); - } - return new PageResult<>(records, orderNearVOS.getTotal()); + return PageResult.empty(); } @Override diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml index 6bed5df66..34762a761 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml @@ -299,17 +299,6 @@ and o.deleted = 0 and o.status != 4 and o.delivery_date = #{orderDate} - - - AND parent_id IN - - #{orderId} - - - - AND parent_id = 0 - -