更新代码

seatonwan9

2025-08-28 40616c5802932c2216e97a44ec9abed182590bbe

更新代码

 src/main/java/com/webmanage/service/OrderInfoService.java

@@ -38,7 +38,7 @@
    /**
     * 分页查询待审批订单列表
     */
    PageResult<OrderInfo> getPendingApprovalOrderPage(OrderQueryDTO queryDTO);
    PageResult<OrderDetailVO> getPendingApprovalOrderPage(OrderQueryDTO queryDTO);

    /**
     * 分页查询待审批订单列表（支持产品条件）

 src/main/java/com/webmanage/service/impl/OrderInfoServiceImpl.java

@@ -162,7 +162,7 @@
    }

    @Override
    public PageResult<OrderInfo> getPendingApprovalOrderPage(OrderQueryDTO queryDTO) {
    public PageResult<OrderDetailVO> getPendingApprovalOrderPage(OrderQueryDTO queryDTO) {
        // 创建分页对象
        Page<OrderInfo> page = new Page<>(queryDTO.getPageNum(), queryDTO.getPageSize());

@@ -175,9 +175,23 @@
            queryDTO.getOrderBy(), queryDTO.getOrderDirection()
        );

        // 将订单与详情联表封装到VO
        List<OrderDetailVO> voList = result.getRecords().stream().map(order -> {
            OrderDetailVO vo = new OrderDetailVO();
            BeanUtils.copyProperties(order, vo);
            List<OrderDetail> details = orderDetailMapper.selectByOrderId(order.getOrderId());
            List<OrderDetailItemVO> items = details.stream().map(d -> {
                OrderDetailItemVO item = new OrderDetailItemVO();
                BeanUtils.copyProperties(d, item);
                return item;
            }).collect(java.util.stream.Collectors.toList());
            vo.setOrderDetails(items);
            return vo;
        }).collect(java.util.stream.Collectors.toList());

        // 构建返回结果
        return new PageResult<OrderInfo>(
            result.getRecords(),
        return new PageResult<OrderDetailVO>(
                voList,
            result.getTotal(),
            queryDTO.getPageNum().longValue(),
            queryDTO.getPageSize().longValue(),