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 c1143418e..0143e81b0 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
@@ -5,7 +5,8 @@ import java.util.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.cf.imes.framework.common.pojo.PageResult;
 import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX;
-import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderPageReqVO;
+import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.cf.imes.module.executor.controller.admin.plan.vo.OrderPageReqVO;
 import com.cf.imes.module.executor.controller.admin.plan.vo.OrderRespVO;
 import com.cf.imes.module.executor.dal.dataobject.order.OrderDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -18,7 +19,26 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface OrderMapper extends BaseMapperX<OrderDO> {
 
-    PageResult<OrderDO> selectPage(OrderPageReqVO pageReqVO);
+    default PageResult<OrderDO> selectPage(com.cf.imes.module.executor.controller.admin.order.vo.order.OrderPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<OrderDO>()
+                .eqIfPresent(OrderDO::getParentNo, reqVO.getParentNo())
+                .betweenIfPresent(OrderDO::getDeliveryDate, reqVO.getDeliveryDate())
+                .eqIfPresent(OrderDO::getType, reqVO.getType())
+                .eqIfPresent(OrderDO::getSort, reqVO.getSort())
+                .eqIfPresent(OrderDO::getDataType, reqVO.getDataType())
+                .eqIfPresent(OrderDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(OrderDO::getCustomOrderNo, reqVO.getCustomOrderNo())
+                .eqIfPresent(OrderDO::getCustomer, reqVO.getCustomer())
+                .eqIfPresent(OrderDO::getAddress, reqVO.getAddress())
+                .eqIfPresent(OrderDO::getPhoneNumber, reqVO.getPhoneNumber())
+                .eqIfPresent(OrderDO::getDealer, reqVO.getDealer())
+                .eqIfPresent(OrderDO::getDealerPhoneNumber, reqVO.getDealerPhoneNumber())
+                .eqIfPresent(OrderDO::getSalesman, reqVO.getSalesman())
+                .eqIfPresent(OrderDO::getSplitter, reqVO.getSplitter())
+                .eqIfPresent(OrderDO::getRemark, reqVO.getRemark())
+                .betweenIfPresent(OrderDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(OrderDO::getId));
+    }
 
-    IPage<OrderRespVO> selectOrderPage(IPage page, com.cf.imes.module.executor.controller.admin.plan.vo.OrderPageReqVO pageReqVO);
+    IPage<OrderRespVO> selectOrderPage(IPage page, OrderPageReqVO pageReqVO);
 }
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
index fae0bace9..6bce3208d 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
@@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
 import com.cf.imes.framework.common.util.date.LocalDateTimeUtils;
 import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.cf.imes.module.executor.dal.dataobject.goods.GoodsDO;
@@ -194,7 +196,8 @@ public class PlanServiceImpl implements PlanService {
 
     @Override
     public PageResult<OrderRespVO> getOrderPage(OrderPageReqVO pageReqVO) {
-
+        PageDTO<OrderRespVO> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
+        orderMapper.selectOrderPage(page, pageReqVO);
         PageResult<OrderDO> orderDOPageResult = orderMapper.selectPage(pageReqVO, new LambdaQueryWrapperX<OrderDO>()
                 .eqIfPresent(OrderDO::getId, pageReqVO.getOrderId())
                 .eqIfPresent(OrderDO::getCustomer, pageReqVO.getConsignee())